Merge remote branch 'ponder'

* ponder:
  setup, pulseaudio, git: Add PulseAudio configuration; substituted dotfiles.

diff --git a/bin/aspell-hack b/bin/aspell-hack
new file mode 100755 (executable)
index 0000000..0283417
--- /dev/null
+++ b/bin/aspell-hack
@@ -0,0 +1,2 @@
+#! /bin/sh
+set -e; cd; exec aspell "$@"

diff --git a/bin/mdw-build b/bin/mdw-build
index 65ea3b0a5d2eff0fe73514527c450f101b29ae23..34b63834fb90cb1e534e64c302211306981dec63 100755 (executable)
--- a/bin/mdw-build
+++ b/bin/mdw-build
@@ -149,7 +149,7 @@ assign srcpath $(pwd)
 
 ## Construct the output directory.
 assign releasepath $srcpath/dist-$build
-chmod -R +w $releasepath 2>/dev/null|| :
+chmod -R +w $releasepath 2>/dev/null || :
 rm -rf $releasepath 2>/dev/null || :
 mkdir $releasepath
 case $verbose in

diff --git a/dot/emacs b/dot/emacs
index f65a0329df709f57a1870dfa45616c8e65a0765f..98852a4bd253bbf303578f7b0b5c8dbec7498cbf 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -99,7 +99,10 @@
            (trap (server-start))
            (trap (progn
                    (require 'edit-server)
-                   (edit-server-start)))))
+                   (edit-server-start)
+                   (let ((edit (get-process "edit-server")))
+                     (and edit
+                          (set-process-query-on-exit-flag edit nil)))))))
 
 ;; Control backup behaviour.
 
@@ -234,7 +237,7 @@
 (setq password-cache-expiry nil)
 (setq-default proced-filter 'all
              proced-sort 'user)
-(setq ispell-program-name "aspell"
+(setq ispell-program-name "aspell-hack"
       ispell-local-dictionary "en_GB-ize-w_accents"
       flyspell-default-dictionary "en_GB-ize-w_accents"
       ispell-silently-savep t)
@@ -767,7 +770,9 @@
 (setq shell-prompt-pattern "^[^]#$%>»}\n]*\\([]#$%»}]\\|>>?\\) *")
 (setq comint-password-prompt-regexp
       (concat "\\(\\([Ee]nter \\|[Oo]ld \\|[Nn]ew \\|[a-zA-Z0-9_]*'s \\|^\\)"
-             "[Pp]assword\\|pass phrase\\):"))
+             "[Pp]assword\\|pass phrase\\):")
+      comint-file-name-chars "~/A-Za-z0-9+@:_.$#%,={}-"
+      shell-file-name-chars comint-file-name-chars)
 
 ;; Notice passwords, and make C-a work right.
 

diff --git a/dot/gnus.el b/dot/gnus.el
index f7b6560d82e671793313a3a5708786bcfdf1cfa9..7276865055e71b16d33aef1b0294c81dbfb36610 100644 (file)
--- a/dot/gnus.el
+++ b/dot/gnus.el
@@ -48,7 +48,7 @@ (if (memq (coding-system-get (terminal-coding-system) 'mime-charset)
          gnus-sum-thread-tree-single-leaf     "╰─>")
   (setq gnus-sum-thread-tree-leaf-with-other   "|->"
        gnus-sum-thread-tree-vertical          "| "
-       gnus-sum-thread-tree-single-leaf       "'->"))
+       gnus-sum-thread-tree-single-leaf       "`->"))
 
 ;; Sort threads in a useful way.
 (setq gnus-thread-sort-functions

diff --git a/dot/xinitrc b/dot/xinitrc
index cf544679ca79f3c70f79e8b10e5bbcd7cffa76b0..3d337a6a2cd33298a93e7e4c2869b05034f9ddf0 100755 (executable)
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -146,6 +146,16 @@ start-window-manager () {
 
 start-clients-local () { :; }
 
+scsv=$(pick_program screensaver gnome-screensaver xscreensaver)
+case $scsv in
+  xscreensaver)
+    scsvopts="-no-splash"
+    ;;
+  *)
+    scsvopts=""
+    ;;
+esac
+
 start-clients () {
   ## Mail notification.
   run bginit mail-notification
@@ -165,7 +175,7 @@ start-clients () {
   case $vnc in
     no)
       run init xscreensaver-command -exit
-      run bginit xscreensaver -no-splash
+      run bginit $scsv $scsvopts
       ;;
   esac
 

diff --git a/setup b/setup
index 94dc65d427666bb22a5455d8b5e7e7dd6a7fa606..499841e3197e64f151c27102a9bc012b2057bd27 100755 (executable)
--- a/setup
+++ b/setup
@@ -227,6 +227,7 @@ scripts="
   mdw-build
   emacsclient-hack
   movemail-hack
+  aspell-hack
   emerge-hack
   lesspipe.sh
   start-ssh-agent