From 0003d2e3191b1eb64ac347323f52c8649cbe0100 Mon Sep 17 00:00:00 2001 From: Lute Kamstra Date: Tue, 10 May 2005 09:02:40 +0000 Subject: [PATCH] (font-lock-keywords-alist, font-lock-removed-keywords-alist): Clarify docstrings. --- lisp/ChangeLog | 15 ++++++++++++--- lisp/font-lock.el | 19 +++++++++++++++++-- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3fb3ff84e5e..8a42652db07 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-05-10 Lute Kamstra + + * font-lock.el (font-lock-keywords-alist) + (font-lock-removed-keywords-alist): Clarify docstrings. + 2005-05-10 Nick Roberts * progmodes/gdb-ui.el (gdb-macro-info): New variable. @@ -412,11 +417,15 @@ with mode-require-final-newline. (mode-require-final-newline): Doc fix. -2005-05-01 Lute Kamstra +2005-05-01 Stefan Monnier + + * international/latexenc.el (latexenc-find-file-coding-system): + Fix regular expressions. + +2005-05-01 David Kastrup * international/latexenc.el (latexenc-find-file-coding-system): - Fix regular expressions. Suggested by David Kastrup - and Stefan Monnier . + Fix regular expressions. 2005-05-01 Nick Roberts diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 2121bde8e49..d2ffdf44bdb 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -470,12 +470,27 @@ user-level keywords, but normally their values have been optimized.") (defvar font-lock-keywords-alist nil - "Alist of `font-lock-keywords' local to a `major-mode'. + "Alist of additional `font-lock-keywords' elements for major modes. + +Each element has the form (MODE KEYWORDS . APPEND). +`font-lock-set-defaults' adds the elements in the list KEYWORDS to +`font-lock-keywords' when Font Lock is turned on in major mode MODE. + +If APPEND is nil, KEYWORDS are added at the beginning of +`font-lock-keywords'. If it is `set', they are used to replace the +value of `font-lock-keywords'. If APPEND is any other non-nil value, +they are added at the end. + This is normally set via `font-lock-add-keywords' and `font-lock-remove-keywords'.") (defvar font-lock-removed-keywords-alist nil - "Alist of `font-lock-keywords' removed from `major-mode'. + "Alist of `font-lock-keywords' elements to be removed for major modes. + +Each element has the form (MODE . KEYWORDS). `font-lock-set-defaults' +removes the elements in the list KEYWORDS from `font-lock-keywords' +when Font Lock is turned on in major mode MODE. + This is normally set via `font-lock-add-keywords' and `font-lock-remove-keywords'.") -- 2.39.2