Synch to No Gnus 200509060521.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7052b07..47bd6b9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2005-09-06  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+       * mm-view.el (mm-display-inline-fontify): Disable support modes.
+
        * lpath.el: Don't bind mc-pgp-always-sign, url-current-object,
        url-package-name, url-package-version,
        w3m-cid-retrieve-function-alist, w3m-current-buffer,

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 5bf538d..8bf0c66 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -498,14 +498,16 @@
                    (t
                     text)))
       (require 'font-lock)
-      ;; Inhibit font-lock this time (*-mode-hook might run
-      ;; `turn-on-font-lock') so that jit-lock may not turn off
-      ;; font-lock immediately after this.
-      (let ((font-lock-mode t))
-       (funcall mode))
-      (let ((font-lock-verbose nil))
-       ;; I find font-lock a bit too verbose.
-       (font-lock-fontify-buffer))
+      (let ((font-lock-maximum-size nil)
+           ;; Disable support modes, e.g., jit-lock, lazy-lock, etc.
+           (font-lock-mode-hook nil)
+           (font-lock-support-mode nil)
+           ;; I find font-lock a bit too verbose.
+           (font-lock-verbose nil))
+       (funcall mode)
+       ;; The mode function might have already turned on font-lock.
+       (unless (symbol-value 'font-lock-mode)
+         (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.