Mercurial > emacs
comparison lisp/font-lock.el @ 83286:9deb6323655c
Merged from miles@gnu.org--gnu-2005 (patch 59, 240-245)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-240
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-241
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-242
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-243
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-244
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-245
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-59
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-326
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Mon, 11 Apr 2005 12:40:15 +0000 |
parents | 360860a0006f 31aa9a390538 |
children | ad07ff6e4555 |
comparison
equal
deleted
inserted
replaced
83285:865f9b91fdbe | 83286:9deb6323655c |
---|---|
381 instance of another item (the anchor), for example each instance of the | 381 instance of another item (the anchor), for example each instance of the |
382 word \"bar\" following the word \"anchor\" then MATCH-ANCHORED may be required. | 382 word \"bar\" following the word \"anchor\" then MATCH-ANCHORED may be required. |
383 | 383 |
384 MATCH-HIGHLIGHT should be of the form: | 384 MATCH-HIGHLIGHT should be of the form: |
385 | 385 |
386 (MATCH FACENAME OVERRIDE LAXMATCH) | 386 (MATCH FACENAME [[OVERRIDE [LAXMATCH]]) |
387 | 387 |
388 MATCH is the subexpression of MATCHER to be highlighted. FACENAME is an | 388 MATCH is the subexpression of MATCHER to be highlighted. FACENAME is an |
389 expression whose value is the face name to use. Face default attributes | 389 expression whose value is the face name to use. Face default attributes |
390 can be modified via \\[customize]. Instead of a face, FACENAME can | 390 can be modified via \\[customize]. Instead of a face, FACENAME can |
391 evaluate to a property list of the form (face VAL1 PROP2 VAL2 PROP3 VAL3 ...) | 391 evaluate to a property list of the form (face FACE PROP1 VAL1 PROP2 VAL2 ...) |
392 in which case all the listed text-properties will be set rather than | 392 in which case all the listed text-properties will be set rather than |
393 just `face'. In such a case, you will most likely want to put those | 393 just FACE. In such a case, you will most likely want to put those |
394 properties in `font-lock-extra-managed-props' or to override | 394 properties in `font-lock-extra-managed-props' or to override |
395 `font-lock-unfontify-region-function'. | 395 `font-lock-unfontify-region-function'. |
396 | 396 |
397 OVERRIDE and LAXMATCH are flags. If OVERRIDE is t, existing fontification can | 397 OVERRIDE and LAXMATCH are flags. If OVERRIDE is t, existing fontification can |
398 be overwritten. If `keep', only parts not already fontified are highlighted. | 398 be overwritten. If `keep', only parts not already fontified are highlighted. |
424 PRE-MATCH-FORM and POST-MATCH-FORM are evaluated before the first, and after | 424 PRE-MATCH-FORM and POST-MATCH-FORM are evaluated before the first, and after |
425 the last, instance MATCH-ANCHORED's MATCHER is used. Therefore they can be | 425 the last, instance MATCH-ANCHORED's MATCHER is used. Therefore they can be |
426 used to initialise before, and cleanup after, MATCHER is used. Typically, | 426 used to initialise before, and cleanup after, MATCHER is used. Typically, |
427 PRE-MATCH-FORM is used to move to some position relative to the original | 427 PRE-MATCH-FORM is used to move to some position relative to the original |
428 MATCHER, before starting with MATCH-ANCHORED's MATCHER. POST-MATCH-FORM might | 428 MATCHER, before starting with MATCH-ANCHORED's MATCHER. POST-MATCH-FORM might |
429 be used to move, before resuming with MATCH-ANCHORED's parent's MATCHER. | 429 be used to move back, before resuming with MATCH-ANCHORED's parent's MATCHER. |
430 | 430 |
431 For example, an element of the form highlights (if not already highlighted): | 431 For example, an element of the form highlights (if not already highlighted): |
432 | 432 |
433 (\"\\\\\\=<anchor\\\\\\=>\" (0 anchor-face) (\"\\\\\\=<item\\\\\\=>\" nil nil (0 item-face))) | 433 (\"\\\\\\=<anchor\\\\\\=>\" (0 anchor-face) (\"\\\\\\=<item\\\\\\=>\" nil nil (0 item-face))) |
434 | 434 |
435 discrete occurrences of \"anchor\" in the value of `anchor-face', and subsequent | 435 discrete occurrences of \"anchor\" in the value of `anchor-face', and subsequent |
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 |
442 The above-mentioned exception is as follows. The limit of the MATCHER search | 442 The above-mentioned exception is as follows. The limit of the MATCHER search |
443 defaults to the end of the line after PRE-MATCH-FORM is evaluated. | 443 defaults to the end of the line after PRE-MATCH-FORM is evaluated. |
444 However, if PRE-MATCH-FORM returns a position greater than the position after | 444 However, if PRE-MATCH-FORM returns a position greater than the position after |
1655 | 1655 |
1656 (defface font-lock-keyword-face | 1656 (defface font-lock-keyword-face |
1657 '((((class grayscale) (background light)) (:foreground "LightGray" :weight bold)) | 1657 '((((class grayscale) (background light)) (:foreground "LightGray" :weight bold)) |
1658 (((class grayscale) (background dark)) (:foreground "DimGray" :weight bold)) | 1658 (((class grayscale) (background dark)) (:foreground "DimGray" :weight bold)) |
1659 (((class color) (min-colors 88) (background light)) (:foreground "Purple")) | 1659 (((class color) (min-colors 88) (background light)) (:foreground "Purple")) |
1660 (((class color) (min-colors 88) (background dark)) (:foreground "Cyan")) | 1660 (((class color) (min-colors 88) (background dark)) (:foreground "Cyan1")) |
1661 (((class color) (min-colors 16) (background light)) (:foreground "Purple")) | 1661 (((class color) (min-colors 16) (background light)) (:foreground "Purple")) |
1662 (((class color) (min-colors 16) (background dark)) (:foreground "Cyan")) | 1662 (((class color) (min-colors 16) (background dark)) (:foreground "Cyan")) |
1663 (((class color) (min-colors 8)) (:foreground "cyan" :weight bold)) | 1663 (((class color) (min-colors 8)) (:foreground "cyan" :weight bold)) |
1664 (t (:weight bold))) | 1664 (t (:weight bold))) |
1665 "Font Lock mode face used to highlight keywords." | 1665 "Font Lock mode face used to highlight keywords." |
1676 (t (:weight bold))) | 1676 (t (:weight bold))) |
1677 "Font Lock mode face used to highlight builtins." | 1677 "Font Lock mode face used to highlight builtins." |
1678 :group 'font-lock-highlighting-faces) | 1678 :group 'font-lock-highlighting-faces) |
1679 | 1679 |
1680 (defface font-lock-function-name-face | 1680 (defface font-lock-function-name-face |
1681 '((((class color) (min-colors 88) (background light)) (:foreground "Blue")) | 1681 '((((class color) (min-colors 88) (background light)) (:foreground "Blue1")) |
1682 (((class color) (min-colors 88) (background dark)) (:foreground "LightSkyBlue")) | 1682 (((class color) (min-colors 88) (background dark)) (:foreground "LightSkyBlue")) |
1683 (((class color) (min-colors 16) (background light)) (:foreground "Blue")) | 1683 (((class color) (min-colors 16) (background light)) (:foreground "Blue")) |
1684 (((class color) (min-colors 16) (background dark)) (:foreground "LightSkyBlue")) | 1684 (((class color) (min-colors 16) (background dark)) (:foreground "LightSkyBlue")) |
1685 (((class color) (min-colors 8)) (:foreground "blue" :weight bold)) | 1685 (((class color) (min-colors 8)) (:foreground "blue" :weight bold)) |
1686 (t (:inverse-video t :weight bold))) | 1686 (t (:inverse-video t :weight bold))) |
1726 (t (:weight bold :underline t))) | 1726 (t (:weight bold :underline t))) |
1727 "Font Lock mode face used to highlight constants and labels." | 1727 "Font Lock mode face used to highlight constants and labels." |
1728 :group 'font-lock-highlighting-faces) | 1728 :group 'font-lock-highlighting-faces) |
1729 | 1729 |
1730 (defface font-lock-warning-face | 1730 (defface font-lock-warning-face |
1731 '((((class color) (min-colors 88) (background light)) (:foreground "Red" :weight bold)) | 1731 '((((class color) (min-colors 88) (background light)) (:foreground "Red1" :weight bold)) |
1732 (((class color) (min-colors 88) (background dark)) (:foreground "Pink" :weight bold)) | 1732 (((class color) (min-colors 88) (background dark)) (:foreground "Pink" :weight bold)) |
1733 (((class color) (min-colors 16) (background light)) (:foreground "Red" :weight bold)) | 1733 (((class color) (min-colors 16) (background light)) (:foreground "Red" :weight bold)) |
1734 (((class color) (min-colors 16) (background dark)) (:foreground "Pink" :weight bold)) | 1734 (((class color) (min-colors 16) (background dark)) (:foreground "Pink" :weight bold)) |
1735 (((class color) (min-colors 8)) (:foreground "red")) | 1735 (((class color) (min-colors 8)) (:foreground "red")) |
1736 (t (:inverse-video t :weight bold))) | 1736 (t (:inverse-video t :weight bold))) |