X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/5952a0200fd86a400cd1a977df66f82cfdedb001..18bb0f77715d66d6ba7ec48eee7b3bdb9a5a0008:/el/dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index ae50248..32188f9 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -91,6 +91,14 @@ This may be at the expense of cool features.")
 		    (concat "(" (buffer-string) ")")))))))
   (cdr (assq sym mdw-config)))
 
+;; 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)
@@ -190,6 +198,29 @@ fringes is not taken out of the allowance for WIDTH, unlike
       (other-window 1))
     (select-window win)))
 
+;; Don't raise windows unless I say so.
+
+(defvar mdw-inhibit-raise-frame nil
+  "*Whether `raise-frame' should do nothing when the frame is mapped.")
+
+(defadvice raise-frame
+    (around mdw-inhibit (&optional frame) activate compile)
+  "Don't actually do anything if `mdw-inhibit-raise-frame' is true, and the
+frame is actually mapped on the screen."
+  (if mdw-inhibit-raise-frame
+      (make-frame-visible frame)
+    ad-do-it))
+
+(defmacro mdw-advise-to-inhibit-raise-frame (function)
+  "Advise the FUNCTION not to raise frames, even if it wants to."
+  `(defadvice ,function
+       (around mdw-inhibit-raise (&rest hunoz) activate compile)
+     "Don't raise the window unless you have to."
+     (let ((mdw-inhibit-raise-frame t))
+       ad-do-it)))
+
+(mdw-advise-to-inhibit-raise-frame select-frame-set-input-focus)
+
 ;; Transient mark mode hacks.
 
 (defadvice exchange-point-and-mark
@@ -298,6 +329,43 @@ Evil key bindings are defined in `mdw-evil-keymap-keys'."
       org-export-docbook-xslt-stylesheet
       "/usr/share/xml/docbook/stylesheet/docbook-xsl/fo/docbook.xsl")
 
+;; Some hacks to do with window placement.
+
+(defun mdw-clobber-other-windows-showing-buffer (buffer-or-name)
+  "Arrange that no windows on other frames are showing BUFFER-OR-NAME."
+  (interactive "bBuffer: ")
+  (let ((home-frame (selected-frame))
+	(buffer (get-buffer buffer-or-name))
+	(safe-buffer (get-buffer "*scratch*")))
+    (mapc (lambda (frame)
+	    (or (eq frame home-frame)
+		(mapc (lambda (window)
+			(and (eq (window-buffer window) buffer)
+			     (set-window-buffer window safe-buffer)))
+		      (window-list frame))))
+	  (frame-list))))
+
+(defvar mdw-inhibit-walk-windows nil
+  "If non-nil, then `walk-windows' does nothing.
+This is used by advice on `switch-to-buffer-other-frame' to inhibit finding
+buffers in random frames.")
+
+(defadvice walk-windows (around mdw-inhibit activate)
+  "If `mdw-inhibit-walk-windows' is non-nil, then do nothing."
+  (and (not mdw-inhibit-walk-windows)
+       ad-do-it))
+
+(defadvice switch-to-buffer-other-frame
+    (around mdw-always-new-frame activate)
+  "Always make a new frame.
+Even if an existing window in some random frame looks tempting."
+  (let ((mdw-inhibit-walk-windows t)) ad-do-it))
+
+(defadvice display-buffer (before mdw-inhibit-other-frames activate)
+  "Don't try to do anything fancy with other frames.
+Pretend they don't exist.  They might be on other display devices."
+  (ad-set-arg 2 nil))
+
 ;;;--------------------------------------------------------------------------
 ;;; Mail and news hacking.
 
@@ -550,10 +618,10 @@ If NEW-SESSION-P, start a new session."
 	(select-window window)))))
 
 (defvar mdw-good-url-browsers
-  '(browse-url-generic
+  '(browse-url-mozilla
+    browse-url-generic
     (w3m . mdw-w3m-browse-url)
-    browse-url-w3
-    browse-url-mozilla)
+    browse-url-w3)
   "List of good browsers for mdw-good-url-browsers.
 Each item is a browser function name, or a cons (CHECK . FUNC).
 A symbol FOO stands for (FOO . FOO).")
@@ -812,6 +880,97 @@ doesn't match any of the regular expressions in
 (add-hook 'delete-frame-functions 'mdw-last-one-out-turn-off-the-lights)
 
 ;;;--------------------------------------------------------------------------
