X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/415c9a27219460e41fa8148893799525dbe15339..6852ff28976af3e13b40f565114fd19307b2406a:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 5081daf..81db066 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")
@@ -358,10 +359,7 @@
 (setq display-time-24hr-format t)
 (display-time)
 (column-number-mode 1)
-(trap
-  (if window-system
-      (let ((view-diary-entries-initially t))
-	(calendar))))
+(trap (if window-system (calendar)))
 
 ;;;--------------------------------------------------------------------------
 ;;; MailCrypt.
@@ -603,13 +601,18 @@
      (let ((rootlyness (cond ((executable-find "really") "really")
 			     ((executable-find "become") "become")
 			     ((executable-find "sudo") "sudo")
-			     (t "su"))))
+			     (t "su")))
+	   (this-host (concat "\\`\\(localhost\\|"
+			      (system-name) "\\|\\)\\'"))
+	   (this-user (concat "\\`\\(" (user-login-name) "\\|"
+			      (user-real-login-name) "\\|\\)\\'")))
        (setq tramp-default-method-alist
-	     `(("\\`\\(localhost\\|\\)\\'" "" ,rootlyness)
-	       (nil "." ,rootlyness))))
-     (setq tramp-default-proxies-alist
-	   `(("\\`\\(localhost\\|\\)\\'" nil nil)
-	     (nil "\\`root\\'" "/ssh:%h:")))))
+	     `((,this-host nil ,rootlyness)
+	       (nil ,this-user "ssh")
+	       (nil "." ,rootlyness)))
+       (setq tramp-default-proxies-alist
+	     `((,this-host nil nil)
+	       (nil "." "/ssh:%h:"))))))
 
 ;;;--------------------------------------------------------------------------
 ;;; General fontification.