From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 31 Dec 2012 05:32:58 +0000 (+0000)
Subject: Merge branch 'master' of git.distorted.org.uk:~mdw/public-git/profile
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/8a152a79984a99e98919ca2c7fcf7f2cf6c8c9f1?hp=cd07f97f522053f9adf2901967e2b7f5596f1cf5

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 b35e95f..20daa9b 100644
--- 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 d8a46a4..64df966 100755
--- 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