lisp/startup.el (argi): Declare as global variable (bug#9275).

[gnu-emacs] / lisp / gnus / mm-view.el

diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index abd78b8de0277bdbad3a9718eaee029256e74445..5a90f015aedcdaf11e917e7abfdc3ffd3f9fb21d 100644 (file)
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -608,7 +608,9 @@ If MODE is not set, try to find mode automatically."
             (funcall mode)
           (set-auto-mode))
        ;; The mode function might have already turned on font-lock.
-       (unless (symbol-value 'font-lock-mode)
+        ;; Do not fontify if the guess mode is fundamental.
+       (unless (or (symbol-value 'font-lock-mode)
+                    (eq major-mode 'fundamental-mode))
          (font-lock-fontify-buffer)))
       ;; By default, XEmacs font-lock uses non-duplicable text
       ;; properties.  This code forces all the text properties