Merge branch 'master' of git+ssh://crybaby.distorted.org.uk/~mdw/etc/profile

* 'master' of git+ssh://crybaby.distorted.org.uk/~mdw/etc/profile:
  e16-config: Remove.
  xinitrc and friends: Embed prompt-and-run functionality in xinitrc.
  gitconfig: Use magical hacked 6x13 font.
  fonts.conf: New configuration file.

Conflicts:

	e16-bindings

diff --git a/e16-bindings b/e16-bindings
index afd2fc84f9783280e1c7b316f4f4c32ae8acddef..e3ff6292e1d501810fc2c448f0381ae904d1b08e 100644 (file)
--- a/e16-bindings
+++ b/e16-bindings
@@ -36,6 +36,7 @@ KeyDown   S5    Right area move 1 0
 KeyDown    5       F8 exec xatom set XINIT_COMMAND :terminal
 KeyDown    5       F9 exec xatom set XINIT_COMMAND :ask-run
 KeyDown           5      F10 exec xatom set XINIT_COMMAND :ask-command
+KeyDown           5      F11 exec xscreensaver-command -lock
 KeyDown    5      F12 exec xshutdown
 KeyDown    5      Tab focus next
 KeyDown   C5       Up wop * raise