Merge remote branch 'ponder'

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

diff --combined setup
index abf2e24b16e63cb802064a41cc95b9eaae23c24a,94dc65d427666bb22a5455d8b5e7e7dd6a7fa606..499841e3197e64f151c27102a9bc012b2057bd27
--- 1/setup
--- 2/setup
+++ b/setup
@@@ -167,6 -167,32 +167,32 @@@ for d in $dotfiles; d
  done
  echo "        all done."
  
+ ## Substitute things which need substituting.
+ dotfilessubst="
+   gitconfig
+   pulse-default.pa.in:.pulse/default.pa"
+ echo "Installing dotfiles with substitutions..."
+ for d in $dotfilessubst; do
+   case $d in
+     *:*) target=${d#*:} d=${d%%:*};;
+     *) target=.$d d=$d.in;;
+   esac
+   ft=$HOME$sub/$target
+   dir=${ft%/*}
+   mkdir -p $dir
+   sed "
+ 1i\
+ ### generated by $here/setup; do not edit!\
+ 
+ /@home@/ s\a\a$HOME\ag
+ /@releasekey@/ s\a\a$(bin/mdw-conf release-key 481334C2)\ag
+ /@gitignore@/ s\a\a$(bin/mdw-conf gitignore $here/git/gitignore)\ag
+ " dot/$d >$ft.new
+   mv $ft.new $ft
+   echo "  $target"
+ done
+ echo "  all done."
+ 
  ## Symlink backgrounds.
  backgrounds="
    jue-peek.jpg
@@@ -191,20 -217,6 +217,6 @@@ if [ "$xstuff" ]; the
    echo "      all done."
  fi
  
- ###--------------------------------------------------------------------------
- ### Process the Git configuration.
- 
- echo -n "Installing Git configuration:"
- sed "
- 1i\
- ### generated by $here/setup; do not edit!\
- 
- /@releasekey@/ s::$(bin/mdw-conf release-key 481334C2):g
- /@gitignore@/ s::$(bin/mdw-conf gitignore $here/git/gitignore):g
- " git/gitconfig >$HOME/.gitconfig.new
- mv $HOME/.gitconfig.new $HOME/.gitconfig
- echo " done."
- 
  ###--------------------------------------------------------------------------
  ### Install useful scripts included in this package.
  
@@@ -215,7 -227,6 +227,7 @@@ scripts=
    mdw-build
    emacsclient-hack
    movemail-hack
 +  aspell-hack
    emerge-hack
    lesspipe.sh
    start-ssh-agent