Merge branch 'master' of http://git.distorted.org.uk/~mdw/profile

* 'master' of http://git.distorted.org.uk/~mdw/profile:
  bg/lilith.jpg: New image; painting by John Collier.
  dot/bashrc: Some hacking for Sailfish.

diff --git a/dot/emacs b/dot/emacs
index 1e46f34..c0f4022 100644 (file)
--- 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))