Other variables include that for syntactic keyword fontification,
`font-lock-syntactic-keywords'
-and those for buffer-specialised fontification functions,
+and those for buffer-specialized fontification functions,
`font-lock-fontify-buffer-function', `font-lock-unfontify-buffer-function',
`font-lock-fontify-region-function', `font-lock-unfontify-region-function',
`font-lock-inhibit-thing-lock' and `font-lock-maximum-size'.")
settings. See the variable `font-lock-defaults', which takes precedence.")
(make-obsolete-variable 'font-lock-defaults-alist 'font-lock-defaults)
-(defvar font-lock-multiline nil
- "Whether font-lock should cater to multiline keywords.
-If nil, don't try to handle multiline patterns.
-If t, always handle multiline patterns.
-If `undecided', don't try to handle multiline patterns until you see one.
-Major/minor modes can set this variable if they know which option applies.")
-
-(defvar font-lock-fontified nil) ; Whether we have fontified the buffer.
-
(defvar font-lock-function 'font-lock-default-function
"A function which is called when `font-lock-mode' is toggled.
It will be passed one argument, which is the current value of
`font-lock-mode'.")
-(make-variable-buffer-local 'font-lock-function)
(define-minor-mode font-lock-mode
"Toggle Font Lock mode.
;; batch job) or if the buffer is invisible (the name starts with a space).
(when (or noninteractive (eq (aref (buffer-name) 0) ?\ ))
(setq font-lock-mode nil))
- (funcall font-lock-function font-lock-mode))
-
-(defun font-lock-default-function (font-lock-mode)
+ (funcall font-lock-function font-lock-mode)
+ ;; Arrange to unfontify this buffer if we change major mode later.
+ (if font-lock-mode
+ (add-hook 'change-major-mode-hook 'font-lock-change-mode nil t)
+ (remove-hook 'change-major-mode-hook 'font-lock-change-mode t)))
+
+;; Get rid of fontification for the old major mode.
+;; We do this when changing major modes.
+(defun font-lock-change-mode ()
+ (font-lock-mode -1))
+
+(defun font-lock-defontify ()
+ "Clear out all `font-lock-face' properties in current buffer.
+A major mode that uses `font-lock-face' properties might want to put
+this function onto `change-major-mode-hook'."
+ (let ((modp (buffer-modified-p))
+ (inhibit-read-only t))
+ (save-restriction
+ (widen)
+ (remove-list-of-text-properties (point-min) (point-max)
+ '(font-lock-face)))
+ (restore-buffer-modified-p modp)))
+
+(defun font-lock-default-function (mode)
;; Turn on Font Lock mode.
- (when font-lock-mode
- (font-lock-set-defaults)
+ (when mode
(set (make-local-variable 'char-property-alias-alist)
(copy-tree char-property-alias-alist))
;; Add `font-lock-face' as an alias for the `face' property.
(if elt
(unless (memq 'font-lock-face (cdr elt))
(setcdr elt (nconc (cdr elt) (list 'font-lock-face))))
- (push (list 'face 'font-lock-face) char-property-alias-alist)))
- ;; Only do hard work if the mode has specified stuff in
- ;; `font-lock-defaults'.
- (when font-lock-defaults
- (add-hook 'after-change-functions 'font-lock-after-change-function t t)
- (font-lock-turn-on-thing-lock)
- ;; Fontify the buffer if we have to.
- (let ((max-size (font-lock-value-in-major-mode font-lock-maximum-size)))
- (cond (font-lock-fontified
- nil)
- ((or (null max-size) (> max-size (buffer-size)))
- (font-lock-fontify-buffer))
- (font-lock-verbose
- (message "Fontifying %s...buffer size greater than font-lock-maximum-size"
- (buffer-name)))))))
+ (push (list 'face 'font-lock-face) char-property-alias-alist))))
;; Turn off Font Lock mode.
- (unless font-lock-mode
+ (unless mode
;; Remove `font-lock-face' as an alias for the `face' property.
(set (make-local-variable 'char-property-alias-alist)
(copy-tree char-property-alias-alist))
(when elt
(setcdr elt (remq 'font-lock-face (cdr elt)))
(when (null (cdr elt))
- (setq char-property-alias-alist (delq elt char-property-alias-alist)))))
- (when font-lock-defaults
- (remove-hook 'after-change-functions 'font-lock-after-change-function t)
- (font-lock-unfontify-buffer)
- (font-lock-turn-off-thing-lock))))
-
+ (setq char-property-alias-alist
+ (delq elt char-property-alias-alist))))))
+
+ ;; Only do hard work if the mode has specified stuff in
+ ;; `font-lock-defaults'.
+ (when (or font-lock-defaults
+ (cdr (assq major-mode font-lock-defaults-alist)))
+ (font-lock-mode-internal mode)))
+
(defun turn-on-font-lock ()
"Turn on Font Lock mode (only if the terminal can display it)."
(unless font-lock-mode
(font-lock-mode)))
-(defvar font-lock-set-defaults nil) ; Whether we have set up defaults.
-
-(defun font-lock-set-defaults ()
- "Set fontification defaults appropriately for this mode.
-Sets various variables using `font-lock-defaults' (or, if nil, using
-`font-lock-defaults-alist') and `font-lock-maximum-decoration'."
- (unless font-lock-set-defaults
- (set (make-local-variable 'font-lock-set-defaults) t)
- (make-local-variable 'font-lock-fontified)
- (make-local-variable 'font-lock-multiline)
- (let ((defaults (or font-lock-defaults
- (cdr (assq major-mode font-lock-defaults-alist)))))
- (when defaults
- (require 'font-lock)
- (font-lock-set-defaults-1)))))
-
;;; Global Font Lock mode.
;; A few people have hassled in the past for a way to make it easier to turn on
;; hook is run, the major mode is in the process of being changed and we do not
;; know what the final major mode will be. So, `font-lock-change-major-mode'
;; only (a) notes the name of the current buffer, and (b) adds our function
-;; `turn-on-font-lock-if-enabled' to the hook variables `find-file-hooks' and
+;; `turn-on-font-lock-if-enabled' to the hook variables `find-file-hook' and
;; `post-command-hook' (for buffers that are not visiting files). By the time
;; the functions on the first of these hooks to be run are run, the new major
;; mode is assumed to be in place. This way we get a Font Lock function run