+;;; Where is point?
+
+(defvar mdw-point-overlay
+  (let ((ov (make-overlay 0 0))
+	(s "."))
+    (overlay-put ov 'priority 2)
+    (put-text-property 0 1 'display '(left-fringe vertical-bar) s)
+    (overlay-put ov 'before-string s)
+    (delete-overlay ov)
+    ov)
+  "An overlay used for showing where point is in the selected window.")
+
+(defun mdw-remove-point-overlay ()
+  "Remove the current-point overlay."
+  (delete-overlay mdw-point-overlay))
+
+(defun mdw-update-point-overlay ()
+  "Mark the current point position with an overlay."
+  (if (not mdw-point-overlay-mode)
+      (mdw-remove-point-overlay)
+    (overlay-put mdw-point-overlay 'window (selected-window))
+    (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'.")
+
+(define-minor-mode mdw-point-overlay-mode
+  "Indicate current line with an overlay."
+  :global nil
+  (let ((buffer (current-buffer)))
+    (setq mdw-point-overlay-buffers
+	  (mapcan (lambda (buf)
+		    (if (and (buffer-live-p buf)
+			     (not (eq buf buffer)))
+			(list buf)))
+		  mdw-point-overlay-buffers))
+    (if mdw-point-overlay-mode
+	(setq mdw-point-overlay-buffers
+	      (cons buffer mdw-point-overlay-buffers))))
+  (cond (mdw-point-overlay-buffers
+	 (add-hook 'pre-command-hook 'mdw-remove-point-overlay)
+	 (add-hook 'post-command-hook 'mdw-update-point-overlay))
+	(t
+	 (mdw-remove-point-overlay)
+	 (remove-hook 'pre-command-hook 'mdw-remove-point-overlay)
+	 (remove-hook 'post-command-hook 'mdw-update-point-overlay))))
+
+(define-globalized-minor-mode mdw-global-point-overlay-mode
+  mdw-point-overlay-mode
+  (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.
 
 (defmacro mdw-define-face (name &rest body)
@@ -842,6 +1001,13 @@ doesn't match any of the regular expressions in
   (((type tty) (class color)) :background "blue")
   (((type tty) (class mono)) :inverse-video t)
   (t :background "grey30"))
+(mdw-define-face match
+  (((type tty) (class color)) :background "blue")
+  (((type tty) (class mono)) :inverse-video t)
+  (t :background "blue"))
+(mdw-define-face mc/cursor-face
+  (((type tty) (class mono)) :inverse-video t)
+  (t :background "red"))
 (mdw-define-face minibuffer-prompt
   (t :weight bold))
 (mdw-define-face mode-line
@@ -852,6 +1018,9 @@ doesn't match any of the regular expressions in
   (((class color)) :foreground "yellow" :background "blue"
 		   :box (:line-width 1 :style released-button))
   (t :inverse-video t))
+(mdw-define-face nobreak-space
+  (((type tty)))
+  (t :inherit escape-glyph :underline t))
 (mdw-define-face scroll-bar
   (t :foreground "black" :background "lightgrey"))
 (mdw-define-face fringe
@@ -891,6 +1060,7 @@ doesn't match any of the regular expressions in
   (((type tty)) :foreground "yellow") (t :foreground "burlywood2"))
 (mdw-define-face mdw-number-face
   (t :foreground "yellow"))
+(mdw-define-face mdw-trivial-face)
 (mdw-define-face font-lock-function-name-face
   (t :slant italic))
 (mdw-define-face font-lock-keyword-face
@@ -982,6 +1152,18 @@ doesn't match any of the regular expressions in
 (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"))
@@ -1158,7 +1340,6 @@ doesn't match any of the regular expressions in
 		      "explicit"	;C++
 		      "export"		;C++
 		      "extern"		;K&R, C89
-		      "false"		;C++, C9X macro
 		      "float"		;K&R, C89
 		      "for"		;K&R, C89
 		      ;; "fortran"	;K&R
@@ -1190,9 +1371,7 @@ doesn't match any of the regular expressions in
 		      "struct"		 ;K&R, C89
 		      "switch"		 ;K&R, C89
 		      "template"	 ;C++
-		      "this"		 ;C++
 		      "throw"		 ;C++
-		      "true"		 ;C++, C9X macro
 		      "try"		 ;C++
 		      "this"		 ;C++
 		      "typedef"		 ;C89
@@ -1227,6 +1406,11 @@ doesn't match any of the regular expressions in
 		      "__typeof__"	 ;GCC
 		      "__volatile__"	 ;GCC
 		      ))
+	(c-constants
+	 (mdw-regexps "false"		;C++, C9X macro
+		      "this"		 ;C++
+		      "true"		 ;C++, C9X macro
+		      ))
 	(preprocessor-keywords
 	 (mdw-regexps "assert" "define" "elif" "else" "endif" "error"
 		      "ident" "if" "ifdef" "ifndef" "import" "include"
@@ -1258,6 +1442,9 @@ doesn't match any of the regular expressions in
 	   (list (concat "\\<\\(" c-keywords "\\)\\>")
 		 '(0 font-lock-keyword-face))
 
+	   (list (concat "\\<\\(" c-constants "\\)\\>")
+		 '(0 font-lock-variable-name-face))
+
 	   ;; Handle numbers too.
 	   ;;
 	   ;; This looks strange, I know.  It corresponds to the
@@ -1362,11 +1549,11 @@ doesn't match any of the regular expressions in
 		      "for" "goto" "if" "implements" "import" "instanceof"
 		      "int" "interface" "long" "native" "new" "package"
 		      "private" "protected" "public" "return" "short"
-		      "static" "super" "switch" "synchronized" "this"
-		      "throw" "throws" "transient" "try" "void" "volatile"
-		      "while"
+		      "static" "switch" "synchronized" "throw" "throws"
+		      "transient" "try" "void" "volatile" "while"))
 
-		      "false" "null" "true")))
+	(java-constants
+	 (mdw-regexps "false" "null" "super" "this" "true")))
 
     (setq font-lock-keywords
 	  (list
@@ -1375,6 +1562,10 @@ doesn't match any of the regular expressions in
 	   (list (concat "\\<\\(" java-keywords "\\)\\>")
 		 '(0 font-lock-keyword-face))
 
+	   ;; Handle the magic constants defined above.
+	   (list (concat "\\<\\(" java-constants "\\)\\>")
+		 '(0 font-lock-variable-name-face))
+
 	   ;; Handle numbers too.
 	   ;;
 	   ;; The following isn't quite right, but it's close enough.
@@ -1452,6 +1643,81 @@ doesn't match any of the regular expressions in
   (mdw-post-config-mode-hack))
 
 ;;;--------------------------------------------------------------------------
+;;; Scala programming configuration.
+
+(defun mdw-fontify-scala ()
+
+  ;; Comment filling.
+  (setq mdw-fill-prefix mdw-c-comment-fill-prefix)
+
+  ;; Define things to be fontified.
+  (make-local-variable 'font-lock-keywords)
+  (let ((scala-keywords
+	 (mdw-regexps "abstract" "case" "catch" "class" "def" "do" "else"
+		      "extends" "final" "finally" "for" "forSome" "if"
+		      "implicit" "import" "lazy" "match" "new" "object"
+		      "override" "package" "private" "protected" "return"
+		      "sealed" "throw" "trait" "try" "type" "val"
+		      "var" "while" "with" "yield"))
+	(scala-constants
+	 (mdw-regexps "false" "null" "super" "this" "true"))
+	(punctuation "[-!%^&*=+:@#~/?\\|`]"))
+
+    (setq font-lock-keywords
+	  (list
+
+	   ;; Magical identifiers between backticks.
+	   (list (concat "`\\([^`]+\\)`")
+		 '(1 font-lock-variable-name-face))
+
+	   ;; Handle the keywords defined above.
+	   (list (concat "\\_<\\(" scala-keywords "\\)\\_>")
+		 '(0 font-lock-keyword-face))
+
+	   ;; Handle the constants defined above.
+	   (list (concat "\\_<\\(" scala-constants "\\)\\_>")
+		 '(0 font-lock-variable-name-face))
+
+	   ;; Magical identifiers between backticks.
+	   (list (concat "`\\([^`]+\\)`")
+		 '(1 font-lock-variable-name-face))
+
+	   ;; Handle numbers too.
+	   ;;
+	   ;; As usual, not quite right.
+	   (list (concat "\\_<\\("
+			 "0\\([xX][0-9a-fA-F]+\\|[0-7]+\\)\\|"
+			 "[0-9]+\\(\\.[0-9]*\\|\\)"
+			 "\\([eE]\\([-+]\\|\\)[0-9]+\\|\\)\\)"
+			 "[lLfFdD]?")
+		 '(0 mdw-number-face))
+
+	   ;; Identifiers with trailing operators.
+	   (list (concat "_\\(" punctuation "\\)+")
+		 '(0 mdw-trivial-face))
+
+	   ;; And everything else is punctuation.
+	   (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
+		 '(0 mdw-punct-face)))
+
+	  font-lock-syntactic-keywords
+	  (list
+
+	   ;; Single quotes around characters.  But not when used to quote
+	   ;; symbol names.  Ugh.
+	   (list (concat "\\('\\)"
+			 "\\(" "."
+			 "\\|" "\\\\" "\\(" "\\\\\\\\" "\\)*"
+			       "u+" "[0-9a-fA-F]\\{4\\}"
+			 "\\|" "\\\\" "[0-7]\\{1,3\\}"
+			 "\\|" "\\\\" "." "\\)"
+			 "\\('\\)")
+		 '(1 "\"")
+		 '(4 "\"")))))
+
+  (mdw-post-config-mode-hack))
+
+;;;--------------------------------------------------------------------------
 ;;; C# programming configuration.
 
 ;; Make indentation nice.
@@ -1480,22 +1746,22 @@ doesn't match any of the regular expressions in
   ;; Now define things to be fontified.
   (make-local-variable 'font-lock-keywords)
   (let ((csharp-keywords
-	 (mdw-regexps "abstract" "as" "base" "bool" "break"
-		      "byte" "case" "catch" "char" "checked"
-		      "class" "const" "continue" "decimal" "default"
-		      "delegate" "do" "double" "else" "enum"
-		      "event" "explicit" "extern" "false" "finally"
-		      "fixed" "float" "for" "foreach" "goto"
-		      "if" "implicit" "in" "int" "interface"
-		      "internal" "is" "lock" "long" "namespace"
-		      "new" "null" "object" "operator" "out"
-		      "override" "params" "private" "protected" "public"
-		      "readonly" "ref" "return" "sbyte" "sealed"
-		      "short" "sizeof" "stackalloc" "static" "string"
-		      "struct" "switch" "this" "throw" "true"
-		      "try" "typeof" "uint" "ulong" "unchecked"
-		      "unsafe" "ushort" "using" "virtual" "void"
-		      "volatile" "while" "yield")))
+	 (mdw-regexps "abstract" "as" "bool" "break" "byte" "case" "catch"
+		      "char" "checked" "class" "const" "continue" "decimal"
+		      "default" "delegate" "do" "double" "else" "enum"
+		      "event" "explicit" "extern" "finally" "fixed" "float"
+		      "for" "foreach" "goto" "if" "implicit" "in" "int"
+		      "interface" "internal" "is" "lock" "long" "namespace"
+		      "new" "object" "operator" "out" "override" "params"
+		      "private" "protected" "public" "readonly" "ref"
+		      "return" "sbyte" "sealed" "short" "sizeof"
+		      "stackalloc" "static" "string" "struct" "switch"
+		      "throw" "try" "typeof" "uint" "ulong" "unchecked"
+		      "unsafe" "ushort" "using" "virtual" "void" "volatile"
+		      "while" "yield"))
+
+	(csharp-constants
+	 (mdw-regexps "base" "false" "null" "this" "true")))
 
     (setq font-lock-keywords
 	  (list
@@ -1504,6 +1770,10 @@ doesn't match any of the regular expressions in
 	   (list (concat "\\<\\(" csharp-keywords "\\)\\>")
 		 '(0 font-lock-keyword-face))
 
+	   ;; Handle the magic constants defined above.
+	   (list (concat "\\<\\(" csharp-constants "\\)\\>")
+		 '(0 font-lock-variable-name-face))
+
 	   ;; Handle numbers too.
 	   ;;
 	   ;; The following isn't quite right, but it's close enough.
@@ -1543,12 +1813,12 @@ doesn't match any of the regular expressions in
 
   (let ((fsharp-keywords
 	 (mdw-regexps "abstract" "and" "as" "assert" "atomic"
-		      "base" "begin" "break"
+		      "begin" "break"
 		      "checked" "class" "component" "const" "constraint"
 		      "constructor" "continue"
 		      "default" "delegate" "do" "done" "downcast" "downto"
 		      "eager" "elif" "else" "end" "exception" "extern"
-		      "false" "finally" "fixed" "for" "fori" "fun" "function"
+		      "finally" "fixed" "for" "fori" "fun" "function"
 		      "functor"
 		      "global"
 		      "if" "in" "include" "inherit" "inline" "interface"
@@ -1556,20 +1826,21 @@ doesn't match any of the regular expressions in
 		      "lazy" "let"
 		      "match" "measure" "member" "method" "mixin" "module"
 		      "mutable"
-		      "namespace" "new" "null"
-		      "object""of" "open" "or" "override"
+		      "namespace" "new"
+		      "object" "of" "open" "or" "override"
 		      "parallel" "params" "private" "process" "protected"
 		      "public" "pure"
 		      "rec" "recursive" "return"
 		      "sealed" "sig" "static" "struct"
-		      "tailcall" "then" "to" "trait" "true" "try" "type"
+		      "tailcall" "then" "to" "trait" "try" "type"
 		      "upcast" "use"
 		      "val" "virtual" "void" "volatile"
 		      "when" "while" "with"
 		      "yield"))
 
 	(fsharp-builtins
-	 (mdw-regexps "asr" "land" "lor" "lsl" "lsr" "lxor" "mod"))
+	 (mdw-regexps "asr" "land" "lor" "lsl" "lsr" "lxor" "mod"
+		      "base" "false" "null" "true"))
 
 	(bang-keywords
 	 (mdw-regexps "do" "let" "return" "use" "yield"))
@@ -1674,6 +1945,24 @@ doesn't match any of the regular expressions in
 	   (list (concat "\\<\\(" go-intrinsics "\\)\\>")
 		 '(0 font-lock-variable-name-face))
 
+	   ;; Strings and characters.
+	   (list (concat "'"
+			 "\\(" "[^\\']" "\\|"
+			       "\\\\"
+			       "\\(" "[abfnrtv\\'\"]" "\\|"
+				     "[0-7]\\{3\\}" "\\|"
+				     "x" "[0-9A-Fa-f]\\{2\\}" "\\|"
+				     "u" "[0-9A-Fa-f]\\{4\\}" "\\|"
+				     "U" "[0-9A-Fa-f]\\{8\\}" "\\)" "\\)"
+			 "'"
+			 "\\|"
+			 "\""
+			 "\\(" "[^\n\\\"]+" "\\|" "\\\\." "\\)*"
+			 "\\(\"\\|$\\)"
+			 "\\|"
+			 "`" "[^`]+" "`")
+		 '(0 font-lock-string-face))
+
 	   ;; Handle numbers too.
 	   ;;
 	   ;; The following isn't quite right, but it's close enough.
@@ -1754,7 +2043,6 @@ doesn't match any of the regular expressions in
 
 ;; Perl indentation style.
 
-(fset 'perl-mode 'cperl-mode)
 (setq cperl-indent-level 2)
 (setq cperl-continued-statement-offset 2)
 (setq cperl-continued-brace-offset 0)
@@ -1921,99 +2209,26 @@ strip numbers instead."
   (mdw-post-config-mode-hack))
 
 ;;;--------------------------------------------------------------------------
-;;; ARM assembler programming configuration.
-
-;; There doesn't appear to be an Emacs mode for this yet.
-;;
-;; Better do something about that, I suppose.
-
-(defvar arm-assembler-mode-map nil)
-(defvar arm-assembler-abbrev-table nil)
-(defvar arm-assembler-mode-syntax-table (make-syntax-table))
-
-(or arm-assembler-mode-map
-    (progn
-      (setq arm-assembler-mode-map (make-sparse-keymap))
-      (define-key arm-assembler-mode-map "\C-m" 'arm-assembler-newline)
-      (define-key arm-assembler-mode-map [C-return] 'newline)
-      (define-key arm-assembler-mode-map "\t" 'tab-to-tab-stop)))
-
-(defun arm-assembler-mode ()
-  "Major mode for ARM assembler programs"
-  (interactive)
-
-  ;; Do standard major mode things.
-  (kill-all-local-variables)
-  (use-local-map arm-assembler-mode-map)
-  (setq local-abbrev-table arm-assembler-abbrev-table)
-  (setq major-mode 'arm-assembler-mode)
-  (setq mode-name "ARM assembler")
-
-  ;; Set up syntax table.
-  (set-syntax-table arm-assembler-mode-syntax-table)
-  (modify-syntax-entry ?;   ; Nasty hack
-		       "<" arm-assembler-mode-syntax-table)
-  (modify-syntax-entry ?\n ">" arm-assembler-mode-syntax-table)
-  (modify-syntax-entry ?_ "_" arm-assembler-mode-syntax-table)
-  (modify-syntax-entry ?' "\"'" arm-assembler-mode-syntax-table)
-
-  (make-local-variable 'comment-start)
-  (setq comment-start ";")
-  (make-local-variable 'comment-end)
-  (setq comment-end "")
-  (make-local-variable 'comment-column)
-  (setq comment-column 48)
-  (make-local-variable 'comment-start-skip)
-  (setq comment-start-skip ";+[ \t]*")
-
-  ;; Play with indentation.
-  (make-local-variable 'indent-line-function)
-  (setq indent-line-function 'indent-relative-maybe)
-
-  ;; Set fill prefix.
-  (mdw-standard-fill-prefix "\\([ \t]*;+[ \t]*\\)")
-
-  ;; Fiddle with fontification.
-  (make-local-variable 'font-lock-keywords)
-  (setq font-lock-keywords
-	(list
-
-	 ;; Handle numbers too.
-	 ;;
-	 ;; The following isn't quite right, but it's close enough.
-	 (list (concat "\\("
-		       "&[0-9a-fA-F]+\\|"
-		       "\\<[0-9]+\\(\\.[0-9]*\\|_[0-9a-zA-Z]+\\|\\)"
-		       "\\)")
-	       '(0 mdw-number-face))
-
-	 ;; Do something about operators.
-	 (list "^[^ \t]*[ \t]+\\(GET\\|LNK\\)[ \t]+\\([^;\n]*\\)"
-	       '(1 font-lock-keyword-face)
-	       '(2 font-lock-string-face))
-	 (list ":[a-zA-Z]+:"
-	       '(0 font-lock-keyword-face))
-
-	 ;; Do menemonics and directives.
-	 (list "^[^ \t]*[ \t]+\\([a-zA-Z]+\\)"
-	       '(1 font-lock-keyword-face))
-
-	 ;; And anything else is punctuation.
-	 (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
-	       '(0 mdw-punct-face))))
-
-  (mdw-post-config-mode-hack)
-  (run-hooks 'arm-assembler-mode-hook))
-
-;;;--------------------------------------------------------------------------
 ;;; Assembler mode.
 
 (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)
   (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) ?@))
+
 ;;;--------------------------------------------------------------------------
 ;;; TCL configuration.
 
@@ -2074,11 +2289,11 @@ strip numbers instead."
 			  "t" "f")))
     (setq font-lock-keywords
 	  (list (list (concat "\\<\\(" dylan-keywords
-			      "\\|" (concat "with\\(out\\)?-" word)
-			      "\\|" (concat word ":")
+			      "\\|" "with\\(out\\)?-" word
 			      "\\)\\>")
 		      '(0 font-lock-keyword-face))
-		(list (concat "#\\(" sharp-keywords "\\)\\>")
+		(list (concat "\\<" word ":" "\\|"
+			      "#\\(" sharp-keywords "\\)\\>")
 		      '(0 font-lock-variable-name-face))
 		(list (concat "\\("
 			      "\\([-+]\\|\\<\\)[0-9]+" "\\("
@@ -2526,8 +2741,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'."
@@ -2542,15 +2757,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.
@@ -2572,6 +2779,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)
 
@@ -2921,6 +3131,13 @@ setting once it's actually been made."
        (indent-for-tab-command)))
 
 (defun mdw-setup-m4 ()
+
+  ;; Inexplicably, Emacs doesn't match braces in m4 mode.  This is very
+  ;; annoying: fix it.
+  (modify-syntax-entry ?{ "(")
+  (modify-syntax-entry ?} ")")
+
+  ;; Fill prefix.
   (mdw-standard-fill-prefix "\\([ \t]*\\(?:#+\\|\\<dnl\\>\\)[ \t]*\\)"))
 
 ;;;--------------------------------------------------------------------------
@@ -2997,6 +3214,19 @@ This allows you to pass a list of arguments through `ansi-term'."
   (interactive "sHost: ")
   (ansi-term (list "ssh" host) (format "ssh@%s" host)))
 
+(defvar git-grep-command
+  "env PAGER=cat git grep --no-color -nH -e "
+  "*The default command for \\[git-grep].")
+
+(defvar git-grep-history nil)
+
+(defun git-grep (command-args)
+  "Run `git grep' with user-specified args and collect output in a buffer."
+  (interactive
+   (list (read-shell-command "Run git grep (like this): "
+			     git-grep-command 'git-grep-history)))
+  (grep command-args))
+
 ;;;--------------------------------------------------------------------------
 ;;; Inferior Emacs Lisp.