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

* 'master' of us:git/staging/profile:
  el/dot-emacs.el: Don't highlight bad whitespace in read-only buffers.

diff --combined el/dot-emacs.el
index e89859782fb8be7aeabde60b178d686a00edc316,1b0e3507f9972f2f7e78660ca28d220680b263bd..0967471a783a105d9cef5036fcbc04185a80ec0f
--- 1/el/dot-emacs.el
--- 2/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@@ -837,11 -837,17 +837,17 @@@ case.
    (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]))
@@@ -1230,7 -1236,7 +1236,7 @@@ doesn't match any of the regular expres
  (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)