X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/ac4ae7cd064e82a554a00738042645a91c334579..47a5be0d6acb3d4d786162f83ae1443fd5b054ae:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index c291fdd..b2c35ec 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -513,7 +513,8 @@
 ;;; Rootly editingness.
 
 (eval-after-load "tramp"
-  '(progn
+  '(let ((fix-args (if (mdw-version-< tramp-version "2.1")
+		       #'append #'identity)))
      (setq tramp-methods
 	   (mdw-uniquify-alist
 	    `(("become"
@@ -523,13 +524,14 @@
 	       (tramp-copy-program nil)
 	       (tramp-copy-args nil)
 	       (tramp-copy-keep-date-arg nil)
-	       (tramp-login-args (("TERM=dumb" "%u"))))
+	       (tramp-login-args ,(funcall fix-args `("TERM=dumb" "%u"))))
 	      ("really"
 	       (tramp-connection-function tramp-open-connection-su)
 	       (tramp-login-program "really")
-	       (tramp-login-args (("-u" "%u")
-				  ("--")
-				  ("env" "TERM=dumb" "/bin/sh")))
+	       (tramp-login-args ,(funcall fix-args
+					   `("-u" "%u")
+					   `("--")
+					   `("env" "TERM=dumb" "/bin/sh")))
 	       (tramp-copy-program nil)
 	       (tramp-copy-args nil)
 	       (tramp-copy-keep-date-arg nil)
@@ -537,7 +539,7 @@
 	      ,@tramp-methods)))
      (setq tramp-default-method "ssh")
      (setq tramp-default-method-alist
-	   `(("\\`localhost\\'" ""
+	   `(("\\`\\(localhost\\|\\)\\'" ""
 	      ,(cond ((executable-find "become") "become")
 		     ((executable-find "really") "really")
 		     (t "su")))))))