X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/8dcbf9687ae1e80bae3d8ce434e86cba0442d6bd..e48c2e5bf23439a671ced9423003faa49c1510ca:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 4bf9ae9..cf5097c 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -172,7 +172,7 @@
       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)
 
@@ -337,6 +337,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
       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]
@@ -344,6 +345,7 @@
 (setq scroll-step 5)			;Don't scroll too much at a time
 (setq blink-cursor-blinks 0)		;Keep blinking the cursor
 (setq-default fill-column mdw-text-width) ;I use rather narrow windows
+(setq adaptive-fill-mode nil)		;I have my own machinery instead
 (setq reb-re-syntax 'string)		;Enough backslashes even with this
 (setq-default comment-column 40)	;Set a standard comment column
 (setq-default truncate-partial-width-windows nil
@@ -351,6 +353,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)
@@ -646,10 +650,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 +673,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)