(font-lock-keywords-alist, font-lock-removed-keywords-alist): Clarify docstrings.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3fb3ff84e5ec322fe1806008c16a734246bceac9..8a42652db07d20594890563e8e8b926b2456de3b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-10  Lute Kamstra  <lute@gnu.org>
+
+       * font-lock.el (font-lock-keywords-alist)
+       (font-lock-removed-keywords-alist): Clarify docstrings.
+
 2005-05-10  Nick Roberts  <nickrob@snap.net.nz>
 
        * 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  <lute@gnu.org>
+2005-05-01  Stefan Monnier <monnier@iro.umontreal.ca>
+
+       * international/latexenc.el (latexenc-find-file-coding-system):
+       Fix regular expressions.
+
+2005-05-01  David Kastrup <dak@gnu.org>
 
        * international/latexenc.el (latexenc-find-file-coding-system):
-       Fix regular expressions.  Suggested by David Kastrup <dak@gnu.org>
-       and Stefan Monnier <monnier@iro.umontreal.ca>.
+       Fix regular expressions.
 
 2005-05-01  Nick Roberts  <nickrob@snap.net.nz>
 

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 2121bde8e494847610fecd14da198454ba080ab8..d2ffdf44bdb7cf36c82e4f5bbc203ad8274c8808 100644 (file)
--- 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'.")