* registry.el (initialize-instance, registry-db): Move the non-function initforms...

[gnus] / lisp / mm-view.el

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 39d49af..5a90f01 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/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