X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/247c22e185554cfa49736f2e587539d6a92732ed..c0ece6a5c4c8dc87be1da6808289c88de19d8398:/lisp/gnus/mm-view.el?ds=sidebyside

diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index 39d49af060..5a90f015ae 100644
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -603,11 +603,14 @@ If MODE is not set, try to find mode automatically."
 	    ;; I find font-lock a bit too verbose.
 	    (font-lock-verbose nil))
         (setq buffer-file-name (mm-handle-filename handle))
+        (set (make-local-variable 'enable-local-variables) nil)
         (if mode
             (funcall mode)
-          (normal-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