X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/94e3dae355ff33f8d142f072577193c5c358df99..c60cbbe8c902c3bd56a093e5479de4f7855e464f:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 8832f3f..faae519 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -127,10 +127,11 @@
 
 ;; ---- Some mail and news configuration ---
 
-(setq mail-from-style 'parens)
-(setq mail-signature t)
-(setq mail-yank-prefix "> ")
-(setq mail-archive-file-name "~/Mail/sent")
+(setq mail-from-style 'parens
+      mail-signature t
+      mail-yank-prefix "> "
+      mail-archive-file-name "~/Mail/sent"
+      compose-mail-user-agent-warnings nil)
 
 (setq rmail-display-summary t)
 (setq rmail-file-name "~/Mail/rmail")
@@ -600,12 +601,21 @@
 	       (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")))
+	   (this-host (concat "\\`\\(localhost\\|"
+			      (system-name) "\\|\\)\\'"))
+	   (this-user (concat "\\`\\(" (user-login-name) "\\|"
+			      (user-real-login-name) "\\|\\)\\'")))
+       (setq tramp-default-method-alist
+	     `((,this-host nil ,rootlyness)
+	       (nil ,this-user "ssh")
+	       (nil "." ,rootlyness)))
+       (setq tramp-default-proxies-alist
+	     `((,this-host nil nil)
+	       (nil "." "/ssh:%h:"))))))
 
 ;;;--------------------------------------------------------------------------
 ;;; General fontification.