Merge remote-tracking branch 'crybaby'

* crybaby:
  dot/emacs: Tramp hacking: use `sudo', and set up magic proxies.

diff --git a/dot/emacs b/dot/emacs
index 8832f3f..5081daf 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -600,12 +600,16 @@
               (tramp-remote-sh "/bin/sh"))
              ,@tramp-methods)))
      (setq tramp-default-method "ssh")
-     (setq tramp-default-method-alist
-          `(("\\`\\(localhost\\|\\)\\'" ""
-             ,(cond ((executable-find "really") "really")
-                    ((executable-find "become") "become")
-                    ((executable-find "sudo") "sudo")
-                    (t "su")))))))
+     (let ((rootlyness (cond ((executable-find "really") "really")
+                            ((executable-find "become") "become")
+                            ((executable-find "sudo") "sudo")
+                            (t "su"))))
+       (setq tramp-default-method-alist
+            `(("\\`\\(localhost\\|\\)\\'" "" ,rootlyness)
+              (nil "." ,rootlyness))))
+     (setq tramp-default-proxies-alist
+          `(("\\`\\(localhost\\|\\)\\'" nil nil)
+            (nil "\\`root\\'" "/ssh:%h:")))))
 
 ;;;--------------------------------------------------------------------------
 ;;; General fontification.