X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/cfa1824e2674ca83f7d8b543889ce7d77003858b..60c22e1bb67d984e0c897e0970aca35620e6ceb8:/el/dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index f917905..80fc05a 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -52,6 +52,17 @@ This may be at the expense of cool features.")
 	   (debug 0))
   `',(make-regexp list))
 
+(defun mdw-wrong ()
+  "This is not the key sequence you're looking for."
+  (interactive)
+  (error "wrong button"))
+
+(defun mdw-emacs-version-p (major &optional minor)
+  "Return non-nil if the running Emacs is at least version MAJOR.MINOR."
+  (or (> emacs-major-version major)
+      (and (= emacs-major-version major)
+	   (>= emacs-minor-version (or minor 0)))))
+
 ;; Some error trapping.
 ;;
 ;; If individual bits of this file go tits-up, we don't particularly want
@@ -91,6 +102,23 @@ This may be at the expense of cool features.")
 		    (concat "(" (buffer-string) ")")))))))
   (cdr (assq sym mdw-config)))
 
+;; Width configuration.
+
+(defvar mdw-column-width
+  (string-to-number (or (mdw-config 'emacs-width) "77"))
+  "Width of Emacs columns.")
+(defvar mdw-text-width mdw-column-width
+  "Expected width of text within columns.")
+(put 'mdw-text-width 'safe-local-variable 'integerp)
+
+;; Local variables hacking.
+
+(defun run-local-vars-mode-hook ()
+  "Run a hook for the major-mode after local variables have been processed."
+  (run-hooks (intern (concat (symbol-name major-mode)
+			     "-local-variables-hook"))))
+(add-hook 'hack-local-variables-hook 'run-local-vars-mode-hook)
+
 ;; Set up the load path convincingly.
 
 (dolist (dir (append (and (boundp 'debian-emacs-flavor)
@@ -176,10 +204,9 @@ fringes is not taken out of the allowance for WIDTH, unlike
   "Split a wide window into appropriate widths."
   (interactive "P")
   (setq width (cond (width (prefix-numeric-value width))
-		    ((and window-system
-			  (>= emacs-major-version 22))
-		     77)
-		    (t 78)))
+		    ((and window-system (mdw-emacs-version-p 22))
+		     mdw-column-width)
+		    (t (1+ mdw-column-width))))
   (let* ((win (selected-window))
 	 (sb-width (mdw-horizontal-window-overhead))
 	 (c (/ (+ (window-width) sb-width)
@@ -212,6 +239,40 @@ frame is actually mapped on the screen."
        ad-do-it)))
 
 (mdw-advise-to-inhibit-raise-frame select-frame-set-input-focus)
+(mdw-advise-to-inhibit-raise-frame appt-disp-window)
+
+;; Bug fix for markdown-mode, which breaks point positioning during
+;; `query-replace'.
+(defadvice markdown-check-change-for-wiki-link
+    (around mdw-save-match activate compile)
+  "Save match data around the `markdown-mode' `after-change-functions' hook."
+  (save-match-data ad-do-it))
+
+;; Bug fix for `bbdb-canonicalize-address': on Emacs 24, `run-hook-with-args'
+;; always returns nil, with the result that all email addresses are lost.
+;; Replace the function entirely.
+(defadvice bbdb-canonicalize-address
+    (around mdw-bug-fix activate compile)
+  "Don't use `run-hook-with-args', because that doesn't work."
+  (let ((net (ad-get-arg 0)))
+
+    ;; Make sure this is a proper hook list.
+    (if (functionp bbdb-canonicalize-net-hook)
+	(setq bbdb-canonicalize-net-hook (list bbdb-canonicalize-net-hook)))
+
+    ;; Iterate over the hooks until things converge.
+    (let ((donep nil))
+      (while (not donep)
+	(let (next (changep nil)
+	      hook (hooks bbdb-canonicalize-net-hook))
+	  (while hooks
+	    (setq hook (pop hooks))
+	    (setq next (funcall hook net))
+	    (if (not (equal next net))
+		(setq changep t
+		      net next)))
+	  (setq donep (not changep)))))
+    (setq ad-return-value net)))
 
 ;; Transient mark mode hacks.
 
@@ -234,6 +295,11 @@ it's currently off."
 
 ;; Functions for sexp diary entries.
 
+(defun mdw-not-org-mode (form)
+  "As FORM, but not in Org mode agenda."
+  (and (not mdw-diary-for-org-mode-p)
+       (eval form)))
+
 (defun mdw-weekday (l)
   "Return non-nil if `date' falls on one of the days of the week in L.
 L is a list of day numbers (from 0 to 6 for Sunday through to
@@ -245,6 +311,50 @@ function returns non-nil."
 	(memq (nth d '(sunday monday tuesday wednesday
 			      thursday friday saturday)) l))))
 
+(defun mdw-discordian-date (date)
+  "Return the Discordian calendar date corresponding to DATE.
+
+The return value is (YOLD . st-tibs-day) or (YOLD SEASON DAYNUM DOW).
+
+The original is by David Pearson.  I modified it to produce date components
+as output rather than a string."
+  (let* ((days ["Sweetmorn" "Boomtime" "Pungenday"
+		"Prickle-Prickle" "Setting Orange"])
+	 (months ["Chaos" "Discord" "Confusion"
+		  "Bureaucracy" "Aftermath"])
+	 (day-count [0 31 59 90 120 151 181 212 243 273 304 334])
+	 (year (- (extract-calendar-year date) 1900))
+	 (month (1- (extract-calendar-month date)))
+	 (day (1- (extract-calendar-day date)))
+	 (julian (+ (aref day-count month) day))
+	 (dyear	(+ year 3066)))
+    (if (and (= month 1) (= day 28))
+	(cons dyear 'st-tibs-day)
+      (list dyear
+	    (aref months (floor (/ julian 73)))
+	    (1+ (mod julian 73))
+	    (aref days (mod julian 5))))))
+
+(defun mdw-diary-discordian-date ()
+  "Convert the date in `date' to a string giving the Discordian date."
+  (let* ((ddate (mdw-discordian-date date))
+	 (tail (format "in the YOLD %d" (car ddate))))
+    (if (eq (cdr ddate) 'st-tibs-day)
+	(format "St Tib's Day %s" tail)
+      (let ((season (cadr ddate))
+	    (daynum (caddr ddate))
+	    (dayname (cadddr ddate)))
+      (format "%s, the %d%s day of %s %s"
+	      dayname
+	      daynum
+	      (let ((ldig (mod daynum 10)))
+		(cond ((= ldig 1) "st")
+		      ((= ldig 2) "nd")
+		      ((= ldig 3) "rd")
+		      (t "th")))
+	      season
+	      tail)))))
+
 (defun mdw-todo (&optional when)
   "Return non-nil today, or on WHEN, whichever is later."
   (let ((w (calendar-absolute-from-gregorian (calendar-current-date)))
@@ -264,6 +374,52 @@ function returns non-nil."
 				(nth 2 when))))))))
     (eq w d)))
 
