Merge branch 'master' of us:git/staging/profile

[profile] / el / dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index e89859782fb8be7aeabde60b178d686a00edc316..0967471a783a105d9cef5036fcbc04185a80ec0f 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -837,11 +837,17 @@ (defun mdw-misc-mode-config ()
   (trap (turn-on-font-lock)))
 
 (defun mdw-post-local-vars-misc-mode-config ()
-  (when mdw-do-misc-mode-hacking
+  (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)
 
+(defadvice toggle-read-only (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))))
+
 (eval-after-load 'gtags
   '(progn
      (dolist (key '([mouse-2] [mouse-3]))