X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/d1c89300331d14dbb610f394ea22a622cf73a885..9c0c2af5a157eca18c86f644121f7eac5488dbda:/lisp/font-core.el diff --git a/lisp/font-core.el b/lisp/font-core.el index f7964b609f..ce4a35a0ec 100644 --- a/lisp/font-core.el +++ b/lisp/font-core.el @@ -1,6 +1,6 @@ ;;; font-core.el --- Core interface to font-lock -;; Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 1999, 2000, 2001, 2002 +;; Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 1999, 2000, 2001, 02, 2003 ;; Free Software Foundation, Inc. ;; Maintainer: FSF @@ -67,58 +67,15 @@ around a text block relevant to that mode). 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'.") (make-variable-buffer-local 'font-lock-defaults) -;; This variable is used where font-lock.el itself supplies the -;; keywords. Really, this shouldn't need to be in font-core.el, but -;; we can't avoid it. In the future, this stuff will hopefully be -;; moved to cc-mode itself. -(defvar font-lock-defaults-alist - (let (;; We use `beginning-of-defun', rather than nil, for SYNTAX-BEGIN. - ;; Thus the calculation of the cache is usually faster but not - ;; infallible, so we risk mis-fontification. sm. - (c-mode-defaults - '((c-font-lock-keywords c-font-lock-keywords-1 - c-font-lock-keywords-2 c-font-lock-keywords-3) - nil nil ((?_ . "w")) beginning-of-defun - (font-lock-syntactic-face-function - . c-font-lock-syntactic-face-function) - (font-lock-mark-block-function . mark-defun))) - (c++-mode-defaults - '((c++-font-lock-keywords c++-font-lock-keywords-1 - c++-font-lock-keywords-2 c++-font-lock-keywords-3) - nil nil ((?_ . "w")) beginning-of-defun - (font-lock-syntactic-face-function - . c-font-lock-syntactic-face-function) - (font-lock-mark-block-function . mark-defun))) - (objc-mode-defaults - '((objc-font-lock-keywords objc-font-lock-keywords-1 - objc-font-lock-keywords-2 objc-font-lock-keywords-3) - nil nil ((?_ . "w") (?$ . "w")) nil - (font-lock-syntactic-face-function - . c-font-lock-syntactic-face-function) - (font-lock-mark-block-function . mark-defun))) - (java-mode-defaults - '((java-font-lock-keywords java-font-lock-keywords-1 - java-font-lock-keywords-2 java-font-lock-keywords-3) - nil nil ((?_ . "w") (?$ . "w")) nil - (font-lock-syntactic-face-function - . java-font-lock-syntactic-face-function) - (font-lock-mark-block-function . mark-defun)))) - (list - (cons 'c-mode c-mode-defaults) - (cons 'c++-mode c++-mode-defaults) - (cons 'objc-mode objc-mode-defaults) - (cons 'java-mode java-mode-defaults))) +(defvar font-lock-defaults-alist nil "Alist of fall-back Font Lock defaults for major modes. -This variable should not be used any more. -Set the buffer-local `font-lock-keywords' in the major mode instead. - Each item should be a list of the form: (MAJOR-MODE . FONT-LOCK-DEFAULTS) @@ -127,37 +84,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-category-alist nil - "An alist of (CATEGORY-SYMBOL . FACE-PROP) controlled by Font Lock. -This variable is intended to be used by special modes which construct -buffer text for display to the user (i.e. buffer-menu, occur), but -wish to have fontification turned on and off by Font Lock. If this -variable is non-nil, then calling `font-lock-mode' will simply toggle -the symbol property `face' of CATEGORY-SYMBOL.") - -(defvar font-lock-symbol-category-alist nil - "An alist of (SYMBOL . CATEGORY-SYMBOL) to help maintain categories. -This variable is not directly used by font-lock; instead it is -intended to be used by modes which use `font-lock-category-alist'. -Normally, you want category symbols to be uninterned, so that their -properties can be local to a buffer. This variable helps you maintain -a mapping between normal category names (i.e. interned symbols) and -their local uninterned versions.") - (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-default-function) (define-minor-mode font-lock-mode "Toggle Font Lock mode. @@ -223,57 +153,63 @@ your own function which is called when `font-lock-mode' is toggled via ;; 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) - (dolist (elt font-lock-category-alist) - (put (car elt) 'face (cdr elt))) - (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))))))) + (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. + (let ((elt (assq 'face char-property-alias-alist))) + (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)))) ;; Turn off Font Lock mode. - (unless font-lock-mode - (dolist (elt font-lock-category-alist) - (put (car elt) 'face nil)) - (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)))) - + (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)) + (let ((elt (assq 'face 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)))))) + + ;; 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) - ;; Detect if this is a simple mode, which doesn't use any - ;; syntactic fontification functions. - (when (or font-lock-defaults - (assq major-mode font-lock-defaults-alist)) - (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 @@ -294,7 +230,7 @@ Sets various variables using `font-lock-defaults' (or, if nil, using ;; 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 @@ -346,13 +282,8 @@ means that Font Lock mode is turned on for buffers in C and C++ modes only." :group 'font-lock) (defun turn-on-font-lock-if-enabled () - (when (and (or font-lock-defaults - font-lock-category-alist - (assq major-mode font-lock-defaults-alist)) - (or (eq font-lock-global-modes t) - (if (eq (car-safe font-lock-global-modes) 'not) - (not (memq major-mode (cdr font-lock-global-modes))) - (memq major-mode font-lock-global-modes)))) + (unless (and (eq (car-safe font-lock-global-modes) 'not) + (memq major-mode (cdr font-lock-global-modes))) (let (inhibit-quit) (turn-on-font-lock)))) @@ -366,3 +297,4 @@ means that Font Lock mode is turned on for buffers in C and C++ modes only." ;;; font-core.el ends here +;;; arch-tag: f8c286e1-02f7-41d9-b89b-1b67780aed71