aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-12-13 04:12:08 +0000
committerGlenn Morris2008-12-13 04:12:08 +0000
commit5ff602defb70acc4565a59e2a7d27427be92049e (patch)
treec0714cce0941ecdc06b7ebf2cbe5f164acc3c2df
parentcaef3ed2d01a9e40f370bdb22e46b0d1755f35b7 (diff)
downloademacs-5ff602defb70acc4565a59e2a7d27427be92049e.tar.gz
emacs-5ff602defb70acc4565a59e2a7d27427be92049e.zip
(font-lock-defaults): Doc fix: mention levels; refer to elisp manual.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/font-core.el13
2 files changed, 15 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2a2f62c3c63..c1f23d1740c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12008-12-13 Glenn Morris <rgm@gnu.org>
2
3 * font-core.el (font-lock-defaults): Doc fix: mention levels;
4 refer to elisp manual.
5
12008-12-12 Martin Rudalics <rudalics@gmx.at> 62008-12-12 Martin Rudalics <rudalics@gmx.at>
2 7
3 * window.el (fit-window-to-buffer): Return non-nil when height 8 * window.el (fit-window-to-buffer): Return non-nil when height
diff --git a/lisp/font-core.el b/lisp/font-core.el
index b50509f04df..a45b298c606 100644
--- a/lisp/font-core.el
+++ b/lisp/font-core.el
@@ -32,10 +32,15 @@ Defaults should be of the form:
32 32
33 (KEYWORDS [KEYWORDS-ONLY [CASE-FOLD [SYNTAX-ALIST [SYNTAX-BEGIN ...]]]]) 33 (KEYWORDS [KEYWORDS-ONLY [CASE-FOLD [SYNTAX-ALIST [SYNTAX-BEGIN ...]]]])
34 34
35KEYWORDS may be a symbol (a variable or function whose value is the keywords to 35KEYWORDS may be a symbol (a variable or function whose value is the keywords
36use for fontification) or a list of symbols. If KEYWORDS-ONLY is non-nil, 36to use for fontification) or a list of symbols (specifying different levels
37syntactic fontification (strings and comments) is not performed. 37of fontification).
38
39If KEYWORDS-ONLY is non-nil, syntactic fontification (strings and
40comments) is not performed.
41
38If CASE-FOLD is non-nil, the case of the keywords is ignored when fontifying. 42If CASE-FOLD is non-nil, the case of the keywords is ignored when fontifying.
43
39If SYNTAX-ALIST is non-nil, it should be a list of cons pairs of the form 44If SYNTAX-ALIST is non-nil, it should be a list of cons pairs of the form
40\(CHAR-OR-STRING . STRING) used to set the local Font Lock syntax table, for 45\(CHAR-OR-STRING . STRING) used to set the local Font Lock syntax table, for
41keyword and syntactic fontification (see `modify-syntax-entry'). 46keyword and syntactic fontification (see `modify-syntax-entry').
@@ -48,6 +53,8 @@ be outside a syntactic block), or `beginning-of-defun' for programming modes or
48known to move outside a syntactic block). If nil, the beginning of the buffer 53known to move outside a syntactic block). If nil, the beginning of the buffer
49is used as a position outside of a syntactic block, in the worst case. 54is used as a position outside of a syntactic block, in the worst case.
50 55
56\(See also Info node `(elisp)Font Lock Basics'.)
57
51These item elements are used by Font Lock mode to set the variables 58These item elements are used by Font Lock mode to set the variables
52`font-lock-keywords', `font-lock-keywords-only', 59`font-lock-keywords', `font-lock-keywords-only',
53`font-lock-keywords-case-fold-search', `font-lock-syntax-table' and 60`font-lock-keywords-case-fold-search', `font-lock-syntax-table' and