From: yamaoka <yamaoka>
Date: Thu, 21 Oct 2004 12:56:12 +0000 (+0000)
Subject: Synch to Gnus 200410211255.
X-Git-Tag: t-gnus-6_17_4-quimby-~701
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=7af80b51894f997615d431f31d36f58a42ae4e8e;p=elisp%2Fgnus.git-

Synch to Gnus 200410211255.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8560412..cfa81b4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mm-view.el (mm-display-inline-fontify): Inhibit font-lock when
+	running the major-mode function.
+
 2004-10-19  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-sum.el (gnus-update-summary-mark-positions): Search for
diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 4152011..133b3f6 100644
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -470,8 +470,12 @@
 	  (progn
 	    (buffer-disable-undo)
 	    (mm-insert-part handle)
-	    (funcall mode)
 	    (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))