X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/5e96bd82468d33bab7655286d63cdcadce6c2e42..9cacd2663b603a65d07cb8e60935cb3bb13c63ae:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index d918bcd..2e15651 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -130,6 +130,7 @@
 
 (and (or window-system (mdw-emacs-version-p 23))
      (not mdw-fast-startup)
+     (not (and (fboundp 'daemonp) (daemonp)))
      (progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")
 		  edit-server-new-frame nil
 		  gnuserv-frame t)
@@ -187,6 +188,8 @@
 (setq sendmail-program "~/bin/sendmail-hack"
       send-mail-function 'sendmail-send-it
       mail-interactive t
+      mail-specify-envelope-from t
+      mail-envelope-from 'header
       sendmail-error-reporting-interactive '("-odb" "-oee"))
 (autoload 'sendmail-send-it "sendmail")
 (autoload 'smtpmail-send-it "smtpmail")
@@ -220,6 +223,7 @@
       bbdb-north-american-phone-numbers-p nil
       bbdb-dwim-net-address-allow-redundancy t
       bbdb-extract-address-components-func 'bbdb-extract-address-components
+      bbdb-allow-duplicates t
       bbdb/news-auto-create-p
       (lambda ()
 	(let ((group gnus-newsgroup-name))
@@ -343,7 +347,7 @@
       eshell-cmpl-cycle-completions nil)
 (setq dired-deletion-confirmer		;Make deletion easier in dired
       (symbol-function 'y-or-n-p)
-      delete-by-moving-to-trash t
+      delete-by-moving-to-trash (mdw-emacs-version-p 24)
       dired-listing-switches "-alF"	;Do `ls -F' things in dired windows
       wdired-allow-to-change-permissions 'advanced)
 (setq read-quoted-char-radix 16)	;C-q HEX-STUFF [RET]
@@ -613,7 +617,12 @@
 
 ;; Other frame fiddling.
 
-(setq frame-title-format '("" invocation-name "@" system-name ": %b"))
+(defvar mdw-hostname
+  (if (string-match "\\." system-name)
+      (substring system-name 0 (match-beginning 0))
+    system-name))
+(setq frame-title-format '("Emacs " user-login-name "@" mdw-hostname " – %b")
+      icon-title-format frame-title-format)
 
 ;; Global keymap changes.