mm-view: do not fontify fundamental-mode

[gnus] / lisp / mm-view.el

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index d63d202..5a90f01 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -455,7 +455,7 @@
          (narrow-to-region (point) (point))
          (mm-insert-part handle)
          (goto-char (point-max)))
-      (insert (mm-decode-string (mm-get-part handle) charset)))
+      (mm-display-inline-fontify handle))
     (when (and mm-fill-flowed
               (equal type "plain")
               (equal (cdr (assoc 'format (mm-handle-type handle)))
@@ -565,15 +565,16 @@
                     (face-property 'default prop) (current-buffer))))
              (delete-region ,(point-min-marker) ,(point-max-marker)))))))))
 
-(defun mm-display-inline-fontify (handle mode)
+(defun mm-display-inline-fontify (handle &optional mode)
+  "Insert HANDLE inline fontifying with MODE.
+If MODE is not set, try to find mode automatically."
   (let ((charset (mail-content-type-get (mm-handle-type handle) 'charset))
        text coding-system)
     (unless (eq charset 'gnus-decoded)
       (mm-with-unibyte-buffer
        (mm-insert-part handle)
        (mm-decompress-buffer
-        (or (mail-content-type-get (mm-handle-disposition handle) 'name)
-            (mail-content-type-get (mm-handle-disposition handle) 'filename))
+         (mm-handle-filename handle)
         t t)
        (unless charset
          (setq coding-system (mm-find-buffer-file-coding-system)))
@@ -601,9 +602,15 @@
            (font-lock-support-mode nil)
            ;; I find font-lock a bit too verbose.
            (font-lock-verbose nil))
-       (funcall mode)
+        (setq buffer-file-name (mm-handle-filename handle))
+        (set (make-local-variable 'enable-local-variables) nil)
+        (if mode
+            (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
@@ -614,6 +621,9 @@
                       nil)
                     nil nil nil nil nil 'text-prop))
       (setq text (buffer-string))
+      ;; Set buffer unmodified to avoid confirmation when killing the
+      ;; buffer.
+      (set-buffer-modified-p nil)
       (kill-buffer (current-buffer)))
     (mm-insert-inline handle text)))