* mime-view.el (mime-display-inline-fontify): Reset the visited filename.

[elisp/semi.git] / mime-view.el

diff --git a/mime-view.el b/mime-view.el
index 529839a..978166d 100644 (file)
--- a/mime-view.el
+++ b/mime-view.el
@@ -675,6 +675,9 @@ Each elements are regexp of field-name.")
 
 (autoload 'fill-flowed "flow-fill")
 
+(defvar mime-preview-inline-fontify t
+  "If non-nil, fontify the inline part.")
+
 (ctree-set-calist-strictly
  'mime-preview-condition
  '((type . nil)
@@ -703,7 +706,7 @@ Each elements are regexp of field-name.")
 
 (ctree-set-calist-strictly
  'mime-preview-condition
- '((type . application)(subtype . emacs-lisp)(disposition-type . inline)
+ '((type . application)(subtype . emacs-lisp)
    (body . visible)
    (body-presentation-method . mime-display-application/emacs-lisp)))
 
@@ -761,7 +764,10 @@ Each elements are regexp of field-name.")
   (save-restriction
     (narrow-to-region (point-max)(point-max))
     (condition-case nil
-       (mime-insert-text-content entity)
+       (if (and mime-preview-inline-fontify
+                (mime-entity-filename entity)) ;should be an attachment.
+           (mime-display-inline-fontify entity)
+         (mime-insert-entity-content entity))
       (error (progn
               (message "Can't decode current entity.")
               (sit-for 1))))
@@ -901,29 +907,38 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t.  t means default."
     (mime-display-entity start nil default-situation)))
 
 ;;; stolen (and renamed) from mm-view.el.
-(defun mime-display-inline-fontify (entity mode)
+(defun mime-display-inline-fontify (entity &optional mode)
   ;; XEmacs @#$@ version of font-lock refuses to fully turn itself
   ;; on for buffers whose name begins with " ".  That's why we use
   ;; save-current-buffer/get-buffer-create rather than
   ;; with-temp-buffer.
-  (let ((buffer (get-buffer-create "*fontification*")))
+  (let ((buffer (get-buffer-create "*fontification*"))
+       filename)
     (save-current-buffer
       (set-buffer buffer)
       (buffer-disable-undo)
+      (kill-all-local-variables)
       (erase-buffer)
       (mime-insert-entity-content entity)
-      (funcall mode)
-      (let ((font-lock-verbose nil))
-       ;; I find font-lock a bit too verbose.
-       (font-lock-fontify-buffer))
-      ;; By default, XEmacs font-lock uses non-duplicable text
-      ;; properties.  This code forces all the text properties
-      ;; to be copied along with the text.
-      (static-when (fboundp 'extent-list)
-       (map-extents (lambda (ext ignored)
-                      (set-extent-property ext 'duplicable t)
-                      nil)
-                    nil nil nil nil nil 'text-prop)))
+      (unwind-protect
+         (progn
+           (if mode
+               (funcall mode)
+             (if (setq filename (mime-entity-filename entity))
+                 (set-visited-file-name filename))
+             (set-auto-mode))
+           (let ((font-lock-verbose nil))
+             ;; I find font-lock a bit too verbose.
+             (font-lock-fontify-buffer))
+           ;; By default, XEmacs font-lock uses non-duplicable text
+           ;; properties.  This code forces all the text properties
+           ;; to be copied along with the text.
+           (static-when (fboundp 'extent-list)
+             (map-extents (lambda (ext ignored)
+                            (set-extent-property ext 'duplicable t)
+                            nil)
+                          nil nil nil nil nil 'text-prop)))
+       (set-visited-file-name nil)))
     (insert-buffer-substring buffer)))
 
 (defun mime-display-application/emacs-lisp (entity situation)