dot/gitconfig.in: Add a rune for fast-forwarding branches.

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index a0ceee5..2e15651 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -188,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")
@@ -615,7 +617,12 @@
 
 ;; Other frame fiddling.
 
-(setq frame-title-format '("Emacs " user-login-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.