X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/c6fe19d5ddff128cc87fabcd0e7f82be6af19781..e9dd6597e729abee158151b2ce9b096677695f5a:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 4705e7e..c0f4022 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -148,7 +148,10 @@
 (setq rmail-display-summary t)
 (setq rmail-file-name "~/Mail/rmail")
 
-(setq sendmail-program "~/bin/sendmail-hack")
+(setq sendmail-program "~/bin/sendmail-hack"
+      send-mail-function 'sendmail-send-it
+      mail-interactive t
+      sendmail-error-reporting-interactive '("-odb" "-oee"))
 
 (setq mail-user-agent 'message-user-agent
       read-mail-command 'gnus)
@@ -156,6 +159,8 @@
       message-yank-prefix "> "
       message-yank-cited-prefix "> "
       message-send-mail-function 'message-send-mail-with-sendmail
+      message-interactive t
+      message-sendmail-extra-arguments '("-odb" "-oee")
       message-sendmail-envelope-from 'header
       message-indent-citation-function '(message-indent-citation
 					 mdw-trim-spaces-after-citing))
@@ -417,7 +422,7 @@
 
 (setq default-frame-alist
       (mdw-uniquify-alist
-       '((width . 78)
+       `((width . ,(if (>= emacs-major-version 21) 77 78))
 	 (height . 33)
 	 (vertical-scroll-bars . right)
 	 (cursor-type . bar)
@@ -425,10 +430,8 @@
 	 (left-fringe . 5)
 	 (right-fringe . 5)
 	 (scroll-bar-width . 15)
-	 (cursor-color . "red"))
-       (if mdw-black-background
-	   '((background-mode . dark))
-	 '((background-mode . light)))))
+	 (cursor-color . "red")
+	 (background-mode . ,(if mdw-black-background 'dark 'light)))))
 (setq window-system-default-frame-alist
       '((pm (font . "-os2-System VIO-medium-r-normal--*-40-*-*-m-*-cp850")
 	    (menu-font . "8.Helv")