+(defvar mdw-diary-for-org-mode-p nil)
+
+(defadvice org-agenda-list (around mdw-preserve-links activate)
+  (let ((mdw-diary-for-org-mode-p t))
+    ad-do-it))
+
+(defadvice diary-add-to-list (before mdw-trim-leading-space compile activate)
+  "Trim leading space from the diary entry string."
+  (save-match-data
+    (let ((str (ad-get-arg 1))
+	  (done nil) old)
+      (while (not done)
+	(setq old str)
+	(setq str (cond ((null str) nil)
+			((string-match "\\(^\\|\n\\)[ \t]+" str)
+			 (replace-match "\\1" nil nil str))
+			((and mdw-diary-for-org-mode-p
+			      (string-match (concat
+					     "\\(^\\|\n\\)"
+					     "\\(" diary-time-regexp
+					     "\\(-" diary-time-regexp "\\)?"
+					     "\\)"
+					     "\\(\t[ \t]*\\| [ \t]+\\)")
+					    str))
+			 (replace-match "\\1\\2 " nil nil str))
+			((and (not mdw-diary-for-org-mode-p)
+			      (string-match "\\[\\[[^][]*]\\[\\([^][]*\\)]]"
+					    str))
+			 (replace-match "\\1" nil nil str))
+			(t str)))
+	(if (equal str old) (setq done t)))
+      (ad-set-arg 1 str))))
+
+(defadvice org-bbdb-anniversaries (after mdw-fixup-list compile activate)
+  "Return a string rather than a list."
+  (with-temp-buffer
+    (let ((anyp nil))
+      (dolist (e (let ((ee ad-return-value))
+		   (if (atom ee) (list ee) ee)))
+	(when e
+	  (when anyp (insert ?\n))
+	  (insert e)
+	  (setq anyp t)))
+      (setq ad-return-value
+	    (and anyp (buffer-string))))))
+
 ;; Fighting with Org-mode's evil key maps.
 
 (defvar mdw-evil-keymap-keys
@@ -431,6 +587,27 @@ so that it can be used for convenient filtering."
 	  (setenv "REAL_MOVEMAIL" try))
       (setq path (cdr path)))))
 
