X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/5694bdf24c167150fc0cc475f230e20ad2c74fbb..f6cd49f13cc736305a218c62f12e3fd9fa3cbcec:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 6d873dd..5c5c697 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 'angles
+      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")
@@ -142,6 +143,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))
 
@@ -357,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.
@@ -481,9 +480,9 @@
 (add-hook 'org-agenda-mode-hook
 	  #'(lambda () (mdw-clobber-evil-keymap org-agenda-mode-map)))
 (or mdw-fast-startup
-    (progn
-      (org-remember-insinuate)
-      (global-set-key [?\C-c ?r] 'org-remember)))
+    (trap (progn
+	    (org-remember-insinuate)
+	    (global-set-key [?\C-c ?r] 'org-remember))))
 
 ;; Minor mode listing
 
@@ -599,11 +598,21 @@
 	       (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")))
+	   (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.