From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 29 Mar 2010 17:22:57 +0000 (+0100)
Subject: Merge branch 'master' of metalzone:etc/profile
X-Git-Url: https://git.distorted.org.uk/~mdw/profile/commitdiff_plain/1b9c276c3efe53818772087cbf3f696682125574?hp=-c

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.
---

1b9c276c3efe53818772087cbf3f696682125574
diff --combined dot/xinitrc
index 1ba8b2c,4d6da0c..2ef2a18
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@@ -122,6 -122,10 +122,10 @@@ start-clients () 
    ## Mail notification.
    run bginit mail-notification
  
+   ## Policykit authentication agent.
+   agent=/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
+   if [ -x $agent ]; then run bginit $agent; fi
+ 
    ## System monitor.
    case $vnc in no) run bginit gkrellm ;; esac
  
@@@ -250,7 -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"
  }