aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLute Kamstra2005-04-08 12:51:07 +0000
committerLute Kamstra2005-04-08 12:51:07 +0000
commit67b4790bd3382424c3276ca5686e2cd45c3f5807 (patch)
treebe654844e02e4503a30bb9dd0563fd86c8002a94
parent9741224e5cc7fc00cd224f78455f9c9d3677e76f (diff)
downloademacs-67b4790bd3382424c3276ca5686e2cd45c3f5807.tar.gz
emacs-67b4790bd3382424c3276ca5686e2cd45c3f5807.zip
(font-lock-keywords): Docstring fixes.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/font-lock.el10
2 files changed, 9 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 49e5e50851f..4bdc5caa94e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12005-04-08 Lute Kamstra <lute@gnu.org>
2
3 * font-lock.el (font-lock-keywords): Docstring fixes.
4
12005-04-08 Kenichi Handa <handa@m17n.org> 52005-04-08 Kenichi Handa <handa@m17n.org>
2 6
3 * ps-mule.el (ps-mule-show-warning): If the number of unprintable 7 * ps-mule.el (ps-mule-show-warning): If the number of unprintable
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 6b86d3274ed..c047bed0677 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -383,14 +383,14 @@ word \"bar\" following the word \"anchor\" then MATCH-ANCHORED may be required.
383 383
384MATCH-HIGHLIGHT should be of the form: 384MATCH-HIGHLIGHT should be of the form:
385 385
386 (MATCH FACENAME OVERRIDE LAXMATCH) 386 (MATCH FACENAME [[OVERRIDE [LAXMATCH]])
387 387
388MATCH is the subexpression of MATCHER to be highlighted. FACENAME is an 388MATCH is the subexpression of MATCHER to be highlighted. FACENAME is an
389expression whose value is the face name to use. Face default attributes 389expression whose value is the face name to use. Face default attributes
390can be modified via \\[customize]. Instead of a face, FACENAME can 390can be modified via \\[customize]. Instead of a face, FACENAME can
391evaluate to a property list of the form (face VAL1 PROP2 VAL2 PROP3 VAL3 ...) 391evaluate to a property list of the form (face FACE PROP1 VAL1 PROP2 VAL2 ...)
392in which case all the listed text-properties will be set rather than 392in which case all the listed text-properties will be set rather than
393just `face'. In such a case, you will most likely want to put those 393just FACE. In such a case, you will most likely want to put those
394properties in `font-lock-extra-managed-props' or to override 394properties in `font-lock-extra-managed-props' or to override
395`font-lock-unfontify-region-function'. 395`font-lock-unfontify-region-function'.
396 396
@@ -426,7 +426,7 @@ the last, instance MATCH-ANCHORED's MATCHER is used. Therefore they can be
426used to initialise before, and cleanup after, MATCHER is used. Typically, 426used to initialise before, and cleanup after, MATCHER is used. Typically,
427PRE-MATCH-FORM is used to move to some position relative to the original 427PRE-MATCH-FORM is used to move to some position relative to the original
428MATCHER, before starting with MATCH-ANCHORED's MATCHER. POST-MATCH-FORM might 428MATCHER, before starting with MATCH-ANCHORED's MATCHER. POST-MATCH-FORM might
429be used to move, before resuming with MATCH-ANCHORED's parent's MATCHER. 429be used to move back, before resuming with MATCH-ANCHORED's parent's MATCHER.
430 430
431For example, an element of the form highlights (if not already highlighted): 431For example, an element of the form highlights (if not already highlighted):
432 432
@@ -436,7 +436,7 @@ For example, an element of the form highlights (if not already highlighted):
436 discrete occurrences of \"item\" (on the same line) in the value of `item-face'. 436 discrete occurrences of \"item\" (on the same line) in the value of `item-face'.
437 (Here PRE-MATCH-FORM and POST-MATCH-FORM are nil. Therefore \"item\" is 437 (Here PRE-MATCH-FORM and POST-MATCH-FORM are nil. Therefore \"item\" is
438 initially searched for starting from the end of the match of \"anchor\", and 438 initially searched for starting from the end of the match of \"anchor\", and
439 searching for subsequent instance of \"anchor\" resumes from where searching 439 searching for subsequent instances of \"anchor\" resumes from where searching
440 for \"item\" concluded.) 440 for \"item\" concluded.)
441 441
442The above-mentioned exception is as follows. The limit of the MATCHER search 442The above-mentioned exception is as follows. The limit of the MATCHER search