X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/1902ef3d0b944e78c8db7b1f3f9771a4f369c4f5..da337d4d4e588b991f87d0a7ce1cf4cacb57c6b1:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index d355fcc..44684ee 100644
--- 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")
@@ -221,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))
@@ -614,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.
 
@@ -654,8 +662,8 @@
   (global-set-key [?\e ?\e] 'mdw-wrong)
   (global-set-key [?\e ?\C-\] ?\C-\]] 'keyboard-escape-quit)
   (global-set-key [?\C-c ?\M-x] 'execute-extended-command)
-  (global-set-key [?\C-c ?d ?w] 'devhelp-word-at-point)
   (global-set-key [?\C-c ?d ?a] 'devhelp-assistant-word-at-point)
+  (global-set-key [?\C-c ?d ?w] 'devhelp-word-at-point)
   (global-set-key [?\C-c ?g ?a] 'org-agenda)
   (global-set-key [?\C-c ?g ?b] 'org-iswitchb)
   (global-set-key [?\C-c ?g ?l] 'org-store-link)
@@ -697,6 +705,9 @@
   (global-set-key [?\C-c ?w left] 'windmove-left)
   (global-set-key [?\C-c ?w right] 'windmove-right)
   (global-set-key [?\C-h ?\C-m] 'manual-entry)
+  (global-set-key [?\C-x ?4 ?\C-j] 'dired-jump-other-window)
+  (global-set-key [?\C-x ?4 ?j] 'dired-jump-other-window)
+  (global-set-key [?\C-x ?\C-j] 'dired-jump)
   (global-set-key [?\C-x ?\C-n] 'skel-create-file)
   (global-set-key [?\C-x ?4 ?n] 'skel-create-file-other-window)
   (global-set-key [?\C-x ?5 ?n] 'skel-create-file-other-frame)
@@ -725,6 +736,9 @@
 				   try-expand-list-all-buffers)))
 		    hippie-expand-try-functions-list)))
 
+(autoload 'dired-jump "dired-x")
+(autoload 'dired-jump-other-window "dired-x")
+
 (eval-after-load "dired"
   '(progn
      (or (lookup-key dired-mode-map  [?\C-x ?\C-q])