From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 27 Apr 2011 00:51:32 +0000 (+0100)
Subject: Merge branch 'master' of vampire:etc/profile
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/a7b61e882477fdf29727de049e1675c685596ce3?hp=-c

Merge branch 'master' of vampire:etc/profile

* 'master' of vampire:etc/profile:
  dot/ditz-config: Configuration for `ditz' bug tracker.
  el/dot-emacs.el: Load ERC configuration in advance.
  hacks/ssh: Add new hack for setting up background SSH master connections.
  bin/svnwrap: Fix unjustifiably stupid error.
  dot/ercrc.el: Common configuration for ERC.
---

a7b61e882477fdf29727de049e1675c685596ce3
diff --combined el/dot-emacs.el
index 8dc5267,8b6618d..d2eba21
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@@ -358,6 -358,9 +358,9 @@@ so that it can be used for convenient f
  	  (setenv "REAL_MOVEMAIL" try))
        (setq path (cdr path)))))
  
+ (eval-after-load "erc"
+     '(load "~/.ercrc.el"))
+ 
  ;;;--------------------------------------------------------------------------
  ;;; Utility functions.
  
@@@ -1026,14 -1029,13 +1029,14 @@@ doesn't match any of the regular expres
  		  (arglist-cont-nonempty . mdw-c-lineup-arglist)
  		  (topmost-intro . mdw-c-indent-extern-mumble)
  		  (cpp-define-intro . 0)
 +		  (knr-argdecl . 0)
  		  (inextern-lang . [0])
  		  (label . 0)
  		  (case-label . +)
  		  (access-label . -)
  		  (inclass . +)
  		  (inline-open . ++)
 -		  (statement-cont . 0)
 +		  (statement-cont . +)
  		  (statement-case-intro . +)))
  	       t))
  
@@@ -2140,8 -2142,8 +2143,8 @@@ strip numbers instead.
  		   (home (expand-file-name "~")) (nhome (length home)))
  	      (if (and (>= npwd nhome)
  		       (or (= nhome npwd)
 -			   (= (elt pwd nhome) ?/)
 -		       (string= (substring pwd 0 nhome) home)))
 +			   (= (elt pwd nhome) ?/))
 +		       (string= (substring pwd 0 nhome) home))
  		  (concat "~" (substring pwd (length home)))
  		pwd))
  	    right)))
diff --combined setup
index 5242bd8,6ea2987..5081807
--- a/setup
+++ b/setup
@@@ -129,13 -129,13 +129,14 @@@ f
  ## Symlink the various dotfiles into place
  dotfiles="
    bash_profile bash_logout bashrc inputrc bash_completion
-   emacs emacs-calc vm gnus.el
+   emacs emacs-calc vm gnus.el ercrc.el
    vimrc mg zile
+   ditz-config
    mailrc signature
    cgrc tigrc
    gdbinit
    guile
 +  rcrc
    toprc
    aspell.conf
    lisp-init.lisp:.cmucl-init.lisp
@@@ -249,6 -249,19 +250,19 @@@ for s in $scripts; d
  done
  echo "	all done."
  
+ hacks="
+   ssh:ssh"
+ echo "Installing hacks..."
+ for h in $hacks; do
+   d=${h%%:*} h=${h#*:}
+   ft=$HOME$sub/bin/hacks/$d
+   mkdir -p $ft
+   ln -s $here/hacks/$h $ft/$h.new
+   mv $ft/$h.new $ft/$h
+   echo "  $d:$h"
+ done
+ echo "	all done."
+ 
  ###--------------------------------------------------------------------------
  ### Set up the Emacs config.