Commit f512e4c0 authored by Simon Marshall's avatar Simon Marshall
Browse files

Fix up specialised fontification stuff.

parent 3d0c5302
...@@ -647,11 +647,12 @@ Instead, these commands are available: ...@@ -647,11 +647,12 @@ Instead, these commands are available:
(defun rmail-variables () (defun rmail-variables ()
(make-local-variable 'revert-buffer-function) (make-local-variable 'revert-buffer-function)
(setq revert-buffer-function 'rmail-revert) (setq revert-buffer-function 'rmail-revert)
(make-local-variable 'font-lock-defaults)
(setq font-lock-defaults (setq font-lock-defaults
'(rmail-font-lock-keywords t nil nil nil '(rmail-font-lock-keywords t nil nil nil
(rmail-fontify-buffer-function rmail-unfontify-buffer-function nil nil (font-lock-fontify-buffer-function . rmail-fontify-buffer-function)
(fast-lock-mode)))) (font-lock-unfontify-buffer-function . rmail-unfontify-buffer-function)
(setq font-lock-defaults '(rmail-font-lock-keywords t)) (font-lock-inhibit-thing-lock . (lazy-lock-mode fast-lock-mode))))
(make-local-variable 'rmail-last-label) (make-local-variable 'rmail-last-label)
(make-local-variable 'rmail-last-regexp) (make-local-variable 'rmail-last-regexp)
(make-local-variable 'rmail-deleted-vector) (make-local-variable 'rmail-deleted-vector)
...@@ -2532,17 +2533,22 @@ This has an effect only if a summary buffer exists.") ...@@ -2532,17 +2533,22 @@ This has an effect only if a summary buffer exists.")
(defun rmail-fontify-buffer-function () (defun rmail-fontify-buffer-function ()
;; This function's symbol is bound to font-lock-fontify-buffer-function. ;; This function's symbol is bound to font-lock-fontify-buffer-function.
(if (and (boundp 'lazy-lock-mode) lazy-lock-mode)
(setq font-lock-fontify-buffer-function
'font-lock-default-fontify-buffer)
(make-local-hook 'rmail-show-message-hook) (make-local-hook 'rmail-show-message-hook)
(add-hook 'rmail-show-message-hook 'rmail-fontify-message nil t) (add-hook 'rmail-show-message-hook 'rmail-fontify-message nil t)
(rmail-fontify-message))) (rmail-fontify-message)
(setq font-lock-fontified t))
(defun rmail-unfontify-buffer-function () (defun rmail-unfontify-buffer-function ()
;; This function's symbol is bound to font-lock-fontify-unbuffer-function. ;; This function's symbol is bound to font-lock-fontify-unbuffer-function.
(let ((modified (buffer-modified-p))
(buffer-undo-list t) (inhibit-read-only t)
before-change-functions after-change-functions
buffer-file-name buffer-file-truename)
(save-restriction
(widen)
(remove-hook 'rmail-show-message-hook 'rmail-fontify-message t) (remove-hook 'rmail-show-message-hook 'rmail-fontify-message t)
(font-lock-default-unfontify-buffer)) (remove-text-properties (point-min) (point-max) '(rmail-fontified nil))
(font-lock-default-unfontify-buffer))))
(defun rmail-fontify-message () (defun rmail-fontify-message ()
;; Fontify the current message if it is not already fontified. ;; Fontify the current message if it is not already fontified.
......
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