el/dot-emacs.el: Delay whitespace-mode setting.

Turn on whitespace-mode /after/ local variables have been applied, so
that it can take into account settings like `indent-tabs-mode' acquired
from file- or directory-local variables.

There used to be a halfhearted attempt at this, with the
`mdw-post-config-mode-hook' function called explicitly by the various
mode hooks.  This is now replaced by a standard hook on
`hack-local-variables-hook' activated by `mdw-misc-mode-config'.

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index bd2938540eecb0f7858ae029bfa8449ec397c3d6..1b9f24e2e10c474af77ee7ee339b0b03adb008b3 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -819,14 +819,13 @@ (defun mdw-misc-mode-config ()
              nil)
             (t
              (local-set-key "\C-m" 'newline-and-indent))))
              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)
   (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)

   (and (fboundp 'gtags-mode)
        (gtags-mode))
   (if (fboundp 'hs-minor-mode)
   (and (fboundp 'gtags-mode)
        (gtags-mode))
   (if (fboundp 'hs-minor-mode)


@@ -835,8 +834,11 @@ (defun mdw-misc-mode-config ()
   (reveal-mode t)
   (trap (turn-on-font-lock)))
 
   (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 ()
+  (when mdw-do-misc-mode-hacking
+    (setq show-trailing-whitespace t)
+    (mdw-whitespace-mode 1)))
+(add-hook 'hack-local-variables-hook 'mdw-post-local-vars-misc-mode-config)

 
 (eval-after-load 'gtags
   '(progn
 
 (eval-after-load 'gtags
   '(progn


@@ -1461,9 +1463,7 @@ (defun mdw-fontify-c-and-c++ ()
 
           ;; And anything else is punctuation.
           (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
 
           ;; 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.
 
 ;;;--------------------------------------------------------------------------
 ;;; AP calc mode.


@@ -1515,9 +1515,7 @@ (defun mdw-fontify-apcalc ()
 
           ;; And anything else is punctuation.
           (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
 
           ;; 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.
 
 ;;;--------------------------------------------------------------------------
 ;;; Java programming configuration.


@@ -1583,9 +1581,7 @@ (defun mdw-fontify-java ()
 
           ;; And anything else is punctuation.
           (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
 
           ;; 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.
 
 ;;;--------------------------------------------------------------------------
 ;;; Javascript programming configuration.


@@ -1643,9 +1639,7 @@ (defun mdw-fontify-javascript ()
 
           ;; And anything else is punctuation.
           (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
 
           ;; 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.
 
 ;;;--------------------------------------------------------------------------
 ;;; Scala programming configuration.


@@ -1718,9 +1712,7 @@ (defun mdw-fontify-scala ()
                         "\\|" "\\\\" "." "\\)"
                         "\\('\\)")
                 '(1 "\"")
                         "\\|" "\\\\" "." "\\)"
                         "\\('\\)")
                 '(1 "\"")

-                '(4 "\"")))))
-
-  (mdw-post-config-mode-hack))
+                '(4 "\""))))))

 
 ;;;--------------------------------------------------------------------------
 ;;; C# programming configuration.
 
 ;;;--------------------------------------------------------------------------
 ;;; C# programming configuration.


@@ -1791,9 +1783,7 @@ (defun mdw-fontify-csharp ()
 
           ;; And anything else is punctuation.
           (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
 
           ;; 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.")
 
 (define-derived-mode csharp-mode java-mode "C#"
   "Major mode for editing C# code.")


@@ -1908,9 +1898,7 @@ (defun mdw-fontify-fsharp ()
                      '(0 mdw-number-face))
 
                (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
                      '(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)
 
 (defun mdw-fontify-inferior-fsharp ()
   (mdw-fontify-fsharp)


@@ -1979,9 +1967,7 @@ (defun mdw-fontify-go ()
 
           ;; And anything else is punctuation.
           (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
 
           ;; And anything else is punctuation.
           (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"

-                '(0 mdw-punct-face)))))
-
-  (mdw-post-config-mode-hack))
+                '(0 mdw-punct-face))))))

 
 ;;;--------------------------------------------------------------------------
 ;;; Rust programming configuration.
 
 ;;;--------------------------------------------------------------------------
 ;;; Rust programming configuration.


@@ -2057,10 +2043,7 @@ (defun mdw-fontify-rust ()
 
   ;; Hack key bindings.
   (local-set-key [?{] 'mdw-self-insert-and-indent)
 
   ;; Hack key bindings.
   (local-set-key [?{] 'mdw-self-insert-and-indent)

-  (local-set-key [?}] 'mdw-self-insert-and-indent)
-
-  ;; Final hacking.
-  (mdw-post-config-mode-hack))
+  (local-set-key [?}] 'mdw-self-insert-and-indent))

 
 ;;;--------------------------------------------------------------------------
 ;;; Awk programming configuration.
 
 ;;;--------------------------------------------------------------------------
 ;;; Awk programming configuration.


@@ -2118,9 +2101,7 @@ (defun mdw-fontify-awk ()
 
           ;; And anything else is punctuation.
           (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
 
           ;; 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 programming style.


@@ -2180,9 +2161,7 @@ (defun mdw-fontify-perl ()
 
           ;; And anything else is punctuation.
           (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
 
           ;; 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,
 
 (defun perl-number-tests (&optional arg)
   "Assign consecutive numbers to lines containing `#t'.  With ARG,


@@ -2225,9 +2204,7 @@ (defun mdw-fontify-pythonic (keywords)
 
         ;; And anything else is punctuation.
         (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
 
         ;; 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.
 
 
 ;; Define Python fontification styles.
 


@@ -2301,9 +2278,7 @@ (defun mdw-fontify-icon ()
 
           ;; And anything else is punctuation.
           (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
 
           ;; 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.
 
 ;;;--------------------------------------------------------------------------
 ;;; Assembler mode.


@@ -2337,8 +2312,7 @@ (defun mdw-fontify-tcl ()
                       "\\([eE]\\([-+]\\|\\)[0-9_]+\\|\\)")
               '(0 mdw-number-face))
         (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
                       "\\([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.
 
 ;;;--------------------------------------------------------------------------
 ;;; Dylan programming configuration.


@@ -2404,9 +2378,7 @@ (defun mdw-fontify-dylan ()
                              "\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\|"
                              "\\_<[-+*/=<>:&|]+\\_>"
                              "\\)")
                              "\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\|"
                              "\\_<[-+*/=<>:&|]+\\_>"
                              "\\)")

-                     '(0 mdw-punct-face)))))
-
-  (mdw-post-config-mode-hack))
+                     '(0 mdw-punct-face))))))

 
 ;;;--------------------------------------------------------------------------
 ;;; Algol 68 configuration.
 
 ;;;--------------------------------------------------------------------------
 ;;; Algol 68 configuration.


@@ -2448,9 +2420,7 @@ (defun mdw-fontify-algol-68 ()
                              "\\>")
                      '(0 mdw-number-face))
                (list "\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/"
                              "\\>")
                      '(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.
 
 ;;;--------------------------------------------------------------------------
 ;;; REXX configuration.


@@ -2523,9 +2493,7 @@ (defun mdw-fontify-rexx ()
 
           ;; And everything else is punctuation.
           (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
 
           ;; 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.
 
 ;;;--------------------------------------------------------------------------
 ;;; Standard ML programming style.


@@ -2575,9 +2543,7 @@ (defun mdw-fontify-sml ()
 
           ;; And anything else is punctuation.
           (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
 
           ;; 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.
 
 ;;;--------------------------------------------------------------------------
 ;;; Haskell configuration.


@@ -2655,9 +2621,7 @@ (defun mdw-fontify-haskell ()
                         "\\([eE]\\([-+]\\|\\)[0-9]+\\|\\)")
                 '(0 mdw-number-face))
           (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
                         "\\([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.
 
 ;;;--------------------------------------------------------------------------
 ;;; Erlang configuration.


@@ -2690,9 +2654,7 @@ (defun mdw-fontify-erlang ()
           (list "\\<[0-9]+\\(\\|#[0-9a-zA-Z]+\\|[eE][+-]?[0-9]+\\)\\>"
                 '(0 mdw-number-face))
           (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
           (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.
 
 ;;;--------------------------------------------------------------------------
 ;;; Texinfo configuration.


@@ -2726,9 +2688,7 @@ (defun mdw-fontify-texinfo ()
 
         ;; Fontify TeX special characters as punctuation.
         (list "[{}]+"
 
         ;; Fontify TeX special characters as punctuation.
         (list "[{}]+"

-              '(0 mdw-punct-face))))
-
-  (mdw-post-config-mode-hack))
+              '(0 mdw-punct-face)))))

 
 ;;;--------------------------------------------------------------------------
 ;;; TeX and LaTeX configuration.
 
 ;;;--------------------------------------------------------------------------
 ;;; TeX and LaTeX configuration.


@@ -2794,9 +2754,7 @@ (defun mdw-fontify-tex ()
 
         ;; Fontify TeX special characters as punctuation.
         (list "[$^_{}#&]"
 
         ;; Fontify TeX special characters as punctuation.
         (list "[$^_{}#&]"

-              '(0 mdw-punct-face))))
-
-  (mdw-post-config-mode-hack))
+              '(0 mdw-punct-face)))))

 
 ;;;--------------------------------------------------------------------------
 ;;; SGML hacking.
 
 ;;;--------------------------------------------------------------------------
 ;;; SGML hacking.


@@ -3156,8 +3114,7 @@ (defun mdw-fontify-smalltalk ()
                       "\\([eE]\\([-+]\\|\\)[0-9_]+\\|\\)")
               '(0 mdw-number-face))
         (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
                       "\\([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.
 
 
 ;; Lispy languages.
 


@@ -3214,9 +3171,7 @@ (defun mdw-fontify-lispy ()
                            "\\)\\_>")
                    '(0 mdw-number-face))
              (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
                            "\\)\\_>")
                    '(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)
 
 (defun comint-send-and-indent ()
   (interactive)