Commit 252f26e9 authored by Lars Magne Ingebrigtsen's avatar Lars Magne Ingebrigtsen Committed by Katsumi Yamaoka
Browse files

mm-view.el (mm-display-inline-fontify): Make the font-lock variables...

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).
parent 9c34a344
2011-11-21 Lars Magne Ingebrigtsen <larsi@gnus.org>
* 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).
(font-lock-mode-hook): Shut up byte compiler.
2011-11-20 Juanma Barranquero <lekktu@gmail.com>
 
* mm-util.el (mm-charset-after): Fix typo.
......
......@@ -566,6 +566,8 @@
(face-property 'default prop) (current-buffer))))
(delete-region ,(point-min-marker) ,(point-max-marker)))))))))
;; Shut up byte-compiler.
(defvar font-lock-mode-hook)
(defun mm-display-inline-fontify (handle &optional mode)
"Insert HANDLE inline fontifying with MODE.
If MODE is not set, try to find mode automatically."
......@@ -597,25 +599,25 @@ 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))
;; I find font-lock a bit too verbose.
(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)
(if mode
(funcall mode)
(let ((auto-mode-alist
(delq (rassq 'doc-view-mode-maybe auto-mode-alist)
(copy-sequence auto-mode-alist))))
(set-auto-mode)))
;; The mode function might have already turned on font-lock.
;; 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)))
(with-demoted-errors
(if mode
(funcall mode)
(let ((auto-mode-alist
(delq (rassq 'doc-view-mode-maybe auto-mode-alist)
(copy-sequence auto-mode-alist))))
(set-auto-mode)))
;; The mode function might have already turned on font-lock.
;; 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
;; to be copied along with the text.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment