Merge remote-tracking branch 'crybaby'

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index 6d873dd..5081daf 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -142,6 +142,7 @@
 (setq message-signature-separator "^-- \\(\\|\\[mdw\\]\\)$"
       message-yank-prefix "> "
       message-yank-cited-prefix "> "
+      message-send-mail-function 'message-send-mail-with-sendmail
       message-indent-citation-function '(message-indent-citation
                                         mdw-trim-spaces-after-citing))
 
@@ -599,11 +600,16 @@
               (tramp-remote-sh "/bin/sh"))
              ,@tramp-methods)))
      (setq tramp-default-method "ssh")
-     (setq tramp-default-method-alist
-          `(("\\`\\(localhost\\|\\)\\'" ""
-             ,(cond ((executable-find "become") "become")
-                    ((executable-find "really") "really")
-                    (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.