el/dot-emacs.el: Better fontification for Ediff.

[profile] / setup

diff --git a/setup b/setup
index fd94d338a6c22c368374f8f1cbd7703a84c14f77..37dc474039f3e37a118e68562434461a8f83faf5 100755 (executable)
--- a/setup
+++ b/setup
@@ -10,7 +10,7 @@ umask 002
 sub=
 mkdir -p $HOME$sub
 
-: ${REPO=http://ftp.distorted.org.uk/pub/mdw/profile}
+: ${REPO=https://ftp.distorted.org.uk/pub/mdw/profile}
 
 export PATH=/usr/local/bin:$HOME$sub/bin:/usr/bin:/usr/ccs/bin:/bin
 
@@ -133,15 +133,18 @@ fi
 dotfiles="
   bash_profile bash_logout bashrc inputrc bash_completion
   emacs emacs-calc vm gnus.el ercrc.el
-  vimrc mg zile
+  vimrc mg zile lesskey
+  parallel-config:.parallel/config
+  ipython_config.py:.ipython/profile_default/ipython_config.py
   ditz-config
-  mailrc signature
+  mailrc signature muttrc
   cgrc tigrc
   gdbinit
   guile
   rcrc
   toprc
   mc-ini:.mc/ini mc-panels.ini:.mc/panels.ini
+  pulse-daemon.conf:.pulse/daemon.conf
   aspell.conf
   tclshrc:.tclshrc tclshrc:.wishrc
   lisp-init.lisp:.cmucl-init.lisp
@@ -149,9 +152,11 @@ dotfiles="
     lisp-init.lisp:.clisprc.lisp
     lisp-init.lisp:.eclrc
   swank.lisp
-  dircolors colordiffrc screenrc cvsrc indent.pro"
+  mdw-build.conf:.config/mdw-build.conf
+  w3m-config:.w3m/config elinks.conf:.elinks/elinks.conf
+  dircolors colordiffrc screenrc tmux.conf cvsrc indent.pro"
 [ "$xstuff" ] && dotfiles="$dotfiles
-  xinitrc xsession Xdefaults vncrc vncsession
+  xinitrc xsession xmodmap vncrc vncsession
   fonts.conf
   stalonetrayrc
   putty-defaults:.putty/sessions/Default%20Settings
@@ -175,6 +180,27 @@ for d in $dotfiles; do
 done
 echo " all done."
 
+## CPP-hack files which need it.
+cppfiles=""
+[ "$xstuff" ] && cppfiles="$cppfiles
+  Xdefaults"
+echo "Hacking files with C preprocessor..."
+defs="-DHOME=$HOME -DPROFILE=$here"
+defs="$defs -DEMACSWD=$(mdw-conf emacs-width 77)"
+for c in $cppfiles; do
+  target=.$c
+  case $c in
+    *:*) target=${c#*:} c=${c%%:*};;
+  esac
+  ft=$HOME$sub/$target
+  dir=${ft%/*}
+  mkdir -p $dir
+  cpp -P $defs dot/$c -o $ft.new
+  mv $ft.new $ft
+  echo "  $target"
+done
+echo " all done."
+
 ## Substitute things which need substituting.
 dotfilessubst="
   gitconfig
@@ -203,14 +229,7 @@ done
 echo "  all done."
 
 ## Symlink backgrounds.
-backgrounds="
-  jue-peek.jpg
-  medusa.jpg
-  bsg-supper.jpg
-  rayne.jpg
-  hypatia.jpg
-  noodly.jpg
-  lovelace.jpg"
+backgrounds=$(cd bg && echo *)
 if [ "$xstuff" ]; then
   echo "Installing backgrounds..."
   for b in $backgrounds; do
@@ -233,14 +252,17 @@ scripts="
   mdw-editor
   mdw-pager
   mdw-conf
-  mdw-build
+  mdw-build mdw-sbuild mdw-sbuild-server
+  update-buildable-branch
   emacsclient-hack
   movemail-hack
   sendmail-hack
   aspell-hack
   emerge-hack
   lesspipe.sh
+  run-with-shell-env
   start-ssh-agent
+  start-ssh-pageant
   svnwrap
   guest-console
   hyperspec"
@@ -248,6 +270,7 @@ scripts="
   xinitcmd
   un-backslashify-selection
   lock-screen
+  xpra-start-xdummy
   xshutdown"
 echo "Installing scripts..."
 mkdir -p $HOME$sub/bin
@@ -277,7 +300,7 @@ echo "      all done."
 
 $echon "Finding a suitable emacs:$echoc"
 emacs=no
-for i in emacs22 emacs23 emacs21 emacs; do
+for i in emacs23 emacs24 emacs22 emacs21 emacs; do
   if type -p >/dev/null $i; then
     emacs=$i
     break
@@ -296,6 +319,7 @@ emacspkg="
   ew-hols
   mdw-gnus-patch
   git git-blame vc-git stgit
+  mdw-multiple-cursors
   quilt"
 for elib in $emacspkg; do
   $echon "  $elib:$echoc"