Merge branch 'master' of metalzone:etc/profile

* 'master' of metalzone:etc/profile:
  dot/bash_profile (__mdw_addto): Quote new value properly.
  dot/xinitrc: Whoops.  Spelt the Gnome authentication agent thing wrong.
  dot/emacs: Have w3m display PDF files in Evince.
  dot/emacs: Remove Senator's unpleasant claws from isearch.
  el/dot-emacs.el: Remove further stray debugging code.
  el/dot-emacs.el: Allow `+' as a list item marker.
  dot/emacs: Remove VCS directories from `completion-ignored-extensions'
  .gitattributes: Diff Emacs Lisp files as Lisp.
  dot/bash_profile (__mdw_addto) SECURITY: Only set var if it changed.
  dot/xinitrc: Start policykit authentication agent if present.
  el/dot-emacs.el: Explicitly indent with spaces in Python-like modes.
  el/dot-emacs.el: Front-end function for turning on `whitespace-mode'.
  dot/emacs: Use `window-system-default-frame-alist'.
  dot/Xdefaults: Use server fonts by default in Emacs.
  dot/emacs: Turn on column number display.
  dot/emacs: More `dired' hacking: tweak keymap.
  dot/emacs: Tweak `dired' settings.
  dot/emacs: Force use of server-side X fonts.
  dot/emacs: Make `gnus' be the default mail reader.
  dot/emacs: Fix stupid bug in `tramp' setup.

diff --git a/dot/e16-bindings b/dot/e16-bindings
index c2cf4be..cd3a003 100644 (file)
--- a/dot/e16-bindings
+++ b/dot/e16-bindings
@@ -31,9 +31,9 @@ Tooltip Go Forward a Desktop
 Aclass KEYBINDINGS global
 KeyDown    5       F6 exec gconftool --toggle /desktop/gnome/accessibility/keyboard/mousekeys_enable
 KeyDown    5       F7 exec un-backslashify-selection
-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       F8 exec xinitcmd :terminal
+KeyDown    5       F9 exec xinitcmd :ask-run
+KeyDown           5      F10 exec xinitcmd :ask-command
 KeyDown           5      F11 exec lock-screen
 KeyDown    5      F12 exec xshutdown
 KeyDown    5      Tab focus next
@@ -65,3 +65,11 @@ KeyDown   S5       Up area move 0 -1
 KeyDown   S5     Down area move 0 1
 KeyDown   S5     Left area move -1 0
 KeyDown   S5    Right area move 1 0
+KeyDown          5        Up wop * mr 0 -15
+KeyDown          5      Down wop * mr 0 +15
+KeyDown          5      Left wop * mr -15 0
+KeyDown          5     Right wop * mr +15 0
+KeyDown          SC5      Up wop * sr 0 -15
+KeyDown          SC5    Down wop * sr 0 +15
+KeyDown          SC5    Left wop * sr -15 0
+KeyDown          SC5   Right wop * sr +15 0

diff --git a/dot/xinitrc b/dot/xinitrc
index 4d6da0c..2ef2a18 100755 (executable)
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -254,7 +254,7 @@ start-xterms () {
 
 req () {
   declare title=$1 hist=$2; shift 2
-  cmd=$(xgetline -t "$title" -p "Command:" -Hl "$HOME/$hist") &&
+  cmd=$(xgetline -t "$title" -p "_Command:" -Hl "$HOME/$hist") &&
   exec "$@" "$cmd"
 }