Merge branch 'master' of git.distorted.org.uk:~mdw/public-git/profile

* 'master' of git.distorted.org.uk:~mdw/public-git/profile:
  el/dot-emacs.el: Respect `indent-tabs-mode' when computing fill prefix.
  el/dot-emacs.el: Use #'FOO rather than (function FOO).
  dot/emacs: Use `makefile-mode' for *.make files.

diff --git a/dot/emacs b/dot/emacs
index b35e95ffc21652974c200557d973774631538b04..20daa9b0818a2907a0c766ee1d14d1adf226749d 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -551,7 +551,9 @@
                ("@PYTHON@" . python-mode)
                ("@PERL@" . perl-mode)
                ("@TCLSH@" . tcl-mode)
-               ("@WISH@" . tcl-mode))
+               ("@WISH@" . tcl-mode)
+               ("/tclsh" . tcl-mode)
+               ("/wish" . tcl-mode))
              interpreter-mode-alist))
 
 (setq completion-ignored-extensions

diff --git a/hacks/ssh b/hacks/ssh
index d8a46a42c50ca9b2638c663e159f2dbbe1a221b3..64df9667de5dd36ca5ee3fb3613f366979e25a02 100755 (executable)
--- a/hacks/ssh
+++ b/hacks/ssh
@@ -146,7 +146,7 @@ while :; do
 
     ## A bare word.  Maybe it's the hostname, or the start of the command.
     *)
-      case ${host-t} in
+      case ${host-t}${host+nil} in
        t) host=$1 ;;
        *) break ;;
       esac