Merge commit 'ponder/master'

[profile] / setup

diff --git a/setup b/setup
index 15292b6..79a6f34 100755 (executable)
--- a/setup
+++ b/setup
@@ -129,7 +129,7 @@ fi
 ## Symlink the various dotfiles into place
 dotfiles="
   bash_profile bash_logout bashrc inputrc bash_completion
-  emacs emacs-calc vm
+  emacs emacs-calc vm gnus.el
   vimrc mg
   mailrc signature
   cgrc tigrc
@@ -141,6 +141,7 @@ dotfiles="
     lisp-init.lisp:.sbclrc
     lisp-init.lisp:.clisprc.lisp
     lisp-init.lisp:.eclrc
+  swank.lisp
   dircolors colordiffrc screenrc cvsrc indent.pro"
 [ "$xstuff" ] && dotfiles="$dotfiles
   xinitrc xsession Xdefaults vncrc vncsession
@@ -229,6 +230,7 @@ echo "Installing Emacs packages..."
 emacspkg="
   make-regexp
   ew-hols
+  mdw-gnus-patch
   git git-blame vc-git stgit
   quilt"
 for elib in $emacspkg; do
@@ -241,8 +243,12 @@ for elib in $emacspkg; do
                       (error 1))))'; then
     echo " already installed."
   else
-    $echon " downloading$echoc"
-    $GETURL $HOME$sub/lib/emacs/$elib.el $REPO/$elib.el
+    if [ -f $elib.el ]; then
+      cp $elib.el $HOME$sub/lib/emacs/$elib.el
+    else
+      $echon " downloading$echoc"
+      $GETURL $HOME$sub/lib/emacs/$elib.el $REPO/$elib.el
+    fi
     $echon " compiling$echoc"
     (cd $HOME$sub/lib/emacs;
       $emacs >/dev/null 2>&1 --no-site-file --batch \