[gnus git] branch master updated: n0-17-390-gb895e61 =1= Make the font-lock variables buffer-local instead of binding them to avoid warnings.

       via  b895e61e03ce75a286e8c9d2325fcbf2266d5125 (commit)
      from  b90fd52c6aaed0f274b2056c90e212933cb47815 (commit)


- Log -----------------------------------------------------------------
commit b895e61e03ce75a286e8c9d2325fcbf2266d5125
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Mon Nov 21 20:37:19 2011 +0100

    Make the font-lock variables buffer-local instead of binding them to avoid warnings.
    
    Also demote errors (bug#10063).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 43a90a6..413edc2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-21  Lars Magne Ingebrigtsen  <[email protected]>
+
+	* mm-view.el (mm-display-inline-fontify): Make the font-lock variables
+	buffer-local instead of binding them to avoid warnings.  Also demote
+	errors (bug#10063).
+
 2011-11-20  Juanma Barranquero  <[email protected]>
 
 	* mm-util.el (mm-charset-after):
diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 6358e34..338aa10 100644
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -597,14 +597,14 @@ If MODE is not set, try to find mode automatically."
 		    (t
 		     text)))
       (require 'font-lock)
-      (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))
+      (let ((font-lock-verbose nil))
+	;; Disable support modes, e.g., jit-lock, lazy-lock, etc.
+	(set (make-local-variable 'font-lock-mode-hook) nil)
+	(set (make-local-variable 'font-lock-support-mode) nil)
         (setq buffer-file-name (mm-handle-filename handle))
         (set (make-local-variable 'enable-local-variables) nil)
+	(with-demoted-errors
         (if mode
             (funcall mode)
 	  (let ((auto-mode-alist
@@ -615,7 +615,7 @@ If MODE is not set, try to find mode automatically."
         ;; 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)))
+	    (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.

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog  |    6 ++++++
 lisp/mm-view.el |   34 +++++++++++++++++-----------------
 2 files changed, 23 insertions(+), 17 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project