From 800479f5fda5fd1454c08c70a12c150e053fce77 Mon Sep 17 00:00:00 2001 From: Karl Heuer Date: Mon, 29 May 1995 06:59:49 +0000 Subject: [PATCH] (font-lock-revert-cleanup): Always turn font lock on. (font-lock-mode): When turning mode off, always take out the revert hooks. --- lisp/font-lock.el | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lisp/font-lock.el b/lisp/font-lock.el index c6d5ef1ac33..83ca7e049cc 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -639,6 +639,8 @@ size, you can use \\[font-lock-fontify-buffer]." (font-lock-unfontify-region (point-min) (point-max)) (font-lock-thing-lock-cleanup)) (t + (remove-hook 'before-revert-hook 'font-lock-revert-setup) + (remove-hook 'after-revert-hook 'font-lock-revert-cleanup) (font-lock-thing-lock-cleanup))) (force-mode-line-update))) @@ -648,6 +650,9 @@ size, you can use \\[font-lock-fontify-buffer]." (font-lock-mode 1)) ;; Turn off other related packages if they're on. I prefer a hook. +;; These explicit calls are easier to understand +;; because people know what they will do. +;; A hook is a mystery because it might do anything whatever. -- rms. (defun font-lock-thing-lock-cleanup () (cond ((and (boundp 'fast-lock-mode) fast-lock-mode) (fast-lock-mode -1)) @@ -661,17 +666,14 @@ size, you can use \\[font-lock-fontify-buffer]." ((and (boundp 'lazy-lock-mode) lazy-lock-mode) (lazy-lock-after-fontify-buffer)))) -;; If the buffer is about to be reverted, it won't be fontified. +;; If the buffer is about to be reverted, it won't be fontified afterward. (defun font-lock-revert-setup () (setq font-lock-fontified nil)) -;; If the buffer has just been reverted, we might not even be in font-lock -;; mode anymore, and if we are, the buffer may or may not have already been -;; refontified. Refontify here if it looks like we need to. +;; If the buffer has just been reverted, normally that turns off +;; Font Lock mode. So turn the mode back on if necessary. (defun font-lock-revert-cleanup () - (and font-lock-mode - (not font-lock-fontified) - (font-lock-mode 1))) + (font-lock-mode 1)) ;;;###autoload (defun font-lock-fontify-buffer () -- 2.39.2