From: Julien Danjou <julien@danjou.info>
Date: Fri, 1 Apr 2011 08:11:50 +0000 (+0200)
Subject: mm-view: do not fontify fundamental-mode
X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=a030e58d75e8dcaff893d0618f6ac0daa2ca9823;ds=sidebyside

mm-view: do not fontify fundamental-mode

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8a77f8b54..595d32bbd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-01  Julien Danjou  <julien@danjou.info>
+
+	* mm-view.el (mm-display-inline-fontify): Do not fontify with
+	fundamental-mode.
+
 2011-03-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus-sum.el (gnus-update-marks): Revert intersection change, which
diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index abd78b8de..5a90f015a 100644
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -608,7 +608,9 @@ If MODE is not set, try to find mode automatically."
             (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