X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/4075460990736fff383a41b409172ac4a1895bb8..6690f2cc3b29bab6a01f4e9a77306b659418b05e:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 812d279..2170f2f 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -166,13 +166,13 @@
 (setq calc-settings-file "~/.emacs-calc")
 (load calc-settings-file)
 
-;; ---- Some mail and news configuration ---
+;; Some mail and news configuration.
 
 (setq mail-from-style 'angles
       mail-signature t
       mail-yank-prefix "> "
       mail-archive-file-name nil
-      message-default-mail-headers ""
+      message-default-mail-headers "X-Auto-Response-Suppress: DR, RN, NRN, OOF\n"
       message-default-news-headers ""
       compose-mail-user-agent-warnings nil)
 
@@ -351,6 +351,8 @@
 (setq default-indicate-empty-lines t)
 (setq view-read-only t)
 (setq-default view-exit-action #'kill-buffer)
+(and window-system (not mdw-fast-startup)
+     (setq confirm-kill-emacs #'yes-or-no-p))
 (setq whitespace-style '(trailing empty indentation face lines-tail
 			 space-before-tab space-after-tab)
       whitespace-line-column mdw-text-width)
@@ -425,7 +427,7 @@
 (setq url-cookie-untrusted-urls '("."))
 
 (setq browse-url-browser-function (mdw-good-url-browser)
-      browse-url-generic-program "mdw-chrome"
+      browse-url-generic-program "chromium"
       browse-url-mozilla-program "mdw-iceweasel")
 
 (setq w3m-default-display-inline-images t
@@ -646,10 +648,12 @@
   (global-set-key [?\C-c ?t ?w] 'timeclock-workday-remaining-string)
   (global-set-key [?\C-c ?t ?s] 'timeclock-status-string)
   (global-set-key [?\C-c ?m ?m] 'magit-status)
+  (global-set-key [?\C-c ?m ?b] 'magit-blame)
   (global-set-key [?\C-c ?m ?d] 'magit-dispatch-popup)
-  (global-set-key [?\C-c ?m ?w] 'magit-wip-log)
+  (global-set-key [?\C-c ?m ?f] 'magit-find-file)
+  (global-set-key [?\C-c ?m ?4 ?f] 'magit-find-file-other-window)
   (global-set-key [?\C-c ?m ?r] 'magit-list-repositories)
-  (global-set-key [?\C-c ?m ?b] 'magit-blame)
+  (global-set-key [?\C-c ?m ?w] 'magit-wip-log)
   (global-set-key [?\C-c ?p ?p] 'mdw-mpc-play-or-pause)
   (global-set-key [?\C-c ?p ?s] 'mdw-mpc-stop)
   (global-set-key [?\C-c ?p ?<] 'mdw-mpc-prev)
@@ -667,6 +671,7 @@
   (global-set-key [?\M-#] 'calc-dispatch)
   (global-set-key [?\C-x ?/] 'auto-fill-mode)
   (global-set-key [?\C-c ?w ?d] 'mdw-divvy-window)
+  (global-set-key [?\C-c ?w ?w] 'mdw-set-frame-width)
   (global-set-key [insertchar] 'overwrite-mode)
   (global-set-key [?\C-x ?\C-n] 'skel-create-file)
   (global-set-key [?\C-x ?4 ?n] 'skel-create-file-other-window)