Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile

diff --git a/bash_profile b/bash_profile
index 4656cbe63731126721ac0118a70b77080547743e..8b236eeb743c119489b517a1a864739757ca5513 100644 (file)
--- a/bash_profile
+++ b/bash_profile
@@ -198,6 +198,8 @@ if pixie --version >/dev/null 2>&1; then
   fi
 fi
 
+[ -f "$HOME/.profile-local" ] && . "$HOME/.profile-local"
+
 # --- Now, if my .bashrc hasn't been run yet, run it ---
 #
 # Oh, don't do that if we don't have a terminal.

diff --git a/bashrc b/bashrc
index 82d50c83830c880c4f264c81a6338020bb4b25fd..a1726406b3c5aa0ff6d3ae91066de1b01ceacbac 100644 (file)
--- a/bashrc
+++ b/bashrc
@@ -298,4 +298,6 @@ if (( UID == 0 )); then
   set -o noclobber
 fi
 
+[ -f "$HOME/.bashrc-local" ] && . "$HOME/.bashrc-local"
+
 fi

diff --git a/cvsrc b/cvsrc
index c1e4e685a0c60126a07a07e309555810a3c596c7..14e4b408dc70743c12c3a32dde0f687443452f31 100644 (file)
--- a/cvsrc
+++ b/cvsrc
@@ -1,5 +1,5 @@
-rdiff -u
-diff -Nu
+rdiff -up
+diff -Nup
 cvs -z6
 checkout -P
 update -dP

diff --git a/emacs b/emacs
index b1168d67c05f5230834a233a815989989bacaf7b..67dc57b3a41a438cb78c31ece26c079295f4e538 100644 (file)
--- a/emacs
+++ b/emacs
@@ -352,6 +352,10 @@
                 . mdwmail-mode))
              auto-mode-alist))
 
+(setq interpreter-mode-alist
+      (append `(("runlisp" . lisp-mode))
+             interpreter-mode-alist))
+
 (setq completion-ignored-extensions
       (append `(".hc" ".hi") completion-ignored-extensions))
 

diff --git a/lisp-init.lisp b/lisp-init.lisp
index c2a4fb5fa017c3f88ffa7d26f5f5e7f8796c62eb..65b5d617d5f3ab1d0cb962915a25865780dd211d 100644 (file)
--- a/lisp-init.lisp
+++ b/lisp-init.lisp
@@ -3,5 +3,4 @@ (setf *print-case* :downcase)
 (setf *load-verbose* nil)
 (setf *compile-verbose* nil)
 #+cmu (setf *gc-verbose* nil)
-
-
+(pushnew :mdw *features*)

diff --git a/setup b/setup
index 4ff3c75c78da706bd4e3074e987f571585502d1f..54055d0e7a5648164df19dd8c4416270abee3b5b 100755 (executable)
--- a/setup
+++ b/setup
@@ -148,6 +148,7 @@ dotfiles="
   lisp-init.lisp:.cmucl-init.lisp
     lisp-init.lisp:.sbclrc
     lisp-init.lisp:.clisprc.lisp
+    lisp-init.lisp:.eclrc
   dircolors screenrc cvsrc"
 [ "$xstuff" ] && dotfiles="$dotfiles
   xinitrc xsession Xdefaults vncrc vncsession