+;; AUTHINFO GENERIC kludge.
+
+(defvar nntp-authinfo-generic nil
+  "Set to the `NNTPAUTH' string to pass on to `authinfo-kludge'.
+
+Use this to arrange for per-server settings.")
+
+(defun nntp-open-authinfo-kludge (buffer)
+  "Open a connection to SERVER using `authinfo-kludge'."
+  (let ((proc (start-process "nntpd" buffer
+			     "env" (concat "NNTPAUTH="
+					   (or nntp-authinfo-generic
+					       (getenv "NNTPAUTH")
+					       (error "NNTPAUTH unset")))
+			     "authinfo-kludge" nntp-address)))
+    (set-buffer buffer)
+    (nntp-wait-for-string "^\r*200")
+    (beginning-of-line)
+    (delete-region (point-min) (point))
+    proc))
+
 (eval-after-load "erc"
     '(load "~/.ercrc.el"))
 
@@ -544,7 +721,8 @@ sequences separated by `.'."
 	(cond ((null la) (throw 'done lb))
 	      ((null lb) (throw 'done nil))
 	      ((< (car la) (car lb)) (throw 'done t))
-	      ((= (car la) (car lb)) (setq la (cdr la) lb (cdr lb))))))))
+	      ((= (car la) (car lb)) (setq la (cdr la) lb (cdr lb)))
+	      (t (throw 'done nil)))))))
 
 (defun mdw-check-autorevert ()
   "Sets global-auto-revert-ignore-buffer appropriately for this buffer.
@@ -797,6 +975,8 @@ case."
       (whitespace-mode arg))
     (setq show-trailing-whitespace whitespace-mode)))
 
+(defvar mdw-do-misc-mode-hacking nil)
+
 (defun mdw-misc-mode-config ()
   (and mdw-auto-indent
        (cond ((eq major-mode 'lisp-mode)
@@ -806,14 +986,13 @@ case."
 	      nil)
 	     (t
 	      (local-set-key "\C-m" 'newline-and-indent))))
+  (set (make-local-variable 'mdw-do-misc-mode-hacking) t)
   (local-set-key [C-return] 'newline)
   (make-local-variable 'page-delimiter)
   (setq page-delimiter "\f\\|^.*-\\{6\\}.*$")
   (setq comment-column 40)
   (auto-fill-mode 1)
-  (setq fill-column 77)
-  (setq show-trailing-whitespace t)
-  (mdw-whitespace-mode 1)
+  (setq fill-column mdw-text-width)
   (and (fboundp 'gtags-mode)
        (gtags-mode))
   (if (fboundp 'hs-minor-mode)
@@ -822,8 +1001,28 @@ case."
   (reveal-mode t)
   (trap (turn-on-font-lock)))
 
-(defun mdw-post-config-mode-hack ()
-  (mdw-whitespace-mode 1))
+(defun mdw-post-local-vars-misc-mode-config ()
+  (setq whitespace-line-column mdw-text-width)
+  (when (and mdw-do-misc-mode-hacking
+	     (not buffer-read-only))
+    (setq show-trailing-whitespace t)
+    (mdw-whitespace-mode 1)))
+(add-hook 'hack-local-variables-hook 'mdw-post-local-vars-misc-mode-config)
+
+(defmacro mdw-advise-update-angry-fruit-salad (&rest funcs)
+  `(progn ,@(mapcar (lambda (func)
+		      `(defadvice ,func
+			   (after mdw-angry-fruit-salad activate)
+			 (when mdw-do-misc-mode-hacking
+			   (setq show-trailing-whitespace
+				 (not buffer-read-only))
+			   (mdw-whitespace-mode (if buffer-read-only 0 1)))))
+		    funcs)))
+(mdw-advise-update-angry-fruit-salad toggle-read-only
+				     read-only-mode
+				     view-mode
+				     view-mode-enable
+				     view-mode-disable)
 
 (eval-after-load 'gtags
   '(progn
@@ -893,7 +1092,11 @@ doesn't match any of the regular expressions in
   (if (not mdw-point-overlay-mode)
       (mdw-remove-point-overlay)
     (overlay-put mdw-point-overlay 'window (selected-window))
-    (move-overlay mdw-point-overlay (point) (1+ (point)) (current-buffer))))
+    (if (bolp)
+	(move-overlay mdw-point-overlay
+		      (point) (1+ (point)) (current-buffer))
+      (move-overlay mdw-point-overlay
+		    (1- (point)) (point) (current-buffer)))))
 
 (defvar mdw-point-overlay-buffers nil
   "List of buffers using `mdw-point-overlay-mode'.")
@@ -924,14 +1127,51 @@ doesn't match any of the regular expressions in
   (lambda () (if (not (minibufferp)) (mdw-point-overlay-mode t))))
 
 ;;;--------------------------------------------------------------------------
+;;; Fullscreen-ness.
+
+(defvar mdw-full-screen-parameters
+  '((menu-bar-lines . 0)
+    ;(vertical-scroll-bars . nil)
+    )
+  "Frame parameters to set when making a frame fullscreen.")
+
+(defvar mdw-full-screen-save
+  '(width height)
+  "Extra frame parameters to save when setting fullscreen.")
+
+(defun mdw-toggle-full-screen (&optional frame)
+  "Show the FRAME fullscreen."
+  (interactive)
+  (when window-system
+    (cond ((frame-parameter frame 'fullscreen)
+	   (set-frame-parameter frame 'fullscreen nil)
+	   (modify-frame-parameters
+	    nil
+	    (or (frame-parameter frame 'mdw-full-screen-saved)
+		(mapcar (lambda (assoc)
+			  (assq (car assoc) default-frame-alist))
+			mdw-full-screen-parameters))))
+	  (t
+	   (let ((saved (mapcar (lambda (param)
+				  (cons param (frame-parameter frame param)))
+				(append (mapcar #'car
+						mdw-full-screen-parameters)
+					mdw-full-screen-save))))
+	     (set-frame-parameter frame 'mdw-full-screen-saved saved))
+	   (modify-frame-parameters frame mdw-full-screen-parameters)
+	   (set-frame-parameter frame 'fullscreen 'fullboth)))))
+
+;;;--------------------------------------------------------------------------
 ;;; General fontification.
 
+(make-face 'mdw-virgin-face)
+
 (defmacro mdw-define-face (name &rest body)
   "Define a face, and make sure it's actually set as the definition."
   (declare (indent 1)
 	   (debug 0))
   `(progn
-     (make-face ',name)
+     (copy-face 'mdw-virgin-face ',name)
      (defvar ,name ',name)
      (put ',name 'face-defface-spec ',body)
      (face-spec-set ',name ',body nil)))
@@ -945,7 +1185,7 @@ doesn't match any of the regular expressions in
   (((type w32)) :family "courier new" :height 85)
   (((type x)) :family "6x13" :foundry "trad" :height 130)
   (t :foreground "white" :background "black"))
-(if (>= emacs-major-version 23)
+(if (mdw-emacs-version-p 23)
     (mdw-define-face variable-pitch
       (((type x)) :family "sans" :height 100))
   (mdw-define-face variable-pitch
@@ -1009,6 +1249,9 @@ doesn't match any of the regular expressions in
 (mdw-define-face trailing-whitespace
   (((class color)) :background "red")
   (t :inverse-video t))
+(mdw-define-face whitespace-line
+  (((class color)) :background "darkred")
+  (t :inverse-video t))
 (mdw-define-face mdw-punct-face
   (((type tty)) :foreground "yellow") (t :foreground "burlywood2"))
 (mdw-define-face mdw-number-face
@@ -1044,30 +1287,66 @@ doesn't match any of the regular expressions in
   (t :background "red" :foreground "white" :weight bold))
 (mdw-define-face message-cited-text
   (default :slant italic)
-  (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
+  (((type tty)) :foreground "cyan") (t :foreground "SkyBlue1"))
 (mdw-define-face message-header-cc
-  (default :weight bold)
+  (default :slant italic)
   (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
 (mdw-define-face message-header-newsgroups
-  (default :weight bold)
+  (default :slant italic)
   (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
 (mdw-define-face message-header-subject
-  (default :weight bold)
   (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
 (mdw-define-face message-header-to
-  (default :weight bold)
   (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
 (mdw-define-face message-header-xheader
-  (default :weight bold)
+  (default :slant italic)
   (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
 (mdw-define-face message-header-other
-  (default :weight bold)
+  (default :slant italic)
   (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
 (mdw-define-face message-header-name
+  (default :weight bold)
   (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
+
 (mdw-define-face which-func
   (t nil))
 
+(mdw-define-face gnus-header-name
+  (default :weight bold)
+  (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
+(mdw-define-face gnus-header-subject
+  (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
+(mdw-define-face gnus-header-from
+  (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
+(mdw-define-face gnus-header-to
+  (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
+(mdw-define-face gnus-header-content
+  (default :slant italic)
+  (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
+
+(mdw-define-face gnus-cite-1
+  (((type tty)) :foreground "cyan") (t :foreground "SkyBlue1"))
+(mdw-define-face gnus-cite-2
+  (((type tty)) :foreground "blue") (t :foreground "RoyalBlue2"))
+(mdw-define-face gnus-cite-3
+  (((type tty)) :foreground "magenta") (t :foreground "MediumOrchid"))
+(mdw-define-face gnus-cite-4
+  (((type tty)) :foreground "red") (t :foreground "firebrick2"))
+(mdw-define-face gnus-cite-5
+  (((type tty)) :foreground "yellow") (t :foreground "burlywood2"))
+(mdw-define-face gnus-cite-6
+  (((type tty)) :foreground "green") (t :foreground "SeaGreen1"))
+(mdw-define-face gnus-cite-7
+  (((type tty)) :foreground "cyan") (t :foreground "SlateBlue1"))
+(mdw-define-face gnus-cite-8
+  (((type tty)) :foreground "blue") (t :foreground "RoyalBlue2"))
+(mdw-define-face gnus-cite-9
+  (((type tty)) :foreground "magenta") (t :foreground "purple2"))
+(mdw-define-face gnus-cite-10
+  (((type tty)) :foreground "red") (t :foreground "DarkOrange2"))
+(mdw-define-face gnus-cite-11
+  (t :foreground "grey"))
+
 (mdw-define-face diff-header
   (t nil))
 (mdw-define-face diff-index
@@ -1089,35 +1368,63 @@ doesn't match any of the regular expressions in
 (mdw-define-face diff-refine-change
   (((class color) (type x)) :background "RoyalBlue4")
   (t :underline t))
+(mdw-define-face diff-refine-removed
+  (((class color) (type x)) :background "#500")
+  (t :underline t))
+(mdw-define-face diff-refine-added
+  (((class color) (type x)) :background "#050")
+  (t :underline t))
+
+(setq ediff-force-faces t)
+(mdw-define-face ediff-current-diff-A
+  (((class color) (type x)) :background "darkred")
+  (((class color) (type tty)) :background "red")
+  (t :inverse-video t))
+(mdw-define-face ediff-fine-diff-A
+  (((class color) (type x)) :background "red3")
+  (((class color) (type tty)) :inverse-video t)
+  (t :inverse-video nil))
+(mdw-define-face ediff-even-diff-A
+  (((class color) (type x)) :background "#300"))
+(mdw-define-face ediff-odd-diff-A
+  (((class color) (type x)) :background "#300"))
+(mdw-define-face ediff-current-diff-B
+  (((class color) (type x)) :background "darkgreen")
+  (((class color) (type tty)) :background "magenta")
+  (t :inverse-video t))
+(mdw-define-face ediff-fine-diff-B
+  (((class color) (type x)) :background "green4")
+  (((class color) (type tty)) :inverse-video t)
+  (t :inverse-video nil))
+(mdw-define-face ediff-even-diff-B
+  (((class color) (type x)) :background "#020"))
+(mdw-define-face ediff-odd-diff-B
+  (((class color) (type x)) :background "#020"))
+(mdw-define-face ediff-current-diff-C
+  (((class color) (type x)) :background "darkblue")
+  (((class color) (type tty)) :background "blue")
+  (t :inverse-video t))
+(mdw-define-face ediff-fine-diff-C
+  (((class color) (type x)) :background "blue1")
+  (((class color) (type tty)) :inverse-video t)
+  (t :inverse-video nil))
+(mdw-define-face ediff-even-diff-C
+  (((class color) (type x)) :background "#004"))
+(mdw-define-face ediff-odd-diff-C
+  (((class color) (type x)) :background "#004"))
+(mdw-define-face ediff-current-diff-Ancestor
+  (((class color) (type x)) :background "#630")
+  (((class color) (type tty)) :background "blue")
+  (t :inverse-video t))
+(mdw-define-face ediff-even-diff-Ancestor
+  (((class color) (type x)) :background "#320"))
+(mdw-define-face ediff-odd-diff-Ancestor
+  (((class color) (type x)) :background "#320"))
 
 (mdw-define-face dylan-header-background
   (((class color) (type x)) :background "NavyBlue")
   (t :background "blue"))
 
-(mdw-define-face magit-diff-add
-  (t :foreground "green"))
-(mdw-define-face magit-diff-del
-  (t :foreground "red"))
-(mdw-define-face magit-diff-file-header
-  (t :weight bold))
-(mdw-define-face magit-diff-hunk-header
-  (t :foreground "SkyBlue1"))
-(mdw-define-face magit-item-highlight
-  (((type tty)) :background "blue")
-  (t :background "DarkSeaGreen4"))
-(mdw-define-face magit-log-head-label-remote
-  (((type tty)) :background "cyan" :foreground "green")
-  (t :background "grey11" :foreground "DarkSeaGreen2" :box t))
-(mdw-define-face magit-log-head-label-local
-  (((type tty)) :background "cyan" :foreground "yellow")
-  (t :background "grey11" :foreground "LightSkyBlue1" :box t))
-(mdw-define-face magit-log-head-label-tags
-  (((type tty)) :background "red" :foreground "yellow")
-  (t :background "LemonChiffon1" :foreground "goldenrod4" :box t))
-(mdw-define-face magit-log-graph
-  (((type tty)) :foreground "magenta")
-  (t :foreground "grey80"))
-
 (mdw-define-face erc-input-face
   (t :foreground "red"))
 
@@ -1174,7 +1481,7 @@ doesn't match any of the regular expressions in
 (mdw-define-face mdw-ellipsis-face
   (((type tty)) :foreground "blue") (t :foreground "grey60"))
 (let ((dollar (make-glyph-code ?$ 'mdw-ellipsis-face))
-      (backslash (make-glyph-code ?\ 'mdw-ellipsis-face))
+      (backslash (make-glyph-code ?\\ 'mdw-ellipsis-face))
       (dot (make-glyph-code ?. 'mdw-ellipsis-face))
       (bar (make-glyph-code ?| mdw-ellipsis-face)))
   (set-display-table-slot standard-display-table 0 dollar)
@@ -1186,17 +1493,6 @@ doesn't match any of the regular expressions in
 ;;;--------------------------------------------------------------------------
 ;;; C programming configuration.
 
-;; Linux kernel hacking.
-
-(defvar linux-c-mode-hook)
-
-(defun linux-c-mode ()
-  (interactive)
-  (c-mode)
-  (setq major-mode 'linux-c-mode)
-  (setq mode-name "Linux C")
-  (run-hooks 'linux-c-mode-hook))
-
 ;; Make C indentation nice.
 
 (defun mdw-c-lineup-arglist (langelem)
@@ -1215,28 +1511,108 @@ doesn't match any of the regular expressions in
 	c-basic-offset
       nil)))
 
-(defun mdw-c-style ()
-  (c-add-style "[mdw] C and C++ style"
-	       '((c-basic-offset . 2)
-		 (comment-column . 40)
-		 (c-class-key . "class")
-		 (c-backslash-column . 72)
-		 (c-offsets-alist
-		  (substatement-open . (add 0 c-indent-one-line-block))
-		  (defun-open . (add 0 c-indent-one-line-block))
-		  (arglist-cont-nonempty . mdw-c-lineup-arglist)
-		  (topmost-intro . mdw-c-indent-extern-mumble)
-		  (cpp-define-intro . 0)
-		  (knr-argdecl . 0)
-		  (inextern-lang . [0])
-		  (label . 0)
-		  (case-label . +)
-		  (access-label . -)
-		  (inclass . +)
-		  (inline-open . ++)
-		  (statement-cont . +)
-		  (statement-case-intro . +)))
-	       t))
+(defun mdw-c-indent-arglist-nested (langelem)
+  "Indent continued argument lists.
+If we've nested more than one argument list, then only introduce a single
+indentation anyway."
+  (let ((context c-syntactic-context)
+	(pos (c-langelem-2nd-pos c-syntactic-element))
+	(should-indent-p t))
+    (while (and context
+		(eq (caar context) 'arglist-cont-nonempty))
+      (when (and (= (caddr (pop context)) pos)
+		 context
+		 (memq (caar context) '(arglist-intro
+					arglist-cont-nonempty)))
+	(setq should-indent-p nil)))
+    (if should-indent-p '+ 0)))
+
+(defvar mdw-define-c-styles-hook nil
+  "Hook run when `cc-mode' starts up to define styles.")
+
+(defmacro mdw-define-c-style (name &rest assocs)
+  "Define a C style, called NAME (a symbol), setting ASSOCs.
+A function, named `mdw-define-c-style/NAME', is defined to actually install
+the style using `c-add-style', and added to the hook
+`mdw-define-c-styles-hook'.  If CC Mode is already loaded, then the style is
+set."
+  (declare (indent defun))
+  (let* ((name-string (symbol-name name))
+	 (func (intern (concat "mdw-define-c-style/" name-string))))
+    `(progn
+       (defun ,func () (c-add-style ,name-string ',assocs))
+       (and (featurep 'cc-mode) (,func))
+       (add-hook 'mdw-define-c-styles-hook ',func))))
+
+(eval-after-load "cc-mode"
+  '(run-hooks 'mdw-define-c-styles-hook))
+
+(mdw-define-c-style mdw-trustonic-c
+  (c-basic-offset . 4)
+  (comment-column . 0)
+  (c-indent-comment-alist (anchored-comment . (column . 0))
+			  (end-block . (space . 1))
+			  (cpp-end-block . (space . 1))
+			  (other . (space . 1)))
+  (c-class-key . "class")
+  (c-backslash-column . 0)
+  (c-auto-align-backslashes . nil)
+  (c-label-minimum-indentation . 0)
+  (c-offsets-alist (substatement-open . (add 0 c-indent-one-line-block))
+		   (defun-open . (add 0 c-indent-one-line-block))
+		   (arglist-cont-nonempty . mdw-c-indent-arglist-nested)
+		   (topmost-intro . mdw-c-indent-extern-mumble)
+		   (cpp-define-intro . 0)
+		   (knr-argdecl . 0)
+		   (inextern-lang . [0])
+		   (label . 0)
+		   (case-label . +)
+		   (access-label . -2)
+		   (inclass . +)
+		   (inline-open . ++)
+		   (statement-cont . +)
+		   (statement-case-intro . +)))
+
+(mdw-define-c-style mdw-c
+  (c-basic-offset . 2)
+  (comment-column . 40)
+  (c-class-key . "class")
+  (c-backslash-column . 72)
+  (c-label-minimum-indentation . 0)
+  (c-offsets-alist (substatement-open . (add 0 c-indent-one-line-block))
+		   (defun-open . (add 0 c-indent-one-line-block))
+		   (arglist-cont-nonempty . mdw-c-lineup-arglist)
+		   (topmost-intro . mdw-c-indent-extern-mumble)
+		   (cpp-define-intro . 0)
+		   (knr-argdecl . 0)
+		   (inextern-lang . [0])
+		   (label . 0)
+		   (case-label . +)
+		   (access-label . -)
+		   (inclass . +)
+		   (inline-open . ++)
+		   (statement-cont . +)
+		   (statement-case-intro . +)))
+
+(defun mdw-set-default-c-style (modes style)
+  "Update the default CC Mode style for MODES to be STYLE.
+
+MODES may be a list of major mode names or a singleton.  STYLE is a style
+name, as a symbol."
+  (let ((modes (if (listp modes) modes (list modes)))
+	(style (symbol-name style)))
+    (setq c-default-style
+	  (append (mapcar (lambda (mode)
+			    (cons mode style))
+			  modes)
+		  (remove-if (lambda (assoc)
+			       (memq (car assoc) modes))
+			     (if (listp c-default-style)
+				 c-default-style
+			       (list (cons 'other c-default-style))))))))
+(setq c-default-style "mdw-c")
+
+(mdw-set-default-c-style '(c-mode c++-mode) 'mdw-c)
 
 (defvar mdw-c-comment-fill-prefix
   `((,(concat "\\([ \t]*/?\\)"
@@ -1255,78 +1631,87 @@ doesn't match any of the regular expressions in
   (modify-syntax-entry ?\n "> b")
 
   ;; Other stuff.
-  (mdw-c-style)
-  (setq c-hanging-comment-ender-p nil)
-  (setq c-backslash-column 72)
-  (setq c-label-minimum-indentation 0)
   (setq mdw-fill-prefix mdw-c-comment-fill-prefix)
 
   ;; Now define things to be fontified.
   (make-local-variable 'font-lock-keywords)
   (let ((c-keywords
-	 (mdw-regexps "and"		;C++
-		      "and_eq"		;C++
-		      "asm"		;K&R, GCC
-		      "auto"		;K&R, C89
-		      "bitand"		;C++
-		      "bitor"		;C++
-		      "bool"		;C++, C9X macro
-		      "break"		;K&R, C89
-		      "case"		;K&R, C89
-		      "catch"		;C++
-		      "char"		;K&R, C89
-		      "class"		;C++
-		      "complex"		;C9X macro, C++ template type
-		      "compl"		;C++
-		      "const"		;C89
-		      "const_cast"	;C++
-		      "continue"	;K&R, C89
-		      "defined"		;C89 preprocessor
-		      "default"		;K&R, C89
-		      "delete"		;C++
-		      "do"		;K&R, C89
-		      "double"		;K&R, C89
-		      "dynamic_cast"	;C++
-		      "else"		;K&R, C89
-		      ;; "entry"	;K&R -- never used
-		      "enum"		;C89
-		      "explicit"	;C++
-		      "export"		;C++
-		      "extern"		;K&R, C89
-		      "float"		;K&R, C89
-		      "for"		;K&R, C89
-		      ;; "fortran"	;K&R
-		      "friend"		;C++
-		      "goto"		;K&R, C89
-		      "if"		;K&R, C89
-		      "imaginary"	;C9X macro
-		      "inline"		;C++, C9X, GCC
-		      "int"		;K&R, C89
-		      "long"		;K&R, C89
-		      "mutable"		;C++
-		      "namespace"	;C++
-		      "new"		;C++
-		      "operator"	;C++
-		      "or"		;C++
-		      "or_eq"		;C++
-		      "private"		;C++
-		      "protected"	;C++
-		      "public"		;C++
-		      "register"	;K&R, C89
+	 (mdw-regexps "alignas"		 ;C11 macro, C++11
+		      "alignof"		 ;C++11
+		      "and"		 ;C++, C95 macro
+		      "and_eq"		 ;C++, C95 macro
+		      "asm"		 ;K&R, C++, GCC
+		      "atomic"		 ;C11 macro, C++11 template type
+		      "auto"		 ;K&R, C89
+		      "bitand"		 ;C++, C95 macro
+		      "bitor"		 ;C++, C95 macro
+		      "bool"		 ;C++, C99 macro
+		      "break"		 ;K&R, C89
+		      "case"		 ;K&R, C89
+		      "catch"		 ;C++
+		      "char"		 ;K&R, C89
+		      "char16_t"	 ;C++11, C11 library type
+		      "char32_t"	 ;C++11, C11 library type
+		      "class"		 ;C++
+		      "complex"		 ;C99 macro, C++ template type
+		      "compl"		 ;C++, C95 macro
+		      "const"		 ;C89
+		      "constexpr"	 ;C++11
+		      "const_cast"	 ;C++
+		      "continue"	 ;K&R, C89
+		      "decltype"	 ;C++11
+		      "defined"		 ;C89 preprocessor
+		      "default"		 ;K&R, C89
+		      "delete"		 ;C++
+		      "do"		 ;K&R, C89
+		      "double"		 ;K&R, C89
+		      "dynamic_cast"	 ;C++
+		      "else"		 ;K&R, C89
+		      ;; "entry"	 ;K&R -- never used
+		      "enum"		 ;C89
+		      "explicit"	 ;C++
+		      "export"		 ;C++
+		      "extern"		 ;K&R, C89
+		      "float"		 ;K&R, C89
+		      "for"		 ;K&R, C89
+		      ;; "fortran"	 ;K&R
+		      "friend"		 ;C++
+		      "goto"		 ;K&R, C89
+		      "if"		 ;K&R, C89
+		      "imaginary"	 ;C99 macro
+		      "inline"		 ;C++, C99, GCC
+		      "int"		 ;K&R, C89
+		      "long"		 ;K&R, C89
+		      "mutable"		 ;C++
+		      "namespace"	 ;C++
+		      "new"		 ;C++
+		      "noexcept"	 ;C++11
+		      "noreturn"	 ;C11 macro
+		      "not"		 ;C++, C95 macro
+		      "not_eq"		 ;C++, C95 macro
+		      "nullptr"		 ;C++11
+		      "operator"	 ;C++
+		      "or"		 ;C++, C95 macro
+		      "or_eq"		 ;C++, C95 macro
+		      "private"		 ;C++
+		      "protected"	 ;C++
+		      "public"		 ;C++
+		      "register"	 ;K&R, C89
 		      "reinterpret_cast" ;C++
-		      "restrict"	 ;C9X
+		      "restrict"	 ;C99
 		      "return"		 ;K&R, C89
 		      "short"		 ;K&R, C89
 		      "signed"		 ;C89
 		      "sizeof"		 ;K&R, C89
 		      "static"		 ;K&R, C89
+		      "static_assert"	 ;C11 macro, C++11
 		      "static_cast"	 ;C++
 		      "struct"		 ;K&R, C89
 		      "switch"		 ;K&R, C89
 		      "template"	 ;C++
 		      "throw"		 ;C++
 		      "try"		 ;C++
-		      "this"		 ;C++
+		      "thread_local"	 ;C11 macro, C++11
 		      "typedef"		 ;C89
 		      "typeid"		 ;C++
 		      "typeof"		 ;GCC
@@ -1339,12 +1724,19 @@ doesn't match any of the regular expressions in
 		      "volatile"	 ;C89
 		      "wchar_t"		 ;C++, C89 library type
 		      "while"		 ;K&R, C89
-		      "xor"		 ;C++
-		      "xor_eq"		 ;C++
-		      "_Bool"		 ;C9X
-		      "_Complex"	 ;C9X
-		      "_Imaginary"	 ;C9X
-		      "_Pragma"		 ;C9X preprocessor
+		      "xor"		 ;C++, C95 macro
+		      "xor_eq"		 ;C++, C95 macro
+		      "_Alignas"	 ;C11
+		      "_Alignof"	 ;C11
+		      "_Atomic"		 ;C11
+		      "_Bool"		 ;C99
+		      "_Complex"	 ;C99
+		      "_Generic"	 ;C11
+		      "_Imaginary"	 ;C99
+		      "_Noreturn"	 ;C11
+		      "_Pragma"		 ;C99 preprocessor
+		      "_Static_assert"	 ;C11
+		      "_Thread_local"	 ;C11
 		      "__alignof__"	 ;GCC
 		      "__asm__"		 ;GCC
 		      "__attribute__"	 ;GCC
@@ -1360,9 +1752,9 @@ doesn't match any of the regular expressions in
 		      "__volatile__"	 ;GCC
 		      ))
 	(c-constants
-	 (mdw-regexps "false"		;C++, C9X macro
+	 (mdw-regexps "false"		 ;C++, C99 macro
 		      "this"		 ;C++
-		      "true"		 ;C++, C9X macro
+		      "true"		 ;C++, C99 macro
 		      ))
 	(preprocessor-keywords
 	 (mdw-regexps "assert" "define" "elif" "else" "endif" "error"
@@ -1409,19 +1801,13 @@ doesn't match any of the regular expressions in
 
 	   ;; And anything else is punctuation.
 	   (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
-		 '(0 mdw-punct-face))))
-
-    (mdw-post-config-mode-hack)))
+		 '(0 mdw-punct-face))))))
 
 ;;;--------------------------------------------------------------------------
 ;;; AP calc mode.
 
-(defun apcalc-mode ()
-  (interactive)
-  (c-mode)
-  (setq major-mode 'apcalc-mode)
-  (setq mode-name "AP Calc")
-  (run-hooks 'apcalc-mode-hook))
+(define-derived-mode apcalc-mode c-mode "AP Calc"
+  "Major mode for editing Calc code.")
 
 (defun mdw-fontify-apcalc ()
 
@@ -1430,9 +1816,6 @@ doesn't match any of the regular expressions in
   (modify-syntax-entry ?/ ". 14")
 
   ;; Other stuff.
-  (mdw-c-style)
-  (setq c-hanging-comment-ender-p nil)
-  (setq c-backslash-column 72)
   (setq comment-start "/* ")
   (setq comment-end " */")
   (setq mdw-fill-prefix mdw-c-comment-fill-prefix)
@@ -1463,34 +1846,29 @@ doesn't match any of the regular expressions in
 
 	   ;; And anything else is punctuation.
 	   (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
-		 '(0 mdw-punct-face)))))
-
-  (mdw-post-config-mode-hack))
+		 '(0 mdw-punct-face))))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Java programming configuration.
 
 ;; Make indentation nice.
 
-(defun mdw-java-style ()
-  (c-add-style "[mdw] Java style"
-	       '((c-basic-offset . 2)
-		 (c-offsets-alist (substatement-open . 0)
-				  (label . +)
-				  (case-label . +)
-				  (access-label . 0)
-				  (inclass . +)
-				  (statement-case-intro . +)))
-	       t))
+(mdw-define-c-style mdw-java
+  (c-basic-offset . 2)
+  (c-backslash-column . 72)
+  (c-offsets-alist (substatement-open . 0)
+		   (label . +)
+		   (case-label . +)
+		   (access-label . 0)
+		   (inclass . +)
+		   (statement-case-intro . +)))
+(mdw-set-default-c-style 'java-mode 'mdw-java)
 
 ;; Declare Java fontification style.
 
 (defun mdw-fontify-java ()
 
   ;; Other stuff.
-  (mdw-java-style)
-  (setq c-hanging-comment-ender-p nil)
-  (setq c-backslash-column 72)
   (setq mdw-fill-prefix mdw-c-comment-fill-prefix)
 
   ;; Now define things to be fontified.
@@ -1531,9 +1909,7 @@ doesn't match any of the regular expressions in
 
 	   ;; And anything else is punctuation.
 	   (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
-		 '(0 mdw-punct-face)))))
-
-  (mdw-post-config-mode-hack))
+		 '(0 mdw-punct-face))))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Javascript programming configuration.
@@ -1591,9 +1967,7 @@ doesn't match any of the regular expressions in
 
 	   ;; And anything else is punctuation.
 	   (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
-		 '(0 mdw-punct-face)))))
-
-  (mdw-post-config-mode-hack))
+		 '(0 mdw-punct-face))))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Scala programming configuration.
@@ -1666,34 +2040,29 @@ doesn't match any of the regular expressions in
 			 "\\|" "\\\\" "." "\\)"
 			 "\\('\\)")
 		 '(1 "\"")
-		 '(4 "\"")))))
-
-  (mdw-post-config-mode-hack))
+		 '(4 "\""))))))
 
 ;;;--------------------------------------------------------------------------
 ;;; C# programming configuration.
 
 ;; Make indentation nice.
 
-(defun mdw-csharp-style ()
-  (c-add-style "[mdw] C# style"
-	       '((c-basic-offset . 2)
-		 (c-offsets-alist (substatement-open . 0)
-				  (label . 0)
-				  (case-label . +)
-				  (access-label . 0)
-				  (inclass . +)
-				  (statement-case-intro . +)))
-	       t))
+(mdw-define-c-style mdw-csharp
+  (c-basic-offset . 2)
+  (c-backslash-column . 72)
+  (c-offsets-alist (substatement-open . 0)
+		   (label . 0)
+		   (case-label . +)
+		   (access-label . 0)
+		   (inclass . +)
+		   (statement-case-intro . +)))
+(mdw-set-default-c-style 'csharp-mode 'mdw-csharp)
 
 ;; Declare C# fontification style.
 
 (defun mdw-fontify-csharp ()
 
   ;; Other stuff.
-  (mdw-csharp-style)
-  (setq c-hanging-comment-ender-p nil)
-  (setq c-backslash-column 72)
   (setq mdw-fill-prefix mdw-c-comment-fill-prefix)
 
   ;; Now define things to be fontified.
@@ -1739,9 +2108,7 @@ doesn't match any of the regular expressions in
 
 	   ;; And anything else is punctuation.
 	   (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
-		 '(0 mdw-punct-face)))))
-
-  (mdw-post-config-mode-hack))
+		 '(0 mdw-punct-face))))))
 
 (define-derived-mode csharp-mode java-mode "C#"
   "Major mode for editing C# code.")
@@ -1856,9 +2223,7 @@ doesn't match any of the regular expressions in
 		      '(0 mdw-number-face))
 
 		(list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
-		      '(0 mdw-punct-face)))))
-
-  (mdw-post-config-mode-hack))
+		      '(0 mdw-punct-face))))))
 
 (defun mdw-fontify-inferior-fsharp ()
   (mdw-fontify-fsharp)
@@ -1927,30 +2292,102 @@ doesn't match any of the regular expressions in
 
 	   ;; And anything else is punctuation.
 	   (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
+		 '(0 mdw-punct-face))))))
+
+;;;--------------------------------------------------------------------------
+;;; Rust programming configuration.
+
+(setq-default rust-indent-offset 2)
+
+(defun mdw-self-insert-and-indent (count)
+  (interactive "p")
+  (self-insert-command count)
+  (indent-according-to-mode))
+
+(defun mdw-fontify-rust ()
+
+  ;; Hack syntax categories.
+  (modify-syntax-entry ?= ".")
+
+  ;; Fontify keywords and things.
+  (make-local-variable 'font-lock-keywords)
+  (let ((rust-keywords
+	 (mdw-regexps "abstract" "alignof" "as"
+		      "become" "box" "break"
+		      "const" "continue" "create"
+		      "do"
+		      "else" "enum" "extern"
+		      "false" "final" "fn" "for"
+		      "if" "impl" "in"
+		      "let" "loop"
+		      "macro" "match" "mod" "move" "mut"
+		      "offsetof" "override"
+		      "priv" "pub" "pure"
+		      "ref" "return"
+		      "self" "sizeof" "static" "struct" "super"
+		      "true" "trait" "type" "typeof"
+		      "unsafe" "unsized" "use"
+		      "virtual"
+		      "where" "while"
+		      "yield"))
+	(rust-builtins
+	 (mdw-regexps "array" "pointer" "slice" "tuple"
+		      "bool" "true" "false"
+		      "f32" "f64"
+		      "i8" "i16" "i32" "i64" "isize"
+		      "u8" "u16" "u32" "u64" "usize"
+		      "char" "str")))
+    (setq font-lock-keywords
+	  (list
+
+	   ;; Handle the keywords defined above.
+	   (list (concat "\\<\\(" rust-keywords "\\)\\>")
+		 '(0 font-lock-keyword-face))
+	   (list (concat "\\<\\(" rust-builtins "\\)\\>")
+		 '(0 font-lock-variable-name-face))
+
+	   ;; Handle numbers too.
+	   (list (concat "\\<\\("
+			       "[0-9][0-9_]*"
+			       "\\(" "\\(\\.[0-9_]+\\)?[eE][-+]?[0-9_]+"
+			       "\\|" "\\.[0-9_]+"
+			       "\\)"
+			       "\\(f32\\|f64\\)?"
+			 "\\|" "\\(" "[0-9][0-9_]*"
+			       "\\|" "0x[0-9a-fA-F_]+"
+			       "\\|" "0o[0-7_]+"
+			       "\\|" "0b[01_]+"
+			       "\\)"
+			       "\\([ui]\\(8\\|16\\|32\\|64\\|s\\|size\\)\\)?"
+			 "\\)\\>")
+		 '(0 mdw-number-face))
+
+	   ;; And anything else is punctuation.
+	   (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
 		 '(0 mdw-punct-face)))))
 
-  (mdw-post-config-mode-hack))
+  ;; Hack key bindings.
+  (local-set-key [?{] 'mdw-self-insert-and-indent)
+  (local-set-key [?}] 'mdw-self-insert-and-indent))
 
 ;;;--------------------------------------------------------------------------
 ;;; Awk programming configuration.
 
 ;; Make Awk indentation nice.
 
-(defun mdw-awk-style ()
-  (c-add-style "[mdw] Awk style"
-	       '((c-basic-offset . 2)
-		 (c-offsets-alist (substatement-open . 0)
-				  (statement-cont . 0)
-				  (statement-case-intro . +)))
-	       t))
+(mdw-define-c-style mdw-awk
+  (c-basic-offset . 2)
+  (c-offsets-alist (substatement-open . 0)
+		   (c-backslash-column . 72)
+		   (statement-cont . 0)
+		   (statement-case-intro . +)))
+(mdw-set-default-c-style 'awk-mode 'mdw-awk)
 
 ;; Declare Awk fontification style.
 
 (defun mdw-fontify-awk ()
 
   ;; Miscellaneous fiddling.
-  (mdw-awk-style)
-  (setq c-backslash-column 72)
   (mdw-standard-fill-prefix "\\([ \t]*#+[ \t]*\\)")
 
   ;; Now define things to be fontified.
@@ -1987,15 +2424,15 @@ doesn't match any of the regular expressions in
 
 	   ;; And anything else is punctuation.
 	   (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
-		 '(0 mdw-punct-face)))))
-
-  (mdw-post-config-mode-hack))
+		 '(0 mdw-punct-face))))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Perl programming style.
 
 ;; Perl indentation style.
 
+(setq perl-indent-level 2)
+
 (setq cperl-indent-level 2)
 (setq cperl-continued-statement-offset 2)
 (setq cperl-continued-brace-offset 0)
@@ -2010,16 +2447,29 @@ doesn't match any of the regular expressions in
   ;; Miscellaneous fiddling.
   (modify-syntax-entry ?$ "\\")
   (modify-syntax-entry ?$ "\\" font-lock-syntax-table)
+  (modify-syntax-entry ?: "." font-lock-syntax-table)
   (mdw-standard-fill-prefix "\\([ \t]*#+[ \t]*\\)")
 
   ;; Now define fontification things.
   (make-local-variable 'font-lock-keywords)
   (let ((perl-keywords
-	 (mdw-regexps "and" "break" "cmp" "continue" "do" "else" "elsif" "eq"
-		      "for" "foreach" "ge" "given" "gt" "goto" "if"
-		      "last" "le" "lt" "local" "my" "ne" "next" "or"
-		      "our" "package" "redo" "require" "return" "sub"
-		      "undef" "unless" "until" "use" "when" "while")))
+	 (mdw-regexps "and"
+		      "break"
+		      "cmp" "continue"
+		      "default" "do"
+		      "else" "elsif" "eq"
+		      "for" "foreach"
+		      "ge" "given" "gt" "goto"
+		      "if"
+		      "last" "le" "local" "lt"
+		      "my"
+		      "ne" "next"
+		      "or" "our"
+		      "package"
+		      "redo" "require" "return"
+		      "sub"
+		      "undef" "unless" "until" "use"
+		      "when" "while")))
 
     (setq font-lock-keywords
 	  (list
@@ -2036,9 +2486,7 @@ doesn't match any of the regular expressions in
 
 	   ;; And anything else is punctuation.
 	   (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
-		 '(0 mdw-punct-face)))))
-
-  (mdw-post-config-mode-hack))
+		 '(0 mdw-punct-face))))))
 
 (defun perl-number-tests (&optional arg)
   "Assign consecutive numbers to lines containing `#t'.  With ARG,
@@ -2081,9 +2529,7 @@ strip numbers instead."
 
 	 ;; And anything else is punctuation.
 	 (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
-	       '(0 mdw-punct-face))))
-
-  (mdw-post-config-mode-hack))
+	       '(0 mdw-punct-face)))))
 
 ;; Define Python fontification styles.
 
@@ -2105,6 +2551,49 @@ strip numbers instead."
 		"yield")))
 
 ;;;--------------------------------------------------------------------------
+;;; Lua programming style.
+
+(setq lua-indent-level 2)
+
+(defun mdw-fontify-lua ()
+
+  ;; Miscellaneous fiddling.
+  (mdw-standard-fill-prefix "\\([ \t]*#+[ \t]*\\)")
+
+  ;; Now define fontification things.
+  (make-local-variable 'font-lock-keywords)
+  (let ((lua-keywords
+	 (mdw-regexps "and" "break" "do" "else" "elseif" "end"
+		      "false" "for" "function" "goto" "if" "in" "local"
+		      "nil" "not" "or" "repeat" "return" "then" "true"
+		      "until" "while")))
+    (setq font-lock-keywords
+	  (list
+
+	   ;; Set up the keywords defined above.
+	   (list (concat "\\_<\\(" lua-keywords "\\)\\_>")
+		 '(0 font-lock-keyword-face))
+
+	   ;; At least numbers are simpler than C.
+	   (list (concat "\\_<\\(" "0[xX]"
+				   "\\(" "[0-9a-fA-F]+"
+					 "\\(\\.[0-9a-fA-F]*\\)?"
+				   "\\|" "\\.[0-9a-fA-F]+"
+				   "\\)"
+				   "\\([pP][-+]?[0-9]+\\)?"
+			     "\\|" "\\(" "[0-9]+"
+					 "\\(\\.[0-9]*\\)?"
+				   "\\|" "\\.[0-9]+"
+				   "\\)"
+				   "\\([eE][-+]?[0-9]+\\)?"
+			     "\\)")
+		 '(0 mdw-number-face))
+
+	   ;; And anything else is punctuation.
+	   (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
+		 '(0 mdw-punct-face))))))
+
+;;;--------------------------------------------------------------------------
 ;;; Icon programming style.
 
 ;; Icon indentation style.
@@ -2157,9 +2646,7 @@ strip numbers instead."
 
 	   ;; And anything else is punctuation.
 	   (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
-		 '(0 mdw-punct-face)))))
-
-  (mdw-post-config-mode-hack))
+		 '(0 mdw-punct-face))))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Assembler mode.
@@ -2167,20 +2654,18 @@ strip numbers instead."
 (defun mdw-fontify-asm ()
   (modify-syntax-entry ?' "\"")
   (modify-syntax-entry ?. "w")
-  (modify-syntax-entry ?; "."
-		       )
-  (modify-syntax-entry asm-comment-char "<b")
   (modify-syntax-entry ?\n ">")
   (setf fill-prefix nil)
+  (local-set-key ";" 'self-insert-command)
   (mdw-standard-fill-prefix "\\([ \t]*;+[ \t]*\\)"))
 
-(define-derived-mode x86-asm-mode asm-mode "x86 assembler"
-  "Assembler mode variant which uses `#' as the comment character."
-  (set (make-variable-buffer-local 'asm-comment-char) ?#))
-
-(define-derived-mode arm-asm-mode asm-mode "ARM assembler"
-  "Assembler mode variant which uses `@' as the comment character."
-  (set (make-variable-buffer-local 'asm-comment-char) ?@))
+(defun mdw-asm-set-comment ()
+  (modify-syntax-entry ?; "."
+		       )
+  (modify-syntax-entry asm-comment-char "<b")
+  (setq comment-start (string asm-comment-char ? )))
+(add-hook 'asm-mode-local-variables-hook 'mdw-asm-set-comment)
+(put 'asm-comment-char 'safe-local-variable 'characterp)
 
 ;;;--------------------------------------------------------------------------
 ;;; TCL configuration.
@@ -2196,8 +2681,7 @@ strip numbers instead."
 		       "\\([eE]\\([-+]\\|\\)[0-9_]+\\|\\)")
 	       '(0 mdw-number-face))
 	 (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
-	       '(0 mdw-punct-face))))
-  (mdw-post-config-mode-hack))
+	       '(0 mdw-punct-face)))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Dylan programming configuration.
@@ -2263,9 +2747,7 @@ strip numbers instead."
 			      "\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\|"
 			      "\\_<[-+*/=<>:&|]+\\_>"
 			      "\\)")
-		      '(0 mdw-punct-face)))))
-
-  (mdw-post-config-mode-hack))
+		      '(0 mdw-punct-face))))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Algol 68 configuration.
@@ -2307,9 +2789,7 @@ strip numbers instead."
 			      "\\>")
 		      '(0 mdw-number-face))
 		(list "\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/"
-		      '(0 mdw-punct-face)))))
-
-  (mdw-post-config-mode-hack))
+		      '(0 mdw-punct-face))))))
 
 ;;;--------------------------------------------------------------------------
 ;;; REXX configuration.
@@ -2382,9 +2862,7 @@ strip numbers instead."
 
 	   ;; And everything else is punctuation.
 	   (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
-		 '(0 mdw-punct-face)))))
-
-  (mdw-post-config-mode-hack))
+		 '(0 mdw-punct-face))))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Standard ML programming style.
@@ -2434,9 +2912,7 @@ strip numbers instead."
 
 	   ;; And anything else is punctuation.
 	   (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
-		 '(0 mdw-punct-face)))))
-
-  (mdw-post-config-mode-hack))
+		 '(0 mdw-punct-face))))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Haskell configuration.
@@ -2514,9 +2990,7 @@ strip numbers instead."
 			 "\\([eE]\\([-+]\\|\\)[0-9]+\\|\\)")
 		 '(0 mdw-number-face))
 	   (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
-		 '(0 mdw-punct-face)))))
-
-  (mdw-post-config-mode-hack))
+		 '(0 mdw-punct-face))))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Erlang configuration.
@@ -2549,9 +3023,7 @@ strip numbers instead."
 	   (list "\\<[0-9]+\\(\\|#[0-9a-zA-Z]+\\|[eE][+-]?[0-9]+\\)\\>"
 		 '(0 mdw-number-face))
 	   (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
-		 '(0 mdw-punct-face)))))
-
-  (mdw-post-config-mode-hack))
+		 '(0 mdw-punct-face))))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Texinfo configuration.
@@ -2585,9 +3057,7 @@ strip numbers instead."
 
 	 ;; Fontify TeX special characters as punctuation.
 	 (list "[{}]+"
-	       '(0 mdw-punct-face))))
-
-  (mdw-post-config-mode-hack))
+	       '(0 mdw-punct-face)))))
 
 ;;;--------------------------------------------------------------------------
 ;;; TeX and LaTeX configuration.
@@ -2601,6 +3071,10 @@ strip numbers instead."
   (modify-syntax-entry ?$ "." font-lock-syntax-table)
   (local-set-key [?$] 'self-insert-command)
 
+  ;; Make `tab' be useful, given that tab stops in TeX don't work well.
+  (local-set-key "\C-i" 'indent-relative)
+  (setq indent-tabs-mode nil)
+
   ;; Set fill prefix.
   (mdw-standard-fill-prefix "\\([ \t]*%+[ \t]*\\)")
 
@@ -2653,9 +3127,26 @@ strip numbers instead."
 
 	 ;; Fontify TeX special characters as punctuation.
 	 (list "[$^_{}#&]"
-	       '(0 mdw-punct-face))))
-
-  (mdw-post-config-mode-hack))
+	       '(0 mdw-punct-face)))))
+
+(eval-after-load 'font-latex
+  '(defun font-latex-jit-lock-force-redisplay (buf start end)
+     "Compatibility for Emacsen not offering `jit-lock-force-redisplay'."
+     ;; The following block is an expansion of `jit-lock-force-redisplay'
+     ;; and involved macros taken from CVS Emacs on 2007-04-28.
+     (with-current-buffer buf
+       (let ((modified (buffer-modified-p)))
+	 (unwind-protect
+	     (let ((buffer-undo-list t)
+		   (inhibit-read-only t)
+		   (inhibit-point-motion-hooks t)
+		   (inhibit-modification-hooks t)
+		   deactivate-mark
+		   buffer-file-name
+		   buffer-file-truename)
+	       (put-text-property start end 'fontified t))
+	   (unless modified
+	     (restore-buffer-modified-p nil)))))))
 
 ;;;--------------------------------------------------------------------------
 ;;; SGML hacking.
@@ -2694,8 +3185,8 @@ that character only to be normal punctuation.")
   (or (booleanp value)
       (every (lambda (v) (memq v '(?\" ?')))
 	     (if (listp value) value (list value)))))
-(put 'mdw-conf-quote-normal 'safe-local-variable '
-     mdw-conf-quote-normal-acceptable-value-p)
+(put 'mdw-conf-quote-normal 'safe-local-variable
+     'mdw-conf-quote-normal-acceptable-value-p)
 
 (defun mdw-fix-up-quote ()
   "Apply the setting of `mdw-conf-quote-normal'."
@@ -2710,15 +3201,7 @@ that character only to be normal punctuation.")
 		   (if (listp flag) flag (list flag)))
 	     (set-syntax-table table)
 	     (and font-lock-mode (font-lock-fontify-buffer)))))))
-(defun mdw-fix-up-quote-hack ()
-  "Unpleasant hack to call `mdw-fix-up-quote' at the right time.
-Annoyingly, `hack-local-variables' is done after `set-auto-mode'
-so we wouldn't see a local-variable setting of
-`mdw-conf-quote-normal' in `conf-mode-hook'.  Instead, wire
-ourselves onto `hack-local-variables-hook' here, and check the
-setting once it's actually been made."
-  (add-hook 'hack-local-variables-hook 'mdw-fix-up-quote t t))
-(add-hook 'conf-mode-hook 'mdw-fix-up-quote-hack t)
+(add-hook 'conf-mode-local-variables-hook 'mdw-fix-up-quote t t)
 
 ;;;--------------------------------------------------------------------------
 ;;; Shell scripts.
@@ -2740,6 +3223,9 @@ setting once it's actually been made."
     (let ((executable-set-magic #'(lambda (s &rest r) s)))
       (sh-set-shell shell-name)))
 
+  ;; Don't insert here-document scaffolding automatically.
+  (local-set-key "<" 'self-insert-command)
+
   ;; Now enable my keys and the fontification.
   (mdw-misc-mode-config)
 
@@ -3020,8 +3506,7 @@ setting once it's actually been made."
 		       "\\([eE]\\([-+]\\|\\)[0-9_]+\\|\\)")
 	       '(0 mdw-number-face))
 	 (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
-	       '(0 mdw-punct-face))))
-  (mdw-post-config-mode-hack))
+	       '(0 mdw-punct-face)))))
 
 ;; Lispy languages.
 
@@ -3078,9 +3563,7 @@ setting once it's actually been made."
 			    "\\)\\_>")
 		    '(0 mdw-number-face))
 	      (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
-		    '(0 mdw-punct-face))))
-
-  (mdw-post-config-mode-hack))
+		    '(0 mdw-punct-face)))))
 
 (defun comint-send-and-indent ()
   (interactive)
@@ -3185,6 +3668,56 @@ This allows you to pass a list of arguments through `ansi-term'."
 			     git-grep-command 'git-grep-history)))
   (grep command-args))
 
+(setq magit-diff-refine-hunk 'all
+      magit-view-git-manual-method 'man
+      magit-wip-after-save-local-mode-lighter ""
+      magit-wip-after-apply-mode-lighter ""
+      magit-wip-before-change-mode-lighter "")
+(eval-after-load "magit"
+  '(progn (global-magit-file-mode 1)
+	  (magit-wip-after-save-mode 1)
+	  (magit-wip-after-apply-mode 1)
+	  (magit-wip-before-change-mode 1)
+	  (add-to-list 'magit-no-confirm 'safe-with-wip)
+	  (dolist (popup '(magit-diff-popup
+			   magit-diff-refresh-popup
+			   magit-diff-mode-refresh-popup
+			   magit-revision-mode-refresh-popup))
+	    (magit-define-popup-switch popup ?R "Reverse diff" "-R"))))
+
+(setq magit-repolist-columns
+      '(("Name" 16 magit-repolist-column-ident nil)
+	("Version" 18 magit-repolist-column-version nil)
+	("St" 2 magit-repolist-column-dirty nil)
+	("L<U" 3 mdw-repolist-column-unpulled-from-upstream nil)
+	("L>U" 3 mdw-repolist-column-unpushed-to-upstream nil)
+	("Path" 32 magit-repolist-column-path nil)))
+
+(setq magit-repository-directories '(("~/etc/profile" . 0)
+				     ("~/src/" . 1)))
+
+(defadvice magit-list-repos (around mdw-dirname () activate compile)
+  "Make sure the returned names are directory names.
+Otherwise child processes get started in the wrong directory and
+there is sadness."
+  (setq ad-return-value (mapcar #'file-name-as-directory ad-do-it)))
+
+(defun mdw-repolist-column-unpulled-from-upstream (_id)
+  "Insert number of upstream commits not in the current branch."
+  (let ((upstream (magit-get-upstream-branch (magit-get-current-branch) t)))
+    (and upstream
+	 (let ((n (cadr (magit-rev-diff-count "HEAD" upstream))))
+	   (propertize (number-to-string n) 'face
+		       (if (> n 0) 'bold 'shadow))))))
+
+(defun mdw-repolist-column-unpushed-to-upstream (_id)
+  "Insert number of commits in the current branch but not its upstream."
+  (let ((upstream (magit-get-upstream-branch (magit-get-current-branch) t)))
+    (and upstream
+	 (let ((n (car (magit-rev-diff-count "HEAD" upstream))))
+	   (propertize (number-to-string n) 'face
+		       (if (> n 0) 'bold 'shadow))))))
+
 ;;;--------------------------------------------------------------------------
 ;;; Inferior Emacs Lisp.