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

diff --git a/dot/emacs b/dot/emacs
index 812d279..2cb6100 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -74,7 +74,8 @@
      (not (memq 'git vc-handled-backends))
      (setq vc-handled-backends (cons 'GIT vc-handled-backends)))
 
-(setq magit-log-cutoff-length 512)
+(setq magit-log-cutoff-length 512
+      magit-log-section-arguments '("-n256" "--decorate" "--graph"))
 (defun mdw-magit-try-load-config-extensions ()
   (trap (magit-load-config-extensions)))
 (add-hook 'magit-mode-hook 'mdw-magit-try-load-config-extensions)
@@ -132,7 +133,9 @@
      (progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")
 		  edit-server-new-frame nil
 		  gnuserv-frame t)
-	    (trap (server-start))
+	    (trap (let ((warning-suppress-types
+			 (cons '(server) warning-suppress-types)))
+		    (server-start)))
 	    (trap (progn
 		    (require 'edit-server)
 		    (edit-server-start)
@@ -166,13 +169,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)
 
@@ -328,7 +331,8 @@
       iswitchb-default-method 'samewindow ;in other random frames
       ido-default-file-method 'selected-window
       ido-default-buffer-method 'selected-window)
-(setq ido-enable-flex-matching t
+(setq ido-enable-prefix t
+      ido-enable-flex-matching t
       ido-everywhere t
       ido-confirm-unique-completion t
       ido-use-filename-at-point nil
@@ -337,6 +341,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 +349,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 +357,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)
@@ -365,6 +373,7 @@
 (setq bookmark-save-flag 0)		;Save bookmarks automatically
 (setq vc-follow-symlinks t)
 (setq x-gtk-file-dialog-help-text nil)
+(setq use-dialog-box nil)
 (setq Info-fontify-maximum-menu-size 100000)
 (setq set-mark-command-repeat-pop t)
 (setq password-cache-expiry nil)
@@ -500,9 +509,10 @@
 ;; Appointment management.
 
 (add-hook 'diary-hook 'appt-make-list)
-(setq appt-issue-message t)
-(setq appt-display-interval 3)
-(setq appt-message-warning-time 10)
+(setq appt-issue-message t
+      appt-display-interval 3
+      appt-message-warning-time 10
+      appt-display-diary nil)
 (and (not mdw-fast-startup)
      (trap (require 'org)
 	   (require 'bbdb)
@@ -625,55 +635,61 @@
       (require 'smex) (smex-initialize) (global-set-key [?\M-x] 'smex))
 
 (progn
-  (global-set-key [?\C-c ?\M-x] 'execute-extended-command)
   (global-set-key [?\e ?\e] 'mdw-wrong)
   (global-set-key [?\e ?\C-\] ?\C-\]] 'keyboard-escape-quit)
-  (global-set-key [?\C-c ?w left] 'windmove-left)
-  (global-set-key [?\C-c ?w ?h] 'windmove-left)
-  (global-set-key [?\C-c ?w up] 'windmove-up)
-  (global-set-key [?\C-c ?w ?k] 'windmove-up)
-  (global-set-key [?\C-c ?w down] 'windmove-down)
-  (global-set-key [?\C-c ?w ?j] 'windmove-down)
-  (global-set-key [?\C-c ?w right] 'windmove-right)
-  (global-set-key [?\C-c ?w ?l] 'windmove-right)
-  (global-set-key [?\C-c ?g ?l] 'org-store-link)
+  (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 ?g ?a] 'org-agenda)
   (global-set-key [?\C-c ?g ?b] 'org-iswitchb)
-  (global-set-key [?\C-c ?t ?i] 'timeclock-in)
-  (global-set-key [?\C-c ?t ?c] 'timeclock-change)
-  (global-set-key [?\C-c ?t ?o] 'timeclock-out)
-  (global-set-key [?\C-c ?t ?R] 'timeclock-reread-log)
-  (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 ?g ?l] 'org-store-link)
+  (global-set-key [?\C-c ?k] 'mdw-compile)
+  (global-set-key [?\C-c ?m ?4 ?f] 'magit-find-file-other-window)
+  (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 ?m] 'magit-status)
   (global-set-key [?\C-c ?m ?r] 'magit-list-repositories)
-  (global-set-key [?\C-c ?m ?b] 'magit-blame)
-  (global-set-key [?\C-c ?p ?p] 'mdw-mpc-play-or-pause)
+  (global-set-key [?\C-c ?m ?w] 'magit-wip-log)
   (global-set-key [?\C-c ?p ?s] 'mdw-mpc-stop)
   (global-set-key [?\C-c ?p ?<] 'mdw-mpc-prev)
   (global-set-key [?\C-c ?p ?>] 'mdw-mpc-next)
   (global-set-key [?\C-c ?p ?+] 'mdw-mpc-louder)
   (global-set-key [?\C-c ?p ?-] 'mdw-mpc-quieter)
   (global-set-key [?\C-c ?p ??] 'mdw-mpc-now-playing)
-  (global-set-key [?\C-c ?t ?t] 'gtags-find-tag-from-here)
-  (global-set-key [?\C-c ?t ?.] 'gtags-find-tag)
-  (global-set-key [?\C-c ?t ?r] 'gtags-find-rtag)
+  (global-set-key [?\C-c ?p ?p] 'mdw-mpc-play-or-pause)
   (global-set-key [?\C-c ?t ?4 ?.] 'gtags-find-tag-other-window)
+  (global-set-key [?\C-c ?t ?.] 'gtags-find-tag)
+  (global-set-key [?\C-c ?t ?R] 'timeclock-reread-log)
   (global-set-key [?\C-c ?t ?,] 'gtags-pop-stack)
-  (global-set-key [?\C-c ?k] 'mdw-compile)
-  (global-set-key [?\C-x ?3] 'mdw-split-window-horizontally)
-  (global-set-key [?\M-#] 'calc-dispatch)
-  (global-set-key [?\C-x ?/] 'auto-fill-mode)
+  (global-set-key [?\C-c ?t ?c] 'timeclock-change)
+  (global-set-key [?\C-c ?t ?i] 'timeclock-in)
+  (global-set-key [?\C-c ?t ?o] 'timeclock-out)
+  (global-set-key [?\C-c ?t ?r] 'gtags-find-rtag)
+  (global-set-key [?\C-c ?t ?s] 'timeclock-status-string)
+  (global-set-key [?\C-c ?t ?t] 'gtags-find-tag-from-here)
+  (global-set-key [?\C-c ?t ?w] 'timeclock-workday-remaining-string)
+  (global-set-key [?\C-c ?v ?v] 'mdw-auto-revert)
   (global-set-key [?\C-c ?w ?d] 'mdw-divvy-window)
-  (global-set-key [insertchar] 'overwrite-mode)
+  (global-set-key [?\C-c ?w ?h] 'windmove-left)
+  (global-set-key [?\C-c ?w ?j] 'windmove-down)
+  (global-set-key [?\C-c ?w ?k] 'windmove-up)
+  (global-set-key [?\C-c ?w ?l] 'windmove-right)
+  (global-set-key [?\C-c ?w ?w] 'mdw-set-frame-width)
+  (global-set-key [?\C-c ?w up] 'windmove-up)
+  (global-set-key [?\C-c ?w down] 'windmove-down)
+  (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 ?\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)
-  (global-set-key [delete] 'delete-char)
+  (global-set-key [?\C-x ?3] 'mdw-split-window-horizontally)
+  (global-set-key [?\C-x ?/] 'auto-fill-mode)
+  (global-set-key [?\M-#] 'calc-dispatch)
   (global-set-key [?\M-q] 'mdw-fill-paragraph)
-  (global-set-key [?\C-h ?\C-m] 'manual-entry)
+  (global-set-key [delete] 'delete-char)
+  (global-set-key [insertchar] 'overwrite-mode)
   (global-set-key [C-M-backspace] 'backward-kill-sexp)
   (global-set-key [mode-line C-mouse-1] 'mouse-tear-off-window)
   (global-set-key [vertical-scroll-bar C-down-mouse-1]
@@ -682,8 +698,6 @@
 		  #'(lambda () (interactive)))
   (global-set-key [M-S-mouse-3] 'imenu)
   (global-set-key [XF86WakeUp] "")
-  (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 [f11] 'mdw-toggle-full-screen)
   (and (not mdw-fast-startup) (fboundp 'hippie-expand)
        (global-set-key [?\M-?] 'hippie-expand)))
@@ -731,6 +745,7 @@
 
 (setq auto-mode-alist
       (append `(("\\.p[lm]$" . cperl-mode)
+		("\\.sage$" . python-mode)
 		("\\.m$" . objc-mode)
 		("\\.mxd$" . c-mode)
 		("\\.cs$" . csharp-mode)
@@ -771,6 +786,7 @@
       (append `(("runlisp" . lisp-mode)
 		("@BASH@" . sh-mode)
 		("@PYTHON@" . python-mode)
+		("sage" . python-mode)
 		("@PERL@" . cperl-mode)
 		("perl" . cperl-mode)
 		("@TCLSH@" . tcl-mode)
@@ -1017,10 +1033,11 @@
 	(t . "sec:")))
 
 (setq bibtex-field-delimiters 'double-quotes
+      bibtex-align-at-equal-sign t
       bibtex-entry-format '(realign opts-or-alts required-fields
 			    numerical-fields last-comma delimiters
-			    unify-case)
-      bibtex-include-OPTkey nil)
+			    unify-case sort-fields braces)
+      bibtex-include-OPTkey t)
 
 ;;;--------------------------------------------------------------------------
 ;;; SLIME setup.