mm-view: use set-normal-mode

Signed-off-by: Julien Danjou <julien@danjou.info>

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 116a3d0..82db122 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-29  Julien Danjou  <julien@danjou.info>
+
+       * mm-view.el (mm-display-inline-fontify): Use `set-normal-mode' with
+       local variables disabled rather than `normal-mode'.
+
 2011-03-28  Brian T. Sniffen  <bsniffen@akamai.com>  (tiny change)
 
        * imap.el (imap-shell-open, imap-process-connection-type): Use

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 39d49af..abd78b8 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -603,9 +603,10 @@ 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)
          (font-lock-fontify-buffer)))