Commit e350babd authored by Stefan Monnier's avatar Stefan Monnier
Browse files

(font-lock-maximum-size, font-lock-verbose): Remove.

(font-lock-multiline, font-lock-fontified, font-lock-set-defaults):
Move back to font-lock.el
(font-lock-default-function): Use font-lock-mode-internal.
parent f8115798
......@@ -25,9 +25,6 @@
;;; Code:
(defvar font-lock-maximum-size)
(defvar font-lock-verbose)
;; This variable is used by mode packages that support Font Lock mode by
;; defining their own keywords to use for `font-lock-keywords'. (The mode
;; command should make it buffer-local and set it to provide the set up.)
......@@ -130,20 +127,10 @@ where MAJOR-MODE is a symbol and FONT-LOCK-DEFAULTS is a list of default
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.
......@@ -222,7 +209,7 @@ your own function which is called when `font-lock-mode' is toggled via
(defun font-lock-defontify ()
"Clear out all `font-lock-face' properties in current buffer.
A major mode that uses `font-lock-face' properties should put
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))
......@@ -235,7 +222,6 @@ this function onto `change-major-mode-hook'."
(defun font-lock-default-function (mode)
;; Turn on Font Lock mode.
(when mode
(font-lock-set-defaults)
(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.
......@@ -243,21 +229,7 @@ this function onto `change-major-mode-hook'."
(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 mode
;; Remove `font-lock-face' as an alias for the `face' property.
......@@ -267,33 +239,20 @@ this function onto `change-major-mode-hook'."
(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
......
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