Mercurial > emacs
annotate lisp/font-lock.el @ 44613:a24a2c25aea5
*** empty log message ***
author | Francesco Potortì <pot@gnu.org> |
---|---|
date | Tue, 16 Apr 2002 00:02:38 +0000 |
parents | fc8fbdc5ca4c |
children | fdd01fca9b1d |
rev | line source |
---|---|
13440
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1 ;;; font-lock.el --- Electric font lock mode |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
2 |
35419
e233da20040a
(font-lock-multiline): Default to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
35195
diff
changeset
|
3 ;; Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 1999, 2000, 2001 |
27414
d30c57a6b35c
(turn-on-font-lock): Don't depend on window-system &c.
Dave Love <fx@gnu.org>
parents:
26920
diff
changeset
|
4 ;; Free Software Foundation, Inc. |
4053 | 5 |
28874
f2f374d8b0bf
Update copyright. Remove Simon Marshall's email
Gerd Moellmann <gerd@gnu.org>
parents:
28192
diff
changeset
|
6 ;; Author: jwz, then rms, then sm |
4053 | 7 ;; Maintainer: FSF |
8 ;; Keywords: languages, faces | |
9 | |
10 ;; This file is part of GNU Emacs. | |
11 | |
12 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
13 ;; it under the terms of the GNU General Public License as published by | |
14 ;; the Free Software Foundation; either version 2, or (at your option) | |
15 ;; any later version. | |
16 | |
17 ;; GNU Emacs is distributed in the hope that it will be useful, | |
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
20 ;; GNU General Public License for more details. | |
21 | |
22 ;; You should have received a copy of the GNU General Public License | |
14169 | 23 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
24 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
25 ;; Boston, MA 02111-1307, USA. | |
4053 | 26 |
27 ;;; Commentary: | |
28 | |
9487
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
29 ;; Font Lock mode is a minor mode that causes your comments to be displayed in |
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
30 ;; one face, strings in another, reserved words in another, and so on. |
4053 | 31 ;; |
32 ;; Comments will be displayed in `font-lock-comment-face'. | |
33 ;; Strings will be displayed in `font-lock-string-face'. | |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
34 ;; Regexps are used to display selected patterns in other faces. |
4053 | 35 ;; |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
36 ;; To make the text you type be fontified, use M-x font-lock-mode RET. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
37 ;; When this minor mode is on, the faces of the current line are updated with |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
38 ;; every insertion or deletion. |
4053 | 39 ;; |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
40 ;; To turn Font Lock mode on automatically, add this to your ~/.emacs file: |
4053 | 41 ;; |
9487
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
42 ;; (add-hook 'emacs-lisp-mode-hook 'turn-on-font-lock) |
4053 | 43 ;; |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
44 ;; Or if you want to turn Font Lock mode on in many modes: |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
45 ;; |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
46 ;; (global-font-lock-mode t) |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
47 ;; |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
48 ;; Fontification for a particular mode may be available in a number of levels |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
49 ;; of decoration. The higher the level, the more decoration, but the more time |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
50 ;; it takes to fontify. See the variable `font-lock-maximum-decoration', and |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
51 ;; also the variable `font-lock-maximum-size'. Support modes for Font Lock |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
52 ;; mode can be used to speed up Font Lock mode. See `font-lock-support-mode'. |
15653
1653d3208c05
1. Use new font-lock-comment-start-regexp for matching a comment---it can be faster than comment-start-skip.
Simon Marshall <simon@gnu.org>
parents:
15500
diff
changeset
|
53 |
17055
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
54 ;;; How Font Lock mode fontifies: |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
55 |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
56 ;; When Font Lock mode is turned on in a buffer, it (a) fontifies the entire |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
57 ;; buffer and (b) installs one of its fontification functions on one of the |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
58 ;; hook variables that are run by Emacs after every buffer change (i.e., an |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
59 ;; insertion or deletion). Fontification means the replacement of `face' text |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
60 ;; properties in a given region; Emacs displays text with these `face' text |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
61 ;; properties appropriately. |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
62 ;; |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
63 ;; Fontification normally involves syntactic (i.e., strings and comments) and |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
64 ;; regexp (i.e., keywords and everything else) passes. There are actually |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
65 ;; three passes; (a) the syntactic keyword pass, (b) the syntactic pass and (c) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
66 ;; the keyword pass. Confused? |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
67 ;; |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
68 ;; The syntactic keyword pass places `syntax-table' text properties in the |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
69 ;; buffer according to the variable `font-lock-syntactic-keywords'. It is |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
70 ;; necessary because Emacs' syntax table is not powerful enough to describe all |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
71 ;; the different syntactic constructs required by the sort of people who decide |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
72 ;; that a single quote can be syntactic or not depending on the time of day. |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
73 ;; (What sort of person could decide to overload the meaning of a quote?) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
74 ;; Obviously the syntactic keyword pass must occur before the syntactic pass. |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
75 ;; |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
76 ;; The syntactic pass places `face' text properties in the buffer according to |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
77 ;; syntactic context, i.e., according to the buffer's syntax table and buffer |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
78 ;; text's `syntax-table' text properties. It involves using a syntax parsing |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
79 ;; function to determine the context of different parts of a region of text. A |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
80 ;; syntax parsing function is necessary because generally strings and/or |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
81 ;; comments can span lines, and so the context of a given region is not |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
82 ;; necessarily apparent from the content of that region. Because the keyword |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
83 ;; pass only works within a given region, it is not generally appropriate for |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
84 ;; syntactic fontification. This is the first fontification pass that makes |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
85 ;; changes visible to the user; it fontifies strings and comments. |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
86 ;; |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
87 ;; The keyword pass places `face' text properties in the buffer according to |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
88 ;; the variable `font-lock-keywords'. It involves searching for given regexps |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
89 ;; (or calling given search functions) within the given region. This is the |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
90 ;; second fontification pass that makes changes visible to the user; it |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
91 ;; fontifies language reserved words, etc. |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
92 ;; |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
93 ;; Oh, and the answer is, "Yes, obviously just about everything should be done |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
94 ;; in a single syntactic pass, but the only syntactic parser available |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
95 ;; understands only strings and comments." Perhaps one day someone will write |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
96 ;; some syntactic parsers for common languages and a son-of-font-lock.el could |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
97 ;; use them rather then relying so heavily on the keyword (regexp) pass. |
17055
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
98 |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
99 ;;; How Font Lock mode supports modes or is supported by modes: |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
100 |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
101 ;; Modes that support Font Lock mode do so by defining one or more variables |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
102 ;; whose values specify the fontification. Font Lock mode knows of these |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
103 ;; variable names from (a) the buffer local variable `font-lock-defaults', if |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
104 ;; non-nil, or (b) the global variable `font-lock-defaults-alist', if the major |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
105 ;; mode has an entry. (Font Lock mode is set up via (a) where a mode's |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
106 ;; patterns are distributed with the mode's package library, and (b) where a |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
107 ;; mode's patterns are distributed with font-lock.el itself. An example of (a) |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
108 ;; is Pascal mode, an example of (b) is Lisp mode. Normally, the mechanism is |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
109 ;; (a); (b) is used where it is not clear which package library should contain |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
110 ;; the pattern definitions.) Font Lock mode chooses which variable to use for |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
111 ;; fontification based on `font-lock-maximum-decoration'. |
17055
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
112 ;; |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
113 ;; Font Lock mode fontification behaviour can be modified in a number of ways. |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
114 ;; See the below comments and the comments distributed throughout this file. |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
115 |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
116 ;;; Constructing patterns: |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
117 |
15653
1653d3208c05
1. Use new font-lock-comment-start-regexp for matching a comment---it can be faster than comment-start-skip.
Simon Marshall <simon@gnu.org>
parents:
15500
diff
changeset
|
118 ;; See the documentation for the variable `font-lock-keywords'. |
1653d3208c05
1. Use new font-lock-comment-start-regexp for matching a comment---it can be faster than comment-start-skip.
Simon Marshall <simon@gnu.org>
parents:
15500
diff
changeset
|
119 ;; |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
120 ;; Efficient regexps for use as MATCHERs for `font-lock-keywords' and |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
121 ;; `font-lock-syntactic-keywords' can be generated via the function |
28087
9ca294cf76c7
(font-lock-keywords): Fix the doc now that regexp-opt-depth is unnecessary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28069
diff
changeset
|
122 ;; `regexp-opt'. |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
123 |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
124 ;;; Adding patterns for modes that already support Font Lock: |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
125 |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
126 ;; Though Font Lock highlighting patterns already exist for many modes, it's |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
127 ;; likely there's something that you want fontified that currently isn't, even |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
128 ;; at the maximum fontification level. You can add highlighting patterns via |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
129 ;; `font-lock-add-keywords'. For example, say in some C |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
130 ;; header file you #define the token `and' to expand to `&&', etc., to make |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
131 ;; your C code almost readable. In your ~/.emacs there could be: |
15653
1653d3208c05
1. Use new font-lock-comment-start-regexp for matching a comment---it can be faster than comment-start-skip.
Simon Marshall <simon@gnu.org>
parents:
15500
diff
changeset
|
132 ;; |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
133 ;; (font-lock-add-keywords 'c-mode '("\\<\\(and\\|or\\|not\\)\\>")) |
15653
1653d3208c05
1. Use new font-lock-comment-start-regexp for matching a comment---it can be faster than comment-start-skip.
Simon Marshall <simon@gnu.org>
parents:
15500
diff
changeset
|
134 ;; |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
135 ;; Some modes provide specific ways to modify patterns based on the values of |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
136 ;; other variables. For example, additional C types can be specified via the |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
137 ;; variable `c-font-lock-extra-types'. |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
138 |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
139 ;;; Adding patterns for modes that do not support Font Lock: |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
140 |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
141 ;; Not all modes support Font Lock mode. If you (as a user of the mode) add |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
142 ;; patterns for a new mode, you must define in your ~/.emacs a variable or |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
143 ;; variables that specify regexp fontification. Then, you should indicate to |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
144 ;; Font Lock mode, via the mode hook setting `font-lock-defaults', exactly what |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
145 ;; support is required. For example, say Foo mode should have the following |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
146 ;; regexps fontified case-sensitively, and comments and strings should not be |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
147 ;; fontified automagically. In your ~/.emacs there could be: |
15653
1653d3208c05
1. Use new font-lock-comment-start-regexp for matching a comment---it can be faster than comment-start-skip.
Simon Marshall <simon@gnu.org>
parents:
15500
diff
changeset
|
148 ;; |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
149 ;; (defvar foo-font-lock-keywords |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
150 ;; '(("\\<\\(one\\|two\\|three\\)\\>" . font-lock-keyword-face) |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
151 ;; ("\\<\\(four\\|five\\|six\\)\\>" . font-lock-type-face)) |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
152 ;; "Default expressions to highlight in Foo mode.") |
9487
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
153 ;; |
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
154 ;; (add-hook 'foo-mode-hook |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
155 ;; (function (lambda () |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
156 ;; (make-local-variable 'font-lock-defaults) |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
157 ;; (setq font-lock-defaults '(foo-font-lock-keywords t))))) |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
158 |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
159 ;;; Adding Font Lock support for modes: |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
160 |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
161 ;; Of course, it would be better that the mode already supports Font Lock mode. |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
162 ;; The package author would do something similar to above. The mode must |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
163 ;; define at the top-level a variable or variables that specify regexp |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
164 ;; fontification. Then, the mode command should indicate to Font Lock mode, |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
165 ;; via `font-lock-defaults', exactly what support is required. For example, |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
166 ;; say Bar mode should have the following regexps fontified case-insensitively, |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
167 ;; and comments and strings should be fontified automagically. In bar.el there |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
168 ;; could be: |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
169 ;; |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
170 ;; (defvar bar-font-lock-keywords |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
171 ;; '(("\\<\\(uno\\|due\\|tre\\)\\>" . font-lock-keyword-face) |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
172 ;; ("\\<\\(quattro\\|cinque\\|sei\\)\\>" . font-lock-type-face)) |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
173 ;; "Default expressions to highlight in Bar mode.") |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
174 ;; |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
175 ;; and within `bar-mode' there could be: |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
176 ;; |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
177 ;; (make-local-variable 'font-lock-defaults) |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
178 ;; (setq font-lock-defaults '(bar-font-lock-keywords nil t)) |
15653
1653d3208c05
1. Use new font-lock-comment-start-regexp for matching a comment---it can be faster than comment-start-skip.
Simon Marshall <simon@gnu.org>
parents:
15500
diff
changeset
|
179 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
180 ;; What is fontification for? You might say, "It's to make my code look nice." |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
181 ;; I think it should be for adding information in the form of cues. These cues |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
182 ;; should provide you with enough information to both (a) distinguish between |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
183 ;; different items, and (b) identify the item meanings, without having to read |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
184 ;; the items and think about it. Therefore, fontification allows you to think |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
185 ;; less about, say, the structure of code, and more about, say, why the code |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
186 ;; doesn't work. Or maybe it allows you to think less and drift off to sleep. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
187 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
188 ;; So, here are my opinions/advice/guidelines: |
30651
61c2f9fcb8f6
* emacs-lisp/cl-indent.el (toplevel): Indent `defclass',
Sam Steingold <sds@gnu.org>
parents:
29919
diff
changeset
|
189 ;; |
13701
1dab6f0d9239
Don't turn on in any buffer with a leading space in its name.
Simon Marshall <simon@gnu.org>
parents:
13641
diff
changeset
|
190 ;; - Highlight conceptual objects, such as function and variable names, and |
1dab6f0d9239
Don't turn on in any buffer with a leading space in its name.
Simon Marshall <simon@gnu.org>
parents:
13641
diff
changeset
|
191 ;; different objects types differently, i.e., (a) and (b) above, highlight |
1dab6f0d9239
Don't turn on in any buffer with a leading space in its name.
Simon Marshall <simon@gnu.org>
parents:
13641
diff
changeset
|
192 ;; function names differently to variable names. |
1dab6f0d9239
Don't turn on in any buffer with a leading space in its name.
Simon Marshall <simon@gnu.org>
parents:
13641
diff
changeset
|
193 ;; - Keep the faces distinct from each other as far as possible. |
1dab6f0d9239
Don't turn on in any buffer with a leading space in its name.
Simon Marshall <simon@gnu.org>
parents:
13641
diff
changeset
|
194 ;; i.e., (a) above. |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
195 ;; - Use the same face for the same conceptual object, across all modes. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
196 ;; i.e., (b) above, all modes that have items that can be thought of as, say, |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
197 ;; keywords, should be highlighted with the same face, etc. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
198 ;; - Make the face attributes fit the concept as far as possible. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
199 ;; i.e., function names might be a bold colour such as blue, comments might |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
200 ;; be a bright colour such as red, character strings might be brown, because, |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
201 ;; err, strings are brown (that was not the reason, please believe me). |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
202 ;; - Don't use a non-nil OVERRIDE unless you have a good reason. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
203 ;; Only use OVERRIDE for special things that are easy to define, such as the |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
204 ;; way `...' quotes are treated in strings and comments in Emacs Lisp mode. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
205 ;; Don't use it to, say, highlight keywords in commented out code or strings. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
206 ;; - Err, that's it. |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
207 |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
208 ;;; Code: |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
209 |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
210 (require 'syntax) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
211 |
17543
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
212 ;; Define core `font-lock' group. |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
213 (defgroup font-lock nil |
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
214 "Font Lock mode text highlighting package." |
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
215 :link '(custom-manual "(emacs)Font Lock") |
25286
fb00c7bb8642
Add a :link to font-lock defgroup.
Dave Love <fx@gnu.org>
parents:
25124
diff
changeset
|
216 :link '(custom-manual "(elisp)Font Lock Mode") |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
217 :group 'faces) |
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
218 |
17543
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
219 (defgroup font-lock-highlighting-faces nil |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
220 "Faces for highlighting text." |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
221 :prefix "font-lock-" |
17543
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
222 :group 'font-lock) |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
223 |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
224 (defgroup font-lock-extra-types nil |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
225 "Extra mode-specific type names for highlighting declarations." |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
226 :group 'font-lock) |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
227 |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
228 ;; Define support mode groups here to impose `font-lock' group order. |
17543
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
229 (defgroup fast-lock nil |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
230 "Font Lock support mode to cache fontification." |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
231 :link '(custom-manual "(emacs)Support Modes") |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
232 :load 'fast-lock |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
233 :group 'font-lock) |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
234 |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
235 (defgroup lazy-lock nil |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
236 "Font Lock support mode to fontify lazily." |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
237 :link '(custom-manual "(emacs)Support Modes") |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
238 :load 'lazy-lock |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
239 :group 'font-lock) |
25048
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
240 |
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
241 (defgroup jit-lock nil |
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
242 "Font Lock support mode to fontify just-in-time." |
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
243 :link '(custom-manual "(emacs)Support Modes") |
25286
fb00c7bb8642
Add a :link to font-lock defgroup.
Dave Love <fx@gnu.org>
parents:
25124
diff
changeset
|
244 :version "21.1" |
25124
5ae84fc3bc96
(jit-lock): Fix :load, add :version.
Dave Love <fx@gnu.org>
parents:
25049
diff
changeset
|
245 :load 'jit-lock |
25048
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
246 :group 'font-lock) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
247 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
248 ;; User variables. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
249 |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
250 (defcustom font-lock-maximum-size 256000 |
18332
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
251 "*Maximum size of a buffer for buffer fontification. |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
252 Only buffers less than this can be fontified when Font Lock mode is turned on. |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
253 If nil, means size is irrelevant. |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
254 If a list, each element should be a cons pair of the form (MAJOR-MODE . SIZE), |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
255 where MAJOR-MODE is a symbol or t (meaning the default). For example: |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
256 ((c-mode . 256000) (c++-mode . 256000) (rmail-mode . 1048576)) |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
257 means that the maximum size is 250K for buffers in C or C++ modes, one megabyte |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
258 for buffers in Rmail mode, and size is irrelevant otherwise." |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
259 :type '(choice (const :tag "none" nil) |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
260 (integer :tag "size") |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
261 (repeat :menu-tag "mode specific" :tag "mode specific" |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
262 :value ((t . nil)) |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
263 (cons :tag "Instance" |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
264 (radio :tag "Mode" |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
265 (const :tag "all" t) |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
266 (symbol :tag "name")) |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
267 (radio :tag "Size" |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
268 (const :tag "none" nil) |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
269 (integer :tag "size"))))) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
270 :group 'font-lock) |
4053 | 271 |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
272 (defcustom font-lock-maximum-decoration t |
14780
1d10e4a2fb51
Treat font-lock-keywords of (t) the same as nil.
Simon Marshall <simon@gnu.org>
parents:
14778
diff
changeset
|
273 "*Maximum decoration level for fontification. |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
274 If nil, use the default decoration (typically the minimum available). |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
275 If t, use the maximum decoration available. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
276 If a number, use that level of decoration (or if not available the maximum). |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
277 If a list, each element should be a cons pair of the form (MAJOR-MODE . LEVEL), |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
278 where MAJOR-MODE is a symbol or t (meaning the default). For example: |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
279 ((c-mode . t) (c++-mode . 2) (t . 1)) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
280 means use the maximum decoration available for buffers in C mode, level 2 |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
281 decoration for buffers in C++ mode, and level 1 decoration otherwise." |
17507
fd87760f20cd
Cleaned up custom support.
Simon Marshall <simon@gnu.org>
parents:
17495
diff
changeset
|
282 :type '(choice (const :tag "default" nil) |
fd87760f20cd
Cleaned up custom support.
Simon Marshall <simon@gnu.org>
parents:
17495
diff
changeset
|
283 (const :tag "maximum" t) |
fd87760f20cd
Cleaned up custom support.
Simon Marshall <simon@gnu.org>
parents:
17495
diff
changeset
|
284 (integer :tag "level" 1) |
fd87760f20cd
Cleaned up custom support.
Simon Marshall <simon@gnu.org>
parents:
17495
diff
changeset
|
285 (repeat :menu-tag "mode specific" :tag "mode specific" |
fd87760f20cd
Cleaned up custom support.
Simon Marshall <simon@gnu.org>
parents:
17495
diff
changeset
|
286 :value ((t . t)) |
fd87760f20cd
Cleaned up custom support.
Simon Marshall <simon@gnu.org>
parents:
17495
diff
changeset
|
287 (cons :tag "Instance" |
fd87760f20cd
Cleaned up custom support.
Simon Marshall <simon@gnu.org>
parents:
17495
diff
changeset
|
288 (radio :tag "Mode" |
fd87760f20cd
Cleaned up custom support.
Simon Marshall <simon@gnu.org>
parents:
17495
diff
changeset
|
289 (const :tag "all" t) |
fd87760f20cd
Cleaned up custom support.
Simon Marshall <simon@gnu.org>
parents:
17495
diff
changeset
|
290 (symbol :tag "name")) |
fd87760f20cd
Cleaned up custom support.
Simon Marshall <simon@gnu.org>
parents:
17495
diff
changeset
|
291 (radio :tag "Decoration" |
fd87760f20cd
Cleaned up custom support.
Simon Marshall <simon@gnu.org>
parents:
17495
diff
changeset
|
292 (const :tag "default" nil) |
26620 | 293 (const :tag "maximum" t) |
17507
fd87760f20cd
Cleaned up custom support.
Simon Marshall <simon@gnu.org>
parents:
17495
diff
changeset
|
294 (integer :tag "level" 1))))) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
295 :group 'font-lock) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
296 |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
297 (defcustom font-lock-verbose 0 |
18332
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
298 "*If non-nil, means show status messages for buffer fontification. |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
299 If a number, only buffers greater than this size have fontification messages." |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
300 :type '(choice (const :tag "never" nil) |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
301 (other :tag "always" t) |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
302 (integer :tag "size")) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
303 :group 'font-lock) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
304 |
33360
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
305 |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
306 ;; Originally these variable values were face names such as `bold' etc. |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
307 ;; Now we create our own faces, but we keep these variables for compatibility |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
308 ;; and they give users another mechanism for changing face appearance. |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
309 ;; We now allow a FACENAME in `font-lock-keywords' to be any expression that |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
310 ;; returns a face. So the easiest thing is to continue using these variables, |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
311 ;; rather than sometimes evaling FACENAME and sometimes not. sm. |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
312 (defvar font-lock-comment-face 'font-lock-comment-face |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
313 "Face name to use for comments.") |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
314 |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
315 (defvar font-lock-string-face 'font-lock-string-face |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
316 "Face name to use for strings.") |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
317 |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
318 (defvar font-lock-doc-face 'font-lock-doc-face |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
319 "Face name to use for documentation.") |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
320 |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
321 (defvar font-lock-keyword-face 'font-lock-keyword-face |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
322 "Face name to use for keywords.") |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
323 |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
324 (defvar font-lock-builtin-face 'font-lock-builtin-face |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
325 "Face name to use for builtins.") |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
326 |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
327 (defvar font-lock-function-name-face 'font-lock-function-name-face |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
328 "Face name to use for function names.") |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
329 |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
330 (defvar font-lock-variable-name-face 'font-lock-variable-name-face |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
331 "Face name to use for variable names.") |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
332 |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
333 (defvar font-lock-type-face 'font-lock-type-face |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
334 "Face name to use for type and class names.") |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
335 |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
336 (defvar font-lock-constant-face 'font-lock-constant-face |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
337 "Face name to use for constant and label names.") |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
338 |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
339 (defvar font-lock-warning-face 'font-lock-warning-face |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
340 "Face name to use for things that should stand out.") |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
341 |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
342 (defvar font-lock-reference-face 'font-lock-constant-face |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
343 "This variable is obsolete. Use `font-lock-constant-face'.") |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
344 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
345 ;; Fontification variables: |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
346 |
4053 | 347 (defvar font-lock-keywords nil |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
348 "A list of the keywords to highlight. |
20851
26c5d61bc3fd
(font-lock-keywords): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20761
diff
changeset
|
349 Each element should have one of these forms: |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
350 |
11515
0ebfc7701ebf
Make font-lock.el use compiled keywords; added FN as possible matcher.
Simon Marshall <simon@gnu.org>
parents:
11467
diff
changeset
|
351 MATCHER |
0ebfc7701ebf
Make font-lock.el use compiled keywords; added FN as possible matcher.
Simon Marshall <simon@gnu.org>
parents:
11467
diff
changeset
|
352 (MATCHER . MATCH) |
0ebfc7701ebf
Make font-lock.el use compiled keywords; added FN as possible matcher.
Simon Marshall <simon@gnu.org>
parents:
11467
diff
changeset
|
353 (MATCHER . FACENAME) |
0ebfc7701ebf
Make font-lock.el use compiled keywords; added FN as possible matcher.
Simon Marshall <simon@gnu.org>
parents:
11467
diff
changeset
|
354 (MATCHER . HIGHLIGHT) |
0ebfc7701ebf
Make font-lock.el use compiled keywords; added FN as possible matcher.
Simon Marshall <simon@gnu.org>
parents:
11467
diff
changeset
|
355 (MATCHER HIGHLIGHT ...) |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
356 (eval . FORM) |
4053 | 357 |
37693
15212455191b
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37522
diff
changeset
|
358 where MATCHER can be either the regexp to search for, or the function name to |
15212455191b
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37522
diff
changeset
|
359 call to make the search (called with one argument, the limit of the search) and |
15212455191b
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37522
diff
changeset
|
360 return non-nil if it succeeds (and set `match-data' appropriately). |
15212455191b
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37522
diff
changeset
|
361 MATCHER regexps can be generated via the function `regexp-opt'. |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
362 |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
363 FORM is an expression, whose value should be a keyword element, evaluated when |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
364 the keyword is (first) used in a buffer. This feature can be used to provide a |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
365 keyword that can only be generated when Font Lock mode is actually turned on. |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
366 |
37693
15212455191b
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37522
diff
changeset
|
367 HIGHLIGHT should be either MATCH-HIGHLIGHT or MATCH-ANCHORED. |
15212455191b
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37522
diff
changeset
|
368 |
20923
c6e733c90ed8
Keyword doc fixes and keyword tweaks.
Simon Marshall <simon@gnu.org>
parents:
20851
diff
changeset
|
369 For highlighting single items, for example each instance of the word \"foo\", |
c6e733c90ed8
Keyword doc fixes and keyword tweaks.
Simon Marshall <simon@gnu.org>
parents:
20851
diff
changeset
|
370 typically only MATCH-HIGHLIGHT is required. |
13982 | 371 However, if an item or (typically) items are to be highlighted following the |
20923
c6e733c90ed8
Keyword doc fixes and keyword tweaks.
Simon Marshall <simon@gnu.org>
parents:
20851
diff
changeset
|
372 instance of another item (the anchor), for example each instance of the |
c6e733c90ed8
Keyword doc fixes and keyword tweaks.
Simon Marshall <simon@gnu.org>
parents:
20851
diff
changeset
|
373 word \"bar\" following the word \"anchor\" then MATCH-ANCHORED may be required. |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
374 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
375 MATCH-HIGHLIGHT should be of the form: |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
376 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
377 (MATCH FACENAME OVERRIDE LAXMATCH) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
378 |
37693
15212455191b
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37522
diff
changeset
|
379 MATCH is the subexpression of MATCHER to be highlighted. FACENAME is an |
15212455191b
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37522
diff
changeset
|
380 expression whose value is the face name to use. Face default attributes |
15212455191b
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37522
diff
changeset
|
381 can be modified via \\[customize]. Instead of a face, FACENAME can |
15212455191b
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37522
diff
changeset
|
382 evaluate to a property list of the form (face VAL1 PROP2 VAL2 PROP3 VAL3 ...) |
15212455191b
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37522
diff
changeset
|
383 in which case all the listed text-properties will be set rather than |
15212455191b
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37522
diff
changeset
|
384 just `face'. In such a case, you will most likely want to put those |
15212455191b
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37522
diff
changeset
|
385 properties in `font-lock-extra-managed-props' or to override |
15212455191b
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37522
diff
changeset
|
386 `font-lock-unfontify-region-function'. |
4053 | 387 |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
388 OVERRIDE and LAXMATCH are flags. If OVERRIDE is t, existing fontification can |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
389 be overwritten. If `keep', only parts not already fontified are highlighted. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
390 If `prepend' or `append', existing fontification is merged with the new, in |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
391 which the new or existing fontification, respectively, takes precedence. |
13982 | 392 If LAXMATCH is non-nil, no error is signaled if there is no MATCH in MATCHER. |
4053 | 393 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
394 For example, an element of the form highlights (if not already highlighted): |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
395 |
20923
c6e733c90ed8
Keyword doc fixes and keyword tweaks.
Simon Marshall <simon@gnu.org>
parents:
20851
diff
changeset
|
396 \"\\\\\\=<foo\\\\\\=>\" discrete occurrences of \"foo\" in the value of the |
13440
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
397 variable `font-lock-keyword-face'. |
20923
c6e733c90ed8
Keyword doc fixes and keyword tweaks.
Simon Marshall <simon@gnu.org>
parents:
20851
diff
changeset
|
398 (\"fu\\\\(bar\\\\)\" . 1) substring \"bar\" within all occurrences of \"fubar\" in |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
399 the value of `font-lock-keyword-face'. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
400 (\"fubar\" . fubar-face) Occurrences of \"fubar\" in the value of `fubar-face'. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
401 (\"foo\\\\|bar\" 0 foo-bar-face t) |
20923
c6e733c90ed8
Keyword doc fixes and keyword tweaks.
Simon Marshall <simon@gnu.org>
parents:
20851
diff
changeset
|
402 occurrences of either \"foo\" or \"bar\" in the value |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
403 of `foo-bar-face', even if already highlighted. |
20190
bc7fabb22520
Allow any number of ::foos in declarative items.
Simon Marshall <simon@gnu.org>
parents:
19935
diff
changeset
|
404 (fubar-match 1 fubar-face) |
20923
c6e733c90ed8
Keyword doc fixes and keyword tweaks.
Simon Marshall <simon@gnu.org>
parents:
20851
diff
changeset
|
405 the first subexpression within all occurrences of |
20190
bc7fabb22520
Allow any number of ::foos in declarative items.
Simon Marshall <simon@gnu.org>
parents:
19935
diff
changeset
|
406 whatever the function `fubar-match' finds and matches |
bc7fabb22520
Allow any number of ::foos in declarative items.
Simon Marshall <simon@gnu.org>
parents:
19935
diff
changeset
|
407 in the value of `fubar-face'. |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
408 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
409 MATCH-ANCHORED should be of the form: |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
410 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
411 (MATCHER PRE-MATCH-FORM POST-MATCH-FORM MATCH-HIGHLIGHT ...) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
412 |
20923
c6e733c90ed8
Keyword doc fixes and keyword tweaks.
Simon Marshall <simon@gnu.org>
parents:
20851
diff
changeset
|
413 where MATCHER is a regexp to search for or the function name to call to make |
c6e733c90ed8
Keyword doc fixes and keyword tweaks.
Simon Marshall <simon@gnu.org>
parents:
20851
diff
changeset
|
414 the search, as for MATCH-HIGHLIGHT above, but with one exception; see below. |
13440
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
415 PRE-MATCH-FORM and POST-MATCH-FORM are evaluated before the first, and after |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
416 the last, instance MATCH-ANCHORED's MATCHER is used. Therefore they can be |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
417 used to initialise before, and cleanup after, MATCHER is used. Typically, |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
418 PRE-MATCH-FORM is used to move to some position relative to the original |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
419 MATCHER, before starting with MATCH-ANCHORED's MATCHER. POST-MATCH-FORM might |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
420 be used to move, before resuming with MATCH-ANCHORED's parent's MATCHER. |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
421 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
422 For example, an element of the form highlights (if not already highlighted): |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
423 |
13440
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
424 (\"\\\\\\=<anchor\\\\\\=>\" (0 anchor-face) (\"\\\\\\=<item\\\\\\=>\" nil nil (0 item-face))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
425 |
20923
c6e733c90ed8
Keyword doc fixes and keyword tweaks.
Simon Marshall <simon@gnu.org>
parents:
20851
diff
changeset
|
426 discrete occurrences of \"anchor\" in the value of `anchor-face', and subsequent |
13440
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
427 discrete occurrences of \"item\" (on the same line) in the value of `item-face'. |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
428 (Here PRE-MATCH-FORM and POST-MATCH-FORM are nil. Therefore \"item\" is |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
429 initially searched for starting from the end of the match of \"anchor\", and |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
430 searching for subsequent instance of \"anchor\" resumes from where searching |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
431 for \"item\" concluded.) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
432 |
17055
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
433 The above-mentioned exception is as follows. The limit of the MATCHER search |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
434 defaults to the end of the line after PRE-MATCH-FORM is evaluated. |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
435 However, if PRE-MATCH-FORM returns a position greater than the position after |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
436 PRE-MATCH-FORM is evaluated, that position is used as the limit of the search. |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
437 It is generally a bad idea to return a position greater than the end of the |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
438 line, i.e., cause the MATCHER search to span lines. |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
439 |
27636
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
440 These regular expressions can match text which spans lines, although |
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
441 it is better to avoid it if possible since updating them while editing |
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
442 text is slower, and it is not guaranteed to be always correct when using |
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
443 support modes like jit-lock or lazy-lock. |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
444 |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
445 This variable is set by major modes via the variable `font-lock-defaults'. |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
446 Be careful when composing regexps for this list; a poorly written pattern can |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
447 dramatically slow things down!") |
4053 | 448 |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
449 ;; This variable is used by mode packages that support Font Lock mode by |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
450 ;; defining their own keywords to use for `font-lock-keywords'. (The mode |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
451 ;; command should make it buffer-local and set it to provide the set up.) |
9487
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
452 (defvar font-lock-defaults nil |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
453 "Defaults for Font Lock mode specified by the major mode. |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
454 Defaults should be of the form: |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
455 |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
456 (KEYWORDS KEYWORDS-ONLY CASE-FOLD SYNTAX-ALIST SYNTAX-BEGIN ...) |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
457 |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
458 KEYWORDS may be a symbol (a variable or function whose value is the keywords to |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
459 use for fontification) or a list of symbols. If KEYWORDS-ONLY is non-nil, |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
460 syntactic fontification (strings and comments) is not performed. |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
461 If CASE-FOLD is non-nil, the case of the keywords is ignored when fontifying. |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
462 If SYNTAX-ALIST is non-nil, it should be a list of cons pairs of the form |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
463 \(CHAR-OR-STRING . STRING) used to set the local Font Lock syntax table, for |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
464 keyword and syntactic fontification (see `modify-syntax-entry'). |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
465 |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
466 If SYNTAX-BEGIN is non-nil, it should be a function with no args used to move |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
467 backwards outside any enclosing syntactic block, for syntactic fontification. |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
468 Typical values are `beginning-of-line' (i.e., the start of the line is known to |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
469 be outside a syntactic block), or `beginning-of-defun' for programming modes or |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
470 `backward-paragraph' for textual modes (i.e., the mode-dependent function is |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
471 known to move outside a syntactic block). If nil, the beginning of the buffer |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
472 is used as a position outside of a syntactic block, in the worst case. |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
473 |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
474 These item elements are used by Font Lock mode to set the variables |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
475 `font-lock-keywords', `font-lock-keywords-only', |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
476 `font-lock-keywords-case-fold-search', `font-lock-syntax-table' and |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
477 `font-lock-beginning-of-syntax-function', respectively. |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
478 |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
479 Further item elements are alists of the form (VARIABLE . VALUE) and are in no |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
480 particular order. Each VARIABLE is made buffer-local before set to VALUE. |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
481 |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
482 Currently, appropriate variables include `font-lock-mark-block-function'. |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
483 If this is non-nil, it should be a function with no args used to mark any |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
484 enclosing block of text, for fontification via \\[font-lock-fontify-block]. |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
485 Typical values are `mark-defun' for programming modes or `mark-paragraph' for |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
486 textual modes (i.e., the mode-dependent function is known to put point and mark |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
487 around a text block relevant to that mode). |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
488 |
23751
3fdde7281f9b
* font-lock.el (font-lock-defaults): Doc fix.
Simon Marshall <simon@gnu.org>
parents:
23163
diff
changeset
|
489 Other variables include that for syntactic keyword fontification, |
3fdde7281f9b
* font-lock.el (font-lock-defaults): Doc fix.
Simon Marshall <simon@gnu.org>
parents:
23163
diff
changeset
|
490 `font-lock-syntactic-keywords' |
3fdde7281f9b
* font-lock.el (font-lock-defaults): Doc fix.
Simon Marshall <simon@gnu.org>
parents:
23163
diff
changeset
|
491 and those for buffer-specialised fontification functions, |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
492 `font-lock-fontify-buffer-function', `font-lock-unfontify-buffer-function', |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
493 `font-lock-fontify-region-function', `font-lock-unfontify-region-function', |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
494 `font-lock-inhibit-thing-lock' and `font-lock-maximum-size'.") |
32306
86a849ccfae1
(font-lock-defaults): Make buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32272
diff
changeset
|
495 ;;;###autoload |
86a849ccfae1
(font-lock-defaults): Make buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32272
diff
changeset
|
496 (make-variable-buffer-local 'font-lock-defaults) |
9487
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
497 |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
498 ;; This variable is used where font-lock.el itself supplies the keywords. |
9487
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
499 (defvar font-lock-defaults-alist |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
500 (let (;; We use `beginning-of-defun', rather than nil, for SYNTAX-BEGIN. |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
501 ;; Thus the calculation of the cache is usually faster but not |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
502 ;; infallible, so we risk mis-fontification. sm. |
12385
c80966dc0b60
Specify in font-lock-defaults/font-lock-defaults-alist which keywords we can
Simon Marshall <simon@gnu.org>
parents:
12268
diff
changeset
|
503 (c-mode-defaults |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
504 '((c-font-lock-keywords c-font-lock-keywords-1 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
505 c-font-lock-keywords-2 c-font-lock-keywords-3) |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
506 nil nil ((?_ . "w")) beginning-of-defun |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
507 (font-lock-syntactic-face-function |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
508 . c-font-lock-syntactic-face-function) |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
509 (font-lock-mark-block-function . mark-defun))) |
12385
c80966dc0b60
Specify in font-lock-defaults/font-lock-defaults-alist which keywords we can
Simon Marshall <simon@gnu.org>
parents:
12268
diff
changeset
|
510 (c++-mode-defaults |
26620 | 511 '((c++-font-lock-keywords c++-font-lock-keywords-1 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
512 c++-font-lock-keywords-2 c++-font-lock-keywords-3) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
513 nil nil ((?_ . "w")) beginning-of-defun |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
514 (font-lock-syntactic-face-function |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
515 . c-font-lock-syntactic-face-function) |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
516 (font-lock-mark-block-function . mark-defun))) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
517 (objc-mode-defaults |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
518 '((objc-font-lock-keywords objc-font-lock-keywords-1 |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
519 objc-font-lock-keywords-2 objc-font-lock-keywords-3) |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
520 nil nil ((?_ . "w") (?$ . "w")) nil |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
521 (font-lock-syntactic-face-function |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
522 . c-font-lock-syntactic-face-function) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
523 (font-lock-mark-block-function . mark-defun))) |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
524 (java-mode-defaults |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
525 '((java-font-lock-keywords java-font-lock-keywords-1 |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
526 java-font-lock-keywords-2 java-font-lock-keywords-3) |
24336
3c68ad53545e
* font-lock.el (c++-font-lock-keywords-3): Use c-at-toplevel-p to distinguish
Simon Marshall <simon@gnu.org>
parents:
24216
diff
changeset
|
527 nil nil ((?_ . "w") (?$ . "w")) nil |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
528 (font-lock-syntactic-face-function |
40540
e5cf2302abcd
(java-font-lock-syntactic-face-function): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40394
diff
changeset
|
529 . java-font-lock-syntactic-face-function) |
32216
82e4865603dd
(font-lock-defaults-alist): Remove the TeX entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31969
diff
changeset
|
530 (font-lock-mark-block-function . mark-defun)))) |
11515
0ebfc7701ebf
Make font-lock.el use compiled keywords; added FN as possible matcher.
Simon Marshall <simon@gnu.org>
parents:
11467
diff
changeset
|
531 (list |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
532 (cons 'c-mode c-mode-defaults) |
12813
c9ed95ec05b6
Functionality for font-lock-beginning-of-syntax-function to be used by font-lock-fontify-region when calculating the cache state. Also wrap value of buffer-file-truename to guard against clash detection. Also add scheme-font-lock-keywords.
Simon Marshall <simon@gnu.org>
parents:
12626
diff
changeset
|
533 (cons 'c++-mode c++-mode-defaults) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
534 (cons 'objc-mode objc-mode-defaults) |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
535 (cons 'java-mode java-mode-defaults))) |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
536 "Alist of fall-back Font Lock defaults for major modes. |
33360
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
537 |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
538 This variable should not be used any more. |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
539 Set the buffer-local `font-lock-keywords' in the major mode instead. |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
540 |
9487
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
541 Each item should be a list of the form: |
12813
c9ed95ec05b6
Functionality for font-lock-beginning-of-syntax-function to be used by font-lock-fontify-region when calculating the cache state. Also wrap value of buffer-file-truename to guard against clash detection. Also add scheme-font-lock-keywords.
Simon Marshall <simon@gnu.org>
parents:
12626
diff
changeset
|
542 |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
543 (MAJOR-MODE . FONT-LOCK-DEFAULTS) |
12813
c9ed95ec05b6
Functionality for font-lock-beginning-of-syntax-function to be used by font-lock-fontify-region when calculating the cache state. Also wrap value of buffer-file-truename to guard against clash detection. Also add scheme-font-lock-keywords.
Simon Marshall <simon@gnu.org>
parents:
12626
diff
changeset
|
544 |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
545 where MAJOR-MODE is a symbol and FONT-LOCK-DEFAULTS is a list of default |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
546 settings. See the variable `font-lock-defaults', which takes precedence.") |
33360
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
547 (make-obsolete-variable 'font-lock-defaults-alist 'font-lock-defaults) |
12813
c9ed95ec05b6
Functionality for font-lock-beginning-of-syntax-function to be used by font-lock-fontify-region when calculating the cache state. Also wrap value of buffer-file-truename to guard against clash detection. Also add scheme-font-lock-keywords.
Simon Marshall <simon@gnu.org>
parents:
12626
diff
changeset
|
548 |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
549 (defvar font-lock-keywords-alist nil |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
550 "*Alist of `font-lock-keywords' local to a `major-mode'. |
26920
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
551 This is normally set via `font-lock-add-keywords' and |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
552 `font-lock-remove-keywords'.") |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
553 |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
554 (defvar font-lock-removed-keywords-alist nil |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
555 "*Alist of `font-lock-keywords' removed from `major-mode'. |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
556 This is normally set via `font-lock-add-keywords' and |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
557 `font-lock-remove-keywords'.") |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
558 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
559 (defvar font-lock-keywords-only nil |
12813
c9ed95ec05b6
Functionality for font-lock-beginning-of-syntax-function to be used by font-lock-fontify-region when calculating the cache state. Also wrap value of buffer-file-truename to guard against clash detection. Also add scheme-font-lock-keywords.
Simon Marshall <simon@gnu.org>
parents:
12626
diff
changeset
|
560 "*Non-nil means Font Lock should not fontify comments or strings. |
c9ed95ec05b6
Functionality for font-lock-beginning-of-syntax-function to be used by font-lock-fontify-region when calculating the cache state. Also wrap value of buffer-file-truename to guard against clash detection. Also add scheme-font-lock-keywords.
Simon Marshall <simon@gnu.org>
parents:
12626
diff
changeset
|
561 This is normally set via `font-lock-defaults'.") |
9487
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
562 |
4053 | 563 (defvar font-lock-keywords-case-fold-search nil |
12813
c9ed95ec05b6
Functionality for font-lock-beginning-of-syntax-function to be used by font-lock-fontify-region when calculating the cache state. Also wrap value of buffer-file-truename to guard against clash detection. Also add scheme-font-lock-keywords.
Simon Marshall <simon@gnu.org>
parents:
12626
diff
changeset
|
564 "*Non-nil means the patterns in `font-lock-keywords' are case-insensitive. |
c9ed95ec05b6
Functionality for font-lock-beginning-of-syntax-function to be used by font-lock-fontify-region when calculating the cache state. Also wrap value of buffer-file-truename to guard against clash detection. Also add scheme-font-lock-keywords.
Simon Marshall <simon@gnu.org>
parents:
12626
diff
changeset
|
565 This is normally set via `font-lock-defaults'.") |
37227
e7d998ab9275
made font-lock-keywords-case-fold-search buffer-local
Sam Steingold <sds@gnu.org>
parents:
36462
diff
changeset
|
566 (make-variable-buffer-local 'font-lock-keywords-case-fold-search) |
4053 | 567 |
32483
09a7b2ac5750
(font-lock-syntactically-fontified): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32474
diff
changeset
|
568 (defvar font-lock-syntactically-fontified 0 |
09a7b2ac5750
(font-lock-syntactically-fontified): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32474
diff
changeset
|
569 "Point up to which `font-lock-syntactic-keywords' has been applied. |
09a7b2ac5750
(font-lock-syntactically-fontified): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32474
diff
changeset
|
570 If nil, this is ignored, in which case the syntactic fontification may |
09a7b2ac5750
(font-lock-syntactically-fontified): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32474
diff
changeset
|
571 sometimes be slightly incorrect.") |
09a7b2ac5750
(font-lock-syntactically-fontified): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32474
diff
changeset
|
572 (make-variable-buffer-local 'font-lock-syntactically-fontified) |
09a7b2ac5750
(font-lock-syntactically-fontified): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32474
diff
changeset
|
573 |
33360
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
574 (defvar font-lock-syntactic-face-function |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
575 (lambda (state) |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
576 (if (nth 3 state) font-lock-string-face font-lock-comment-face)) |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
577 "Function to determine which face to use when fontifying syntactically. |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
578 The function is called with a single parameter (the state as returned by |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
579 `parse-partial-sexp' at the beginning of the region to highlight) and |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
580 should return a face.") |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
581 |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
582 (defvar font-lock-syntactic-keywords nil |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
583 "A list of the syntactic keywords to highlight. |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
584 Can be the list or the name of a function or variable whose value is the list. |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
585 See `font-lock-keywords' for a description of the form of this list; |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
586 the differences are listed below. MATCH-HIGHLIGHT should be of the form: |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
587 |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
588 (MATCH SYNTAX OVERRIDE LAXMATCH) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
589 |
32509
54ef67bbcd42
(font-lock-syntactic-keywords): Fix docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32483
diff
changeset
|
590 where SYNTAX can be a string (as taken by `modify-syntax-entry'), a syntax |
54ef67bbcd42
(font-lock-syntactic-keywords): Fix docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32483
diff
changeset
|
591 table, a cons cell (as returned by `string-to-syntax') or an expression whose |
54ef67bbcd42
(font-lock-syntactic-keywords): Fix docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32483
diff
changeset
|
592 value is such a form. OVERRIDE cannot be `prepend' or `append'. |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
593 |
20923
c6e733c90ed8
Keyword doc fixes and keyword tweaks.
Simon Marshall <simon@gnu.org>
parents:
20851
diff
changeset
|
594 For example, an element of the form highlights syntactically: |
c6e733c90ed8
Keyword doc fixes and keyword tweaks.
Simon Marshall <simon@gnu.org>
parents:
20851
diff
changeset
|
595 |
32509
54ef67bbcd42
(font-lock-syntactic-keywords): Fix docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32483
diff
changeset
|
596 (\"\\\\$\\\\(#\\\\)\" 1 \".\") |
20923
c6e733c90ed8
Keyword doc fixes and keyword tweaks.
Simon Marshall <simon@gnu.org>
parents:
20851
diff
changeset
|
597 |
32509
54ef67bbcd42
(font-lock-syntactic-keywords): Fix docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32483
diff
changeset
|
598 a hash character when following a dollar character, with a SYNTAX of |
54ef67bbcd42
(font-lock-syntactic-keywords): Fix docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32483
diff
changeset
|
599 \".\" (meaning punctuation syntax). Assuming that the buffer syntax table does |
20923
c6e733c90ed8
Keyword doc fixes and keyword tweaks.
Simon Marshall <simon@gnu.org>
parents:
20851
diff
changeset
|
600 specify hash characters to have comment start syntax, the element will only |
c6e733c90ed8
Keyword doc fixes and keyword tweaks.
Simon Marshall <simon@gnu.org>
parents:
20851
diff
changeset
|
601 highlight hash characters that do not follow dollar characters as comments |
c6e733c90ed8
Keyword doc fixes and keyword tweaks.
Simon Marshall <simon@gnu.org>
parents:
20851
diff
changeset
|
602 syntactically. |
c6e733c90ed8
Keyword doc fixes and keyword tweaks.
Simon Marshall <simon@gnu.org>
parents:
20851
diff
changeset
|
603 |
c6e733c90ed8
Keyword doc fixes and keyword tweaks.
Simon Marshall <simon@gnu.org>
parents:
20851
diff
changeset
|
604 (\"\\\\('\\\\).\\\\('\\\\)\" |
32509
54ef67bbcd42
(font-lock-syntactic-keywords): Fix docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32483
diff
changeset
|
605 (1 \"\\\"\") |
54ef67bbcd42
(font-lock-syntactic-keywords): Fix docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32483
diff
changeset
|
606 (2 \"\\\"\")) |
20923
c6e733c90ed8
Keyword doc fixes and keyword tweaks.
Simon Marshall <simon@gnu.org>
parents:
20851
diff
changeset
|
607 |
32509
54ef67bbcd42
(font-lock-syntactic-keywords): Fix docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32483
diff
changeset
|
608 both single quotes which surround a single character, with a SYNTAX of |
54ef67bbcd42
(font-lock-syntactic-keywords): Fix docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32483
diff
changeset
|
609 \"\\\"\" (meaning string quote syntax). Assuming that the buffer syntax table |
20923
c6e733c90ed8
Keyword doc fixes and keyword tweaks.
Simon Marshall <simon@gnu.org>
parents:
20851
diff
changeset
|
610 does not specify single quotes to have quote syntax, the element will only |
c6e733c90ed8
Keyword doc fixes and keyword tweaks.
Simon Marshall <simon@gnu.org>
parents:
20851
diff
changeset
|
611 highlight single quotes of the form 'c' as strings syntactically. |
c6e733c90ed8
Keyword doc fixes and keyword tweaks.
Simon Marshall <simon@gnu.org>
parents:
20851
diff
changeset
|
612 Other forms, such as foo'bar or 'fubar', will not be highlighted as strings. |
c6e733c90ed8
Keyword doc fixes and keyword tweaks.
Simon Marshall <simon@gnu.org>
parents:
20851
diff
changeset
|
613 |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
614 This is normally set via `font-lock-defaults'.") |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
615 |
8457
c0492d7043b2
(font-lock-syntax-table): New syntax table.
Richard M. Stallman <rms@gnu.org>
parents:
7915
diff
changeset
|
616 (defvar font-lock-syntax-table nil |
10879
73ce8261c2ce
Added font-lock-maximum-decoration; use it to set lisp-font-lock-keywords, and
Simon Marshall <simon@gnu.org>
parents:
10545
diff
changeset
|
617 "Non-nil means use this syntax table for fontifying. |
12813
c9ed95ec05b6
Functionality for font-lock-beginning-of-syntax-function to be used by font-lock-fontify-region when calculating the cache state. Also wrap value of buffer-file-truename to guard against clash detection. Also add scheme-font-lock-keywords.
Simon Marshall <simon@gnu.org>
parents:
12626
diff
changeset
|
618 If this is nil, the major mode's syntax table is used. |
c9ed95ec05b6
Functionality for font-lock-beginning-of-syntax-function to be used by font-lock-fontify-region when calculating the cache state. Also wrap value of buffer-file-truename to guard against clash detection. Also add scheme-font-lock-keywords.
Simon Marshall <simon@gnu.org>
parents:
12626
diff
changeset
|
619 This is normally set via `font-lock-defaults'.") |
c9ed95ec05b6
Functionality for font-lock-beginning-of-syntax-function to be used by font-lock-fontify-region when calculating the cache state. Also wrap value of buffer-file-truename to guard against clash detection. Also add scheme-font-lock-keywords.
Simon Marshall <simon@gnu.org>
parents:
12626
diff
changeset
|
620 |
c9ed95ec05b6
Functionality for font-lock-beginning-of-syntax-function to be used by font-lock-fontify-region when calculating the cache state. Also wrap value of buffer-file-truename to guard against clash detection. Also add scheme-font-lock-keywords.
Simon Marshall <simon@gnu.org>
parents:
12626
diff
changeset
|
621 (defvar font-lock-beginning-of-syntax-function nil |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
622 "*Non-nil means use this function to move back outside of a syntactic block. |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
623 When called with no args it should leave point at the beginning of any |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
624 enclosing syntactic block. |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
625 If this is nil, the beginning of the buffer is used (in the worst case). |
41513
92d06d8cd81d
(font-lock-cache-state, font-lock-cache-position)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41226
diff
changeset
|
626 This is normally set via `font-lock-defaults'. |
92d06d8cd81d
(font-lock-cache-state, font-lock-cache-position)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41226
diff
changeset
|
627 It is preferable to set `syntax-begin-function' instead.") |
8457
c0492d7043b2
(font-lock-syntax-table): New syntax table.
Richard M. Stallman <rms@gnu.org>
parents:
7915
diff
changeset
|
628 |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
629 (defvar font-lock-mark-block-function nil |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
630 "*Non-nil means use this function to mark a block of text. |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
631 When called with no args it should leave point at the beginning of any |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
632 enclosing textual block and mark at the end. |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
633 This is normally set via `font-lock-defaults'.") |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
634 |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
635 (defvar font-lock-fontify-buffer-function 'font-lock-default-fontify-buffer |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
636 "Function to use for fontifying the buffer. |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
637 This is normally set via `font-lock-defaults'.") |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
638 |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
639 (defvar font-lock-unfontify-buffer-function 'font-lock-default-unfontify-buffer |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
640 "Function to use for unfontifying the buffer. |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
641 This is used when turning off Font Lock mode. |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
642 This is normally set via `font-lock-defaults'.") |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
643 |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
644 (defvar font-lock-fontify-region-function 'font-lock-default-fontify-region |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
645 "Function to use for fontifying a region. |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
646 It should take two args, the beginning and end of the region, and an optional |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
647 third arg VERBOSE. If non-nil, the function should print status messages. |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
648 This is normally set via `font-lock-defaults'.") |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
649 |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
650 (defvar font-lock-unfontify-region-function 'font-lock-default-unfontify-region |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
651 "Function to use for unfontifying a region. |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
652 It should take two args, the beginning and end of the region. |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
653 This is normally set via `font-lock-defaults'.") |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
654 |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
655 (defvar font-lock-inhibit-thing-lock nil |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
656 "List of Font Lock mode related modes that should not be turned on. |
26620 | 657 Currently, valid mode names are `fast-lock-mode', `jit-lock-mode' and |
25048
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
658 `lazy-lock-mode'. This is normally set via `font-lock-defaults'.") |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
659 |
35419
e233da20040a
(font-lock-multiline): Default to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
35195
diff
changeset
|
660 (defvar font-lock-multiline nil |
26775
ea2b51ce35a7
(font-lock-multiline): New variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26746
diff
changeset
|
661 "Whether font-lock should cater to multiline keywords. |
ea2b51ce35a7
(font-lock-multiline): New variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26746
diff
changeset
|
662 If nil, don't try to handle multiline patterns. |
ea2b51ce35a7
(font-lock-multiline): New variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26746
diff
changeset
|
663 If t, always handle multiline patterns. |
ea2b51ce35a7
(font-lock-multiline): New variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26746
diff
changeset
|
664 If `undecided', don't try to handle multiline patterns until you see one. |
ea2b51ce35a7
(font-lock-multiline): New variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26746
diff
changeset
|
665 Major/minor modes can set this variable if they know which option applies.") |
ea2b51ce35a7
(font-lock-multiline): New variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26746
diff
changeset
|
666 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
667 (defvar font-lock-fontified nil) ; Whether we have fontified the buffer. |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
668 |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
669 ;; Font Lock mode. |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
670 |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
671 (eval-when-compile |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
672 ;; |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
673 ;; We don't do this at the top-level as we only use non-autoloaded macros. |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
674 (require 'cl) |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
675 ;; |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
676 ;; Borrowed from lazy-lock.el. |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
677 ;; We use this to preserve or protect things when modifying text properties. |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
678 (defmacro save-buffer-state (varlist &rest body) |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
679 "Bind variables according to VARLIST and eval BODY restoring buffer state." |
44229
8c0a16af093a
(save-buffer-state): Use make-symbol to bind `modified'.
Eli Zaretskii <eliz@gnu.org>
parents:
43835
diff
changeset
|
680 (let ((modified (make-symbol "modified"))) |
8c0a16af093a
(save-buffer-state): Use make-symbol to bind `modified'.
Eli Zaretskii <eliz@gnu.org>
parents:
43835
diff
changeset
|
681 `(let* ,(append varlist |
44258
fc8fbdc5ca4c
(save-buffer-state): Fix last change.
Eli Zaretskii <eliz@gnu.org>
parents:
44229
diff
changeset
|
682 `((,modified (buffer-modified-p)) |
44229
8c0a16af093a
(save-buffer-state): Use make-symbol to bind `modified'.
Eli Zaretskii <eliz@gnu.org>
parents:
43835
diff
changeset
|
683 (buffer-undo-list t) |
8c0a16af093a
(save-buffer-state): Use make-symbol to bind `modified'.
Eli Zaretskii <eliz@gnu.org>
parents:
43835
diff
changeset
|
684 (inhibit-read-only t) |
8c0a16af093a
(save-buffer-state): Use make-symbol to bind `modified'.
Eli Zaretskii <eliz@gnu.org>
parents:
43835
diff
changeset
|
685 (inhibit-point-motion-hooks t) |
8c0a16af093a
(save-buffer-state): Use make-symbol to bind `modified'.
Eli Zaretskii <eliz@gnu.org>
parents:
43835
diff
changeset
|
686 (inhibit-modification-hooks t) |
8c0a16af093a
(save-buffer-state): Use make-symbol to bind `modified'.
Eli Zaretskii <eliz@gnu.org>
parents:
43835
diff
changeset
|
687 deactivate-mark |
8c0a16af093a
(save-buffer-state): Use make-symbol to bind `modified'.
Eli Zaretskii <eliz@gnu.org>
parents:
43835
diff
changeset
|
688 buffer-file-name |
8c0a16af093a
(save-buffer-state): Use make-symbol to bind `modified'.
Eli Zaretskii <eliz@gnu.org>
parents:
43835
diff
changeset
|
689 buffer-file-truename)) |
8c0a16af093a
(save-buffer-state): Use make-symbol to bind `modified'.
Eli Zaretskii <eliz@gnu.org>
parents:
43835
diff
changeset
|
690 (progn |
8c0a16af093a
(save-buffer-state): Use make-symbol to bind `modified'.
Eli Zaretskii <eliz@gnu.org>
parents:
43835
diff
changeset
|
691 ,@body) |
8c0a16af093a
(save-buffer-state): Use make-symbol to bind `modified'.
Eli Zaretskii <eliz@gnu.org>
parents:
43835
diff
changeset
|
692 (unless ,modified |
8c0a16af093a
(save-buffer-state): Use make-symbol to bind `modified'.
Eli Zaretskii <eliz@gnu.org>
parents:
43835
diff
changeset
|
693 (restore-buffer-modified-p nil))))) |
19846
f5f2feb0bd0f
Try to comment where font-lock-keyword order is important.
Simon Marshall <simon@gnu.org>
parents:
19788
diff
changeset
|
694 (put 'save-buffer-state 'lisp-indent-function 1) |
28087
9ca294cf76c7
(font-lock-keywords): Fix the doc now that regexp-opt-depth is unnecessary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28069
diff
changeset
|
695 (def-edebug-spec save-buffer-state let) |
19846
f5f2feb0bd0f
Try to comment where font-lock-keyword order is important.
Simon Marshall <simon@gnu.org>
parents:
19788
diff
changeset
|
696 ;; |
f5f2feb0bd0f
Try to comment where font-lock-keyword order is important.
Simon Marshall <simon@gnu.org>
parents:
19788
diff
changeset
|
697 ;; Shut up the byte compiler. |
33360
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
698 (defvar font-lock-face-attributes)) ; Obsolete but respected if set. |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
699 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
700 ;;;###autoload |
33360
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
701 (define-minor-mode font-lock-mode |
13452
5aab5c1f2c33
Oops; left a note in a doc-string.
Simon Marshall <simon@gnu.org>
parents:
13440
diff
changeset
|
702 "Toggle Font Lock mode. |
37522 | 703 With arg, turn Font Lock mode off if and only if arg is a non-positive |
704 number; if arg is nil, toggle Font Lock mode; anything else turns Font | |
705 Lock on. | |
32483
09a7b2ac5750
(font-lock-syntactically-fontified): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32474
diff
changeset
|
706 \(Font Lock is also known as \"syntax highlighting\".) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
707 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
708 When Font Lock mode is enabled, text is fontified as you type it: |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
709 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
710 - Comments are displayed in `font-lock-comment-face'; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
711 - Strings are displayed in `font-lock-string-face'; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
712 - Certain other expressions are displayed in other faces according to the |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
713 value of the variable `font-lock-keywords'. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
714 |
32272
ad080e900685
(font-lock-mode, global-font-lock-mode): Mention in
Eli Zaretskii <eliz@gnu.org>
parents:
32216
diff
changeset
|
715 To customize the faces (colors, fonts, etc.) used by Font Lock for |
ad080e900685
(font-lock-mode, global-font-lock-mode): Mention in
Eli Zaretskii <eliz@gnu.org>
parents:
32216
diff
changeset
|
716 fontifying different parts of buffer text, use \\[customize-face]. |
ad080e900685
(font-lock-mode, global-font-lock-mode): Mention in
Eli Zaretskii <eliz@gnu.org>
parents:
32216
diff
changeset
|
717 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
718 You can enable Font Lock mode in any major mode automatically by turning on in |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
719 the major mode's hook. For example, put in your ~/.emacs: |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
720 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
721 (add-hook 'c-mode-hook 'turn-on-font-lock) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
722 |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
723 Alternatively, you can use Global Font Lock mode to automagically turn on Font |
15500
5c60db96bc32
Put fewer conditions in turn-on-font-lock and more in turn-on-font-lock-if-enabled, so a user can put the former on hooks.
Simon Marshall <simon@gnu.org>
parents:
15492
diff
changeset
|
724 Lock mode in buffers whose major mode supports it and whose major mode is one |
5c60db96bc32
Put fewer conditions in turn-on-font-lock and more in turn-on-font-lock-if-enabled, so a user can put the former on hooks.
Simon Marshall <simon@gnu.org>
parents:
15492
diff
changeset
|
725 of `font-lock-global-modes'. For example, put in your ~/.emacs: |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
726 |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
727 (global-font-lock-mode t) |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
728 |
15500
5c60db96bc32
Put fewer conditions in turn-on-font-lock and more in turn-on-font-lock-if-enabled, so a user can put the former on hooks.
Simon Marshall <simon@gnu.org>
parents:
15492
diff
changeset
|
729 There are a number of support modes that may be used to speed up Font Lock mode |
5c60db96bc32
Put fewer conditions in turn-on-font-lock and more in turn-on-font-lock-if-enabled, so a user can put the former on hooks.
Simon Marshall <simon@gnu.org>
parents:
15492
diff
changeset
|
730 in various ways, specified via the variable `font-lock-support-mode'. Where |
5c60db96bc32
Put fewer conditions in turn-on-font-lock and more in turn-on-font-lock-if-enabled, so a user can put the former on hooks.
Simon Marshall <simon@gnu.org>
parents:
15492
diff
changeset
|
731 major modes support different levels of fontification, you can use the variable |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
732 `font-lock-maximum-decoration' to specify which level you generally prefer. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
733 When you turn Font Lock mode on/off the buffer is fontified/defontified, though |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
734 fontification occurs only if the buffer is less than `font-lock-maximum-size'. |
13701
1dab6f0d9239
Don't turn on in any buffer with a leading space in its name.
Simon Marshall <simon@gnu.org>
parents:
13641
diff
changeset
|
735 |
15500
5c60db96bc32
Put fewer conditions in turn-on-font-lock and more in turn-on-font-lock-if-enabled, so a user can put the former on hooks.
Simon Marshall <simon@gnu.org>
parents:
15492
diff
changeset
|
736 For example, to specify that Font Lock mode use use Lazy Lock mode as a support |
5c60db96bc32
Put fewer conditions in turn-on-font-lock and more in turn-on-font-lock-if-enabled, so a user can put the former on hooks.
Simon Marshall <simon@gnu.org>
parents:
15492
diff
changeset
|
737 mode and use maximum levels of fontification, put in your ~/.emacs: |
5c60db96bc32
Put fewer conditions in turn-on-font-lock and more in turn-on-font-lock-if-enabled, so a user can put the former on hooks.
Simon Marshall <simon@gnu.org>
parents:
15492
diff
changeset
|
738 |
5c60db96bc32
Put fewer conditions in turn-on-font-lock and more in turn-on-font-lock-if-enabled, so a user can put the former on hooks.
Simon Marshall <simon@gnu.org>
parents:
15492
diff
changeset
|
739 (setq font-lock-support-mode 'lazy-lock-mode) |
5c60db96bc32
Put fewer conditions in turn-on-font-lock and more in turn-on-font-lock-if-enabled, so a user can put the former on hooks.
Simon Marshall <simon@gnu.org>
parents:
15492
diff
changeset
|
740 (setq font-lock-maximum-decoration t) |
5c60db96bc32
Put fewer conditions in turn-on-font-lock and more in turn-on-font-lock-if-enabled, so a user can put the former on hooks.
Simon Marshall <simon@gnu.org>
parents:
15492
diff
changeset
|
741 |
17055
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
742 To add your own highlighting for some major mode, and modify the highlighting |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
743 selected automatically via the variable `font-lock-maximum-decoration', you can |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
744 use `font-lock-add-keywords'. |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
745 |
13701
1dab6f0d9239
Don't turn on in any buffer with a leading space in its name.
Simon Marshall <simon@gnu.org>
parents:
13641
diff
changeset
|
746 To fontify a buffer, without turning on Font Lock mode and regardless of buffer |
1dab6f0d9239
Don't turn on in any buffer with a leading space in its name.
Simon Marshall <simon@gnu.org>
parents:
13641
diff
changeset
|
747 size, you can use \\[font-lock-fontify-buffer]. |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
748 |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
749 To fontify a block (the function or paragraph containing point, or a number of |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
750 lines around point), perhaps because modification on the current line caused |
15500
5c60db96bc32
Put fewer conditions in turn-on-font-lock and more in turn-on-font-lock-if-enabled, so a user can put the former on hooks.
Simon Marshall <simon@gnu.org>
parents:
15492
diff
changeset
|
751 syntactic change on other lines, you can use \\[font-lock-fontify-block]. |
5c60db96bc32
Put fewer conditions in turn-on-font-lock and more in turn-on-font-lock-if-enabled, so a user can put the former on hooks.
Simon Marshall <simon@gnu.org>
parents:
15492
diff
changeset
|
752 |
17543
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
753 See the variable `font-lock-defaults-alist' for the Font Lock mode default |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
754 settings. You can set your own default settings for some mode, by setting a |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
755 buffer local value for `font-lock-defaults', via its mode hook." |
33360
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
756 nil nil nil |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
757 ;; Don't turn on Font Lock mode if we don't have a display (we're running a |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
758 ;; batch job) or if the buffer is invisible (the name starts with a space). |
33360
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
759 (when (or noninteractive (eq (aref (buffer-name) 0) ?\ )) |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
760 (setq font-lock-mode nil)) |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
761 |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
762 ;; Turn on Font Lock mode. |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
763 (when font-lock-mode |
41934
bedadfb75588
(font-lock-mode): Put our function at the end of after-change-functions.
Richard M. Stallman <rms@gnu.org>
parents:
41513
diff
changeset
|
764 (add-hook 'after-change-functions 'font-lock-after-change-function t t) |
33360
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
765 (font-lock-set-defaults) |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
766 (font-lock-turn-on-thing-lock) |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
767 ;; Fontify the buffer if we have to. |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
768 (let ((max-size (font-lock-value-in-major-mode font-lock-maximum-size))) |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
769 (cond (font-lock-fontified |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
770 nil) |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
771 ((or (null max-size) (> max-size (buffer-size))) |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
772 (font-lock-fontify-buffer)) |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
773 (font-lock-verbose |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
774 (message "Fontifying %s...buffer size greater than font-lock-maximum-size" |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
775 (buffer-name)))))) |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
776 ;; Turn off Font Lock mode. |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
777 (unless font-lock-mode |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
778 (remove-hook 'after-change-functions 'font-lock-after-change-function t) |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
779 (font-lock-unfontify-buffer) |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
780 (font-lock-turn-off-thing-lock))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
781 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
782 ;;;###autoload |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
783 (defun turn-on-font-lock () |
33360
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
784 "Turn on Font Lock mode (only if the terminal can display it)." |
27414
d30c57a6b35c
(turn-on-font-lock): Don't depend on window-system &c.
Dave Love <fx@gnu.org>
parents:
26920
diff
changeset
|
785 (unless font-lock-mode |
17055
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
786 (font-lock-mode))) |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
787 |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
788 ;;;###autoload |
26775
ea2b51ce35a7
(font-lock-multiline): New variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26746
diff
changeset
|
789 (defun font-lock-add-keywords (mode keywords &optional append) |
ea2b51ce35a7
(font-lock-multiline): New variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26746
diff
changeset
|
790 "Add highlighting KEYWORDS for MODE. |
ea2b51ce35a7
(font-lock-multiline): New variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26746
diff
changeset
|
791 MODE should be a symbol, the major mode command name, such as `c-mode' |
16852
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
792 or nil. If nil, highlighting keywords are added for the current buffer. |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
793 KEYWORDS should be a list; see the variable `font-lock-keywords'. |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
794 By default they are added at the beginning of the current highlighting list. |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
795 If optional argument APPEND is `set', they are used to replace the current |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
796 highlighting list. If APPEND is any other non-nil value, they are added at the |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
797 end of the current highlighting list. |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
798 |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
799 For example: |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
800 |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
801 (font-lock-add-keywords 'c-mode |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
802 '((\"\\\\\\=<\\\\(FIXME\\\\):\" 1 font-lock-warning-face prepend) |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
803 (\"\\\\\\=<\\\\(and\\\\|or\\\\|not\\\\)\\\\\\=>\" . font-lock-keyword-face))) |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
804 |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
805 adds two fontification patterns for C mode, to fontify `FIXME:' words, even in |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
806 comments, and to fontify `and', `or' and `not' words as keywords. |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
807 |
37693
15212455191b
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37522
diff
changeset
|
808 When used from an elisp package (such as a minor mode), it is recommended |
15212455191b
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37522
diff
changeset
|
809 to use nil for MODE (and place the call in a loop or on a hook) to avoid |
15212455191b
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37522
diff
changeset
|
810 subtle problems due to details of the implementation. |
15212455191b
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37522
diff
changeset
|
811 |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
812 Note that some modes have specialised support for additional patterns, e.g., |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
813 see the variables `c-font-lock-extra-types', `c++-font-lock-extra-types', |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
814 `objc-font-lock-extra-types' and `java-font-lock-extra-types'." |
26775
ea2b51ce35a7
(font-lock-multiline): New variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26746
diff
changeset
|
815 (cond (mode |
ea2b51ce35a7
(font-lock-multiline): New variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26746
diff
changeset
|
816 ;; If MODE is non-nil, add the KEYWORDS and APPEND spec to |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
817 ;; `font-lock-keywords-alist' so `font-lock-set-defaults' uses them. |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
818 (let ((spec (cons keywords append)) cell) |
26775
ea2b51ce35a7
(font-lock-multiline): New variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26746
diff
changeset
|
819 (if (setq cell (assq mode font-lock-keywords-alist)) |
26920
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
820 (if (eq append 'set) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
821 (setcdr cell (list spec)) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
822 (setcdr cell (append (cdr cell) (list spec)))) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
823 (push (list mode spec) font-lock-keywords-alist))) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
824 ;; Make sure that `font-lock-removed-keywords-alist' does not |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
825 ;; contain the new keywords. |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
826 (font-lock-update-removed-keyword-alist mode keywords append)) |
27636
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
827 (t |
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
828 ;; Otherwise set or add the keywords now. |
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
829 (font-lock-set-defaults) |
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
830 (if (eq append 'set) |
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
831 (setq font-lock-keywords keywords) |
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
832 (font-lock-remove-keywords nil keywords) ;to avoid duplicates |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
833 (let ((old (if (eq (car-safe font-lock-keywords) t) |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
834 (cdr font-lock-keywords) |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
835 font-lock-keywords))) |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
836 (setq font-lock-keywords (if append |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
837 (append old keywords) |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
838 (append keywords old)))))))) |
26746
d22cd599a91a
(font-lock-default-fontify-region): Fix subtle
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26620
diff
changeset
|
839 |
27636
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
840 (defun font-lock-update-removed-keyword-alist (mode keywords append) |
26920
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
841 ;; Update `font-lock-removed-keywords-alist' when adding new |
27636
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
842 ;; KEYWORDS to MODE. |
26920
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
843 ;; |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
844 ;; When font-lock is enabled first all keywords in the list |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
845 ;; `font-lock-keywords-alist' are added, then all keywords in the |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
846 ;; list `font-lock-removed-keywords-alist' are removed. If a |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
847 ;; keyword was once added, removed, and then added again it must be |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
848 ;; removed from the removed-keywords list. Otherwise the second add |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
849 ;; will not take effect. |
27636
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
850 (let ((cell (assq mode font-lock-removed-keywords-alist))) |
26920
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
851 (if cell |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
852 (if (eq append 'set) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
853 ;; A new set of keywords is defined. Forget all about |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
854 ;; our old keywords that should be removed. |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
855 (setq font-lock-removed-keywords-alist |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
856 (delq cell font-lock-removed-keywords-alist)) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
857 ;; Delete all previously removed keywords. |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
858 (dolist (kword keywords) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
859 (setcdr cell (delete kword (cdr cell)))) |
27636
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
860 ;; Delete the mode cell if empty. |
26920
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
861 (if (null (cdr cell)) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
862 (setq font-lock-removed-keywords-alist |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
863 (delq cell font-lock-removed-keywords-alist))))))) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
864 |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
865 ;; Written by Anders Lindgren <andersl@andersl.com>. |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
866 ;; |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
867 ;; Case study: |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
868 ;; (I) The keywords are removed from a major mode. |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
869 ;; In this case the keyword could be local (i.e. added earlier by |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
870 ;; `font-lock-add-keywords'), global, or both. |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
871 ;; |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
872 ;; (a) In the local case we remove the keywords from the variable |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
873 ;; `font-lock-keywords-alist'. |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
874 ;; |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
875 ;; (b) The actual global keywords are not known at this time. |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
876 ;; All keywords are added to `font-lock-removed-keywords-alist', |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
877 ;; when font-lock is enabled those keywords are removed. |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
878 ;; |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
879 ;; Note that added keywords are taken out of the list of removed |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
880 ;; keywords. This ensure correct operation when the same keyword |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
881 ;; is added and removed several times. |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
882 ;; |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
883 ;; (II) The keywords are removed from the current buffer. |
26746
d22cd599a91a
(font-lock-default-fontify-region): Fix subtle
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26620
diff
changeset
|
884 ;;;###autoload |
27636
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
885 (defun font-lock-remove-keywords (mode keywords) |
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
886 "Remove highlighting KEYWORDS for MODE. |
26920
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
887 |
27636
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
888 MODE should be a symbol, the major mode command name, such as `c-mode' |
37693
15212455191b
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37522
diff
changeset
|
889 or nil. If nil, highlighting keywords are removed for the current buffer. |
15212455191b
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37522
diff
changeset
|
890 |
15212455191b
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37522
diff
changeset
|
891 When used from an elisp package (such as a minor mode), it is recommended |
15212455191b
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37522
diff
changeset
|
892 to use nil for MODE (and place the call in a loop or on a hook) to avoid |
15212455191b
Docstring fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
37522
diff
changeset
|
893 subtle problems due to details of the implementation." |
27636
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
894 (cond (mode |
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
895 ;; Remove one keyword at the time. |
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
896 (dolist (keyword keywords) |
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
897 (let ((top-cell (assq mode font-lock-keywords-alist))) |
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
898 ;; If MODE is non-nil, remove the KEYWORD from |
26920
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
899 ;; `font-lock-keywords-alist'. |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
900 (when top-cell |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
901 (dolist (keyword-list-append-pair (cdr top-cell)) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
902 ;; `keywords-list-append-pair' is a cons with a list of |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
903 ;; keywords in the car top-cell and the original append |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
904 ;; argument in the cdr top-cell. |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
905 (setcar keyword-list-append-pair |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
906 (delete keyword (car keyword-list-append-pair)))) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
907 ;; Remove keyword list/append pair when the keyword list |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
908 ;; is empty and append doesn't specify `set'. (If it |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
909 ;; should be deleted then previously deleted keywords |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
910 ;; would appear again.) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
911 (let ((cell top-cell)) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
912 (while (cdr cell) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
913 (if (and (null (car (car (cdr cell)))) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
914 (not (eq (cdr (car (cdr cell))) 'set))) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
915 (setcdr cell (cdr (cdr cell))) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
916 (setq cell (cdr cell))))) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
917 ;; Final cleanup, remove major mode cell if last keyword |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
918 ;; was deleted. |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
919 (if (null (cdr top-cell)) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
920 (setq font-lock-keywords-alist |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
921 (delq top-cell font-lock-keywords-alist)))) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
922 ;; Remember the keyword in case it is not local. |
27636
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
923 (let ((cell (assq mode font-lock-removed-keywords-alist))) |
26920
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
924 (if cell |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
925 (unless (member keyword (cdr cell)) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
926 (nconc cell (list keyword))) |
27636
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
927 (push (cons mode (list keyword)) |
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
928 font-lock-removed-keywords-alist)))))) |
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
929 (t |
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
930 ;; Otherwise remove it immediately. |
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
931 (font-lock-set-defaults) |
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
932 (setq font-lock-keywords (copy-sequence font-lock-keywords)) |
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
933 (dolist (keyword keywords) |
26920
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
934 (setq font-lock-keywords |
27636
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
935 (delete keyword |
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
936 ;; The keywords might be compiled. |
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
937 (delete (font-lock-compile-keyword keyword) |
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
938 font-lock-keywords))))))) |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
939 |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
940 ;;; Global Font Lock mode. |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
941 |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
942 ;; A few people have hassled in the past for a way to make it easier to turn on |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
943 ;; Font Lock mode, without the user needing to know for which modes s/he has to |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
944 ;; turn it on, perhaps the same way hilit19.el/hl319.el does. I've always |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
945 ;; balked at that way, as I see it as just re-moulding the same problem in |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
946 ;; another form. That is; some person would still have to keep track of which |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
947 ;; modes (which may not even be distributed with Emacs) support Font Lock mode. |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
948 ;; The list would always be out of date. And that person might have to be me. |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
949 |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
950 ;; Implementation. |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
951 ;; |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
952 ;; In a previous discussion the following hack came to mind. It is a gross |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
953 ;; hack, but it generally works. We use the convention that major modes start |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
954 ;; by calling the function `kill-all-local-variables', which in turn runs |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
955 ;; functions on the hook variable `change-major-mode-hook'. We attach our |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
956 ;; function `font-lock-change-major-mode' to that hook. Of course, when this |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
957 ;; hook is run, the major mode is in the process of being changed and we do not |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
958 ;; know what the final major mode will be. So, `font-lock-change-major-mode' |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
959 ;; only (a) notes the name of the current buffer, and (b) adds our function |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
960 ;; `turn-on-font-lock-if-enabled' to the hook variables `find-file-hooks' and |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
961 ;; `post-command-hook' (for buffers that are not visiting files). By the time |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
962 ;; the functions on the first of these hooks to be run are run, the new major |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
963 ;; mode is assumed to be in place. This way we get a Font Lock function run |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
964 ;; when a major mode is turned on, without knowing major modes or their hooks. |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
965 ;; |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
966 ;; Naturally this requires that (a) major modes run `kill-all-local-variables', |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
967 ;; as they are supposed to do, and (b) the major mode is in place after the |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
968 ;; file is visited or the command that ran `kill-all-local-variables' has |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
969 ;; finished, whichever the sooner. Arguably, any major mode that does not |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
970 ;; follow the convension (a) is broken, and I can't think of any reason why (b) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
971 ;; would not be met (except `gnudoit' on non-files). However, it is not clean. |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
972 ;; |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
973 ;; Probably the cleanest solution is to have each major mode function run some |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
974 ;; hook, e.g., `major-mode-hook', but maybe implementing that change is |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
975 ;; impractical. I am personally against making `setq' a macro or be advised, |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
976 ;; or have a special function such as `set-major-mode', but maybe someone can |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
977 ;; come up with another solution? |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
978 |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
979 ;; User interface. |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
980 ;; |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
981 ;; Although Global Font Lock mode is a pseudo-mode, I think that the user |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
982 ;; interface should conform to the usual Emacs convention for modes, i.e., a |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
983 ;; command to toggle the feature (`global-font-lock-mode') with a variable for |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
984 ;; finer control of the mode's behaviour (`font-lock-global-modes'). |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
985 ;; |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
986 ;; The feature should not be enabled by loading font-lock.el, since other |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
987 ;; mechanisms for turning on Font Lock mode, such as M-x font-lock-mode RET or |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
988 ;; (add-hook 'c-mode-hook 'turn-on-font-lock), would cause Font Lock mode to be |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
989 ;; turned on everywhere. That would not be intuitive or informative because |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
990 ;; loading a file tells you nothing about the feature or how to control it. It |
16852
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
991 ;; would also be contrary to the Principle of Least Surprise. sm. |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
992 |
18332
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
993 (defcustom font-lock-global-modes t |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
994 "*Modes for which Font Lock mode is automagically turned on. |
26620 | 995 Global Font Lock mode is controlled by the command `global-font-lock-mode'. |
18332
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
996 If nil, means no modes have Font Lock mode automatically turned on. |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
997 If t, all modes that support Font Lock mode have it automatically turned on. |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
998 If a list, it should be a list of `major-mode' symbol names for which Font Lock |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
999 mode should be automatically turned on. The sense of the list is negated if it |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
1000 begins with `not'. For example: |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
1001 (c-mode c++-mode) |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
1002 means that Font Lock mode is turned on for buffers in C and C++ modes only." |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
1003 :type '(choice (const :tag "none" nil) |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
1004 (const :tag "all" t) |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
1005 (set :menu-tag "mode specific" :tag "modes" |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
1006 :value (not) |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
1007 (const :tag "Except" not) |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
1008 (repeat :inline t (symbol :tag "mode")))) |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
1009 :group 'font-lock) |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
1010 |
33163
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1011 (defun turn-on-font-lock-if-enabled () |
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1012 (when (and (or font-lock-defaults |
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1013 (assq major-mode font-lock-defaults-alist)) |
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1014 (or (eq font-lock-global-modes t) |
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1015 (if (eq (car-safe font-lock-global-modes) 'not) |
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1016 (not (memq major-mode (cdr font-lock-global-modes))) |
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1017 (memq major-mode font-lock-global-modes)))) |
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1018 (let (inhibit-quit) |
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1019 (turn-on-font-lock)))) |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1020 |
33163
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1021 ;;;###autoload |
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1022 (easy-mmode-define-global-mode |
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1023 global-font-lock-mode font-lock-mode turn-on-font-lock-if-enabled |
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1024 :extra-args (dummy)) |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1025 |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
1026 ;;; End of Global Font Lock mode. |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1027 |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
1028 ;;; Font Lock Support mode. |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
1029 |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1030 ;; This is the code used to interface font-lock.el with any of its add-on |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1031 ;; packages, and provide the user interface. Packages that have their own |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1032 ;; local buffer fontification functions (see below) may have to call |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1033 ;; `font-lock-after-fontify-buffer' and/or `font-lock-after-unfontify-buffer' |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1034 ;; themselves. |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1035 |
25319
f9b3511a51c4
(font-lock-support-mode): Make `jit-lock-mode'
Gerd Moellmann <gerd@gnu.org>
parents:
25286
diff
changeset
|
1036 (defcustom font-lock-support-mode 'jit-lock-mode |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1037 "*Support mode for Font Lock mode. |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1038 Support modes speed up Font Lock mode by being choosy about when fontification |
25048
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
1039 occurs. Known support modes are Fast Lock mode (symbol `fast-lock-mode'), |
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
1040 Lazy Lock mode (symbol `lazy-lock-mode'), and Just-in-time Lock mode (symbol |
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
1041 `jit-lock-mode'. See those modes for more info. |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1042 If nil, means support for Font Lock mode is never performed. |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1043 If a symbol, use that support mode. |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1044 If a list, each element should be of the form (MAJOR-MODE . SUPPORT-MODE), |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1045 where MAJOR-MODE is a symbol or t (meaning the default). For example: |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1046 ((c-mode . fast-lock-mode) (c++-mode . fast-lock-mode) (t . lazy-lock-mode)) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1047 means that Fast Lock mode is used to support Font Lock mode for buffers in C or |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1048 C++ modes, and Lazy Lock mode is used to support Font Lock mode otherwise. |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1049 |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1050 The value of this variable is used when Font Lock mode is turned on." |
17507
fd87760f20cd
Cleaned up custom support.
Simon Marshall <simon@gnu.org>
parents:
17495
diff
changeset
|
1051 :type '(choice (const :tag "none" nil) |
fd87760f20cd
Cleaned up custom support.
Simon Marshall <simon@gnu.org>
parents:
17495
diff
changeset
|
1052 (const :tag "fast lock" fast-lock-mode) |
fd87760f20cd
Cleaned up custom support.
Simon Marshall <simon@gnu.org>
parents:
17495
diff
changeset
|
1053 (const :tag "lazy lock" lazy-lock-mode) |
25048
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
1054 (const :tag "jit lock" jit-lock-mode) |
17507
fd87760f20cd
Cleaned up custom support.
Simon Marshall <simon@gnu.org>
parents:
17495
diff
changeset
|
1055 (repeat :menu-tag "mode specific" :tag "mode specific" |
33360
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
1056 :value ((t . jit-lock-mode)) |
17507
fd87760f20cd
Cleaned up custom support.
Simon Marshall <simon@gnu.org>
parents:
17495
diff
changeset
|
1057 (cons :tag "Instance" |
fd87760f20cd
Cleaned up custom support.
Simon Marshall <simon@gnu.org>
parents:
17495
diff
changeset
|
1058 (radio :tag "Mode" |
fd87760f20cd
Cleaned up custom support.
Simon Marshall <simon@gnu.org>
parents:
17495
diff
changeset
|
1059 (const :tag "all" t) |
fd87760f20cd
Cleaned up custom support.
Simon Marshall <simon@gnu.org>
parents:
17495
diff
changeset
|
1060 (symbol :tag "name")) |
22892
850946452989
(lisp-font-lock-keywords-1): Fix previous change.
Simon Marshall <simon@gnu.org>
parents:
22857
diff
changeset
|
1061 (radio :tag "Support" |
850946452989
(lisp-font-lock-keywords-1): Fix previous change.
Simon Marshall <simon@gnu.org>
parents:
22857
diff
changeset
|
1062 (const :tag "none" nil) |
17507
fd87760f20cd
Cleaned up custom support.
Simon Marshall <simon@gnu.org>
parents:
17495
diff
changeset
|
1063 (const :tag "fast lock" fast-lock-mode) |
25048
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
1064 (const :tag "lazy lock" lazy-lock-mode) |
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
1065 (const :tag "JIT lock" jit-lock-mode))) |
17507
fd87760f20cd
Cleaned up custom support.
Simon Marshall <simon@gnu.org>
parents:
17495
diff
changeset
|
1066 )) |
29919
08e5e3740bf9
(font-lock-fontify-anchored-keywords): Use line-beginning-position.
Dave Love <fx@gnu.org>
parents:
29709
diff
changeset
|
1067 :version "21.1" |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1068 :group 'font-lock) |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1069 |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
1070 (defvar fast-lock-mode nil) |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
1071 (defvar lazy-lock-mode nil) |
25048
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
1072 (defvar jit-lock-mode nil) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
1073 |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1074 (defun font-lock-turn-on-thing-lock () |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1075 (let ((thing-mode (font-lock-value-in-major-mode font-lock-support-mode))) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1076 (cond ((eq thing-mode 'fast-lock-mode) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1077 (fast-lock-mode t)) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1078 ((eq thing-mode 'lazy-lock-mode) |
25048
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
1079 (lazy-lock-mode t)) |
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
1080 ((eq thing-mode 'jit-lock-mode) |
32216
82e4865603dd
(font-lock-defaults-alist): Remove the TeX entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31969
diff
changeset
|
1081 ;; Prepare for jit-lock |
82e4865603dd
(font-lock-defaults-alist): Remove the TeX entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31969
diff
changeset
|
1082 (remove-hook 'after-change-functions |
82e4865603dd
(font-lock-defaults-alist): Remove the TeX entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31969
diff
changeset
|
1083 'font-lock-after-change-function t) |
82e4865603dd
(font-lock-defaults-alist): Remove the TeX entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31969
diff
changeset
|
1084 (set (make-local-variable 'font-lock-fontify-buffer-function) |
32306
86a849ccfae1
(font-lock-defaults): Make buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32272
diff
changeset
|
1085 'jit-lock-refontify) |
32216
82e4865603dd
(font-lock-defaults-alist): Remove the TeX entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31969
diff
changeset
|
1086 ;; Don't fontify eagerly (and don't abort is the buffer is large). |
82e4865603dd
(font-lock-defaults-alist): Remove the TeX entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31969
diff
changeset
|
1087 (set (make-local-variable 'font-lock-fontified) t) |
82e4865603dd
(font-lock-defaults-alist): Remove the TeX entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31969
diff
changeset
|
1088 ;; Use jit-lock. |
82e4865603dd
(font-lock-defaults-alist): Remove the TeX entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31969
diff
changeset
|
1089 (jit-lock-register 'font-lock-fontify-region |
82e4865603dd
(font-lock-defaults-alist): Remove the TeX entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31969
diff
changeset
|
1090 (not font-lock-keywords-only)))))) |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1091 |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1092 (defun font-lock-turn-off-thing-lock () |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1093 (cond (fast-lock-mode |
33360
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
1094 (fast-lock-mode -1)) |
25048
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
1095 (jit-lock-mode |
32216
82e4865603dd
(font-lock-defaults-alist): Remove the TeX entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31969
diff
changeset
|
1096 (jit-lock-unregister 'font-lock-fontify-region) |
82e4865603dd
(font-lock-defaults-alist): Remove the TeX entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31969
diff
changeset
|
1097 ;; Reset local vars to the non-jit-lock case. |
82e4865603dd
(font-lock-defaults-alist): Remove the TeX entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31969
diff
changeset
|
1098 (kill-local-variable 'font-lock-fontify-buffer-function)) |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1099 (lazy-lock-mode |
33360
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
1100 (lazy-lock-mode -1)))) |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1101 |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1102 (defun font-lock-after-fontify-buffer () |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1103 (cond (fast-lock-mode |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1104 (fast-lock-after-fontify-buffer)) |
29709
69ac77ea153c
(font-lock-after-fontify-buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28891
diff
changeset
|
1105 ;; Useless now that jit-lock intercepts font-lock-fontify-buffer. -sm |
69ac77ea153c
(font-lock-after-fontify-buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28891
diff
changeset
|
1106 ;; (jit-lock-mode |
69ac77ea153c
(font-lock-after-fontify-buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28891
diff
changeset
|
1107 ;; (jit-lock-after-fontify-buffer)) |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1108 (lazy-lock-mode |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1109 (lazy-lock-after-fontify-buffer)))) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1110 |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1111 (defun font-lock-after-unfontify-buffer () |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1112 (cond (fast-lock-mode |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1113 (fast-lock-after-unfontify-buffer)) |
29709
69ac77ea153c
(font-lock-after-fontify-buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28891
diff
changeset
|
1114 ;; Useless as well. It's only called when: |
69ac77ea153c
(font-lock-after-fontify-buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28891
diff
changeset
|
1115 ;; - turning off font-lock: it does not matter if we leave spurious |
69ac77ea153c
(font-lock-after-fontify-buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28891
diff
changeset
|
1116 ;; `fontified' text props around since jit-lock-mode is also off. |
69ac77ea153c
(font-lock-after-fontify-buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28891
diff
changeset
|
1117 ;; - font-lock-default-fontify-buffer fails: this is not run |
69ac77ea153c
(font-lock-after-fontify-buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28891
diff
changeset
|
1118 ;; any more anyway. -sm |
30651
61c2f9fcb8f6
* emacs-lisp/cl-indent.el (toplevel): Indent `defclass',
Sam Steingold <sds@gnu.org>
parents:
29919
diff
changeset
|
1119 ;; |
29709
69ac77ea153c
(font-lock-after-fontify-buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28891
diff
changeset
|
1120 ;; (jit-lock-mode |
69ac77ea153c
(font-lock-after-fontify-buffer)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28891
diff
changeset
|
1121 ;; (jit-lock-after-unfontify-buffer)) |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1122 (lazy-lock-mode |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1123 (lazy-lock-after-unfontify-buffer)))) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1124 |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
1125 ;;; End of Font Lock Support mode. |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1126 |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
1127 ;;; Fontification functions. |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1128 |
17055
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1129 ;; Rather than the function, e.g., `font-lock-fontify-region' containing the |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1130 ;; code to fontify a region, the function runs the function whose name is the |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1131 ;; value of the variable, e.g., `font-lock-fontify-region-function'. Normally, |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1132 ;; the value of this variable is, e.g., `font-lock-default-fontify-region' |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1133 ;; which does contain the code to fontify a region. However, the value of the |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1134 ;; variable could be anything and thus, e.g., `font-lock-fontify-region' could |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1135 ;; do anything. The indirection of the fontification functions gives major |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1136 ;; modes the capability of modifying the way font-lock.el fontifies. Major |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1137 ;; modes can modify the values of, e.g., `font-lock-fontify-region-function', |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1138 ;; via the variable `font-lock-defaults'. |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1139 ;; |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1140 ;; For example, Rmail mode sets the variable `font-lock-defaults' so that |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1141 ;; font-lock.el uses its own function for buffer fontification. This function |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1142 ;; makes fontification be on a message-by-message basis and so visiting an |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1143 ;; RMAIL file is much faster. A clever implementation of the function might |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1144 ;; fontify the headers differently than the message body. (It should, and |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1145 ;; correspondingly for Mail mode, but I can't be bothered to do the work. Can |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1146 ;; you?) This hints at a more interesting use... |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1147 ;; |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1148 ;; Languages that contain text normally contained in different major modes |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1149 ;; could define their own fontification functions that treat text differently |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1150 ;; depending on its context. For example, Perl mode could arrange that here |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1151 ;; docs are fontified differently than Perl code. Or Yacc mode could fontify |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1152 ;; rules one way and C code another. Neat! |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1153 ;; |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1154 ;; A further reason to use the fontification indirection feature is when the |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1155 ;; default syntactual fontification, or the default fontification in general, |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1156 ;; is not flexible enough for a particular major mode. For example, perhaps |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1157 ;; comments are just too hairy for `font-lock-fontify-syntactically-region' to |
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1158 ;; cope with. You need to write your own version of that function, e.g., |
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1159 ;; `hairy-fontify-syntactically-region', and make your own version of |
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1160 ;; `hairy-fontify-region' call that function before calling |
17055
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1161 ;; `font-lock-fontify-keywords-region' for the normal regexp fontification |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1162 ;; pass. And Hairy mode would set `font-lock-defaults' so that font-lock.el |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1163 ;; would call your region fontification function instead of its own. For |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1164 ;; example, TeX modes could fontify {\foo ...} and \bar{...} etc. multi-line |
17055
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1165 ;; directives correctly and cleanly. (It is the same problem as fontifying |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1166 ;; multi-line strings and comments; regexps are not appropriate for the job.) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1167 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1168 ;;;###autoload |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1169 (defun font-lock-fontify-buffer () |
26620 | 1170 "Fontify the current buffer the way the function `font-lock-mode' would." |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1171 (interactive) |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1172 (let ((font-lock-verbose (or font-lock-verbose (interactive-p)))) |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1173 (funcall font-lock-fontify-buffer-function))) |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1174 |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1175 (defun font-lock-unfontify-buffer () |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1176 (funcall font-lock-unfontify-buffer-function)) |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1177 |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1178 (defun font-lock-fontify-region (beg end &optional loudly) |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1179 (funcall font-lock-fontify-region-function beg end loudly)) |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1180 |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1181 (defun font-lock-unfontify-region (beg end) |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1182 (funcall font-lock-unfontify-region-function beg end)) |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1183 |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1184 (defun font-lock-default-fontify-buffer () |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1185 (let ((verbose (if (numberp font-lock-verbose) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1186 (> (buffer-size) font-lock-verbose) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1187 font-lock-verbose))) |
23751
3fdde7281f9b
* font-lock.el (font-lock-defaults): Doc fix.
Simon Marshall <simon@gnu.org>
parents:
23163
diff
changeset
|
1188 (with-temp-message |
24002
c6bfff41f2b5
* font-lock.el (font-lock-default-fontify-buffer): When using
Simon Marshall <simon@gnu.org>
parents:
23826
diff
changeset
|
1189 (when verbose |
c6bfff41f2b5
* font-lock.el (font-lock-default-fontify-buffer): When using
Simon Marshall <simon@gnu.org>
parents:
23826
diff
changeset
|
1190 (format "Fontifying %s..." (buffer-name))) |
23751
3fdde7281f9b
* font-lock.el (font-lock-defaults): Doc fix.
Simon Marshall <simon@gnu.org>
parents:
23163
diff
changeset
|
1191 ;; Make sure we have the right `font-lock-keywords' etc. |
3fdde7281f9b
* font-lock.el (font-lock-defaults): Doc fix.
Simon Marshall <simon@gnu.org>
parents:
23163
diff
changeset
|
1192 (unless font-lock-mode |
3fdde7281f9b
* font-lock.el (font-lock-defaults): Doc fix.
Simon Marshall <simon@gnu.org>
parents:
23163
diff
changeset
|
1193 (font-lock-set-defaults)) |
3fdde7281f9b
* font-lock.el (font-lock-defaults): Doc fix.
Simon Marshall <simon@gnu.org>
parents:
23163
diff
changeset
|
1194 ;; Make sure we fontify etc. in the whole buffer. |
3fdde7281f9b
* font-lock.el (font-lock-defaults): Doc fix.
Simon Marshall <simon@gnu.org>
parents:
23163
diff
changeset
|
1195 (save-restriction |
3fdde7281f9b
* font-lock.el (font-lock-defaults): Doc fix.
Simon Marshall <simon@gnu.org>
parents:
23163
diff
changeset
|
1196 (widen) |
3fdde7281f9b
* font-lock.el (font-lock-defaults): Doc fix.
Simon Marshall <simon@gnu.org>
parents:
23163
diff
changeset
|
1197 (condition-case nil |
3fdde7281f9b
* font-lock.el (font-lock-defaults): Doc fix.
Simon Marshall <simon@gnu.org>
parents:
23163
diff
changeset
|
1198 (save-excursion |
3fdde7281f9b
* font-lock.el (font-lock-defaults): Doc fix.
Simon Marshall <simon@gnu.org>
parents:
23163
diff
changeset
|
1199 (save-match-data |
3fdde7281f9b
* font-lock.el (font-lock-defaults): Doc fix.
Simon Marshall <simon@gnu.org>
parents:
23163
diff
changeset
|
1200 (font-lock-fontify-region (point-min) (point-max) verbose) |
3fdde7281f9b
* font-lock.el (font-lock-defaults): Doc fix.
Simon Marshall <simon@gnu.org>
parents:
23163
diff
changeset
|
1201 (font-lock-after-fontify-buffer) |
3fdde7281f9b
* font-lock.el (font-lock-defaults): Doc fix.
Simon Marshall <simon@gnu.org>
parents:
23163
diff
changeset
|
1202 (setq font-lock-fontified t))) |
3fdde7281f9b
* font-lock.el (font-lock-defaults): Doc fix.
Simon Marshall <simon@gnu.org>
parents:
23163
diff
changeset
|
1203 ;; We don't restore the old fontification, so it's best to unfontify. |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1204 (quit (font-lock-unfontify-buffer))))))) |
13701
1dab6f0d9239
Don't turn on in any buffer with a leading space in its name.
Simon Marshall <simon@gnu.org>
parents:
13641
diff
changeset
|
1205 |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1206 (defun font-lock-default-unfontify-buffer () |
17055
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1207 ;; Make sure we unfontify etc. in the whole buffer. |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1208 (save-restriction |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1209 (widen) |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1210 (font-lock-unfontify-region (point-min) (point-max)) |
14374
e2423983be05
Support for local fontification.
Simon Marshall <simon@gnu.org>
parents:
14365
diff
changeset
|
1211 (font-lock-after-unfontify-buffer) |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1212 (setq font-lock-fontified nil))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1213 |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1214 (defun font-lock-default-fontify-region (beg end loudly) |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1215 (save-buffer-state |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1216 ((parse-sexp-lookup-properties font-lock-syntactic-keywords) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1217 (old-syntax-table (syntax-table))) |
13440
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1218 (unwind-protect |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1219 (save-restriction |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1220 (widen) |
13440
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1221 ;; Use the fontification syntax table, if any. |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
1222 (when font-lock-syntax-table |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
1223 (set-syntax-table font-lock-syntax-table)) |
25596
359d6e7a6ffc
(font-lock-multiline): New text property contains
Richard M. Stallman <rms@gnu.org>
parents:
25331
diff
changeset
|
1224 ;; check to see if we should expand the beg/end area for |
359d6e7a6ffc
(font-lock-multiline): New text property contains
Richard M. Stallman <rms@gnu.org>
parents:
25331
diff
changeset
|
1225 ;; proper multiline matches |
35419
e233da20040a
(font-lock-multiline): Default to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
35195
diff
changeset
|
1226 (when (and font-lock-multiline |
e233da20040a
(font-lock-multiline): Default to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
35195
diff
changeset
|
1227 (> beg (point-min)) |
32216
82e4865603dd
(font-lock-defaults-alist): Remove the TeX entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31969
diff
changeset
|
1228 (get-text-property (1- beg) 'font-lock-multiline)) |
82e4865603dd
(font-lock-defaults-alist): Remove the TeX entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31969
diff
changeset
|
1229 ;; We are just after or in a multiline match. |
82e4865603dd
(font-lock-defaults-alist): Remove the TeX entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31969
diff
changeset
|
1230 (setq beg (or (previous-single-property-change |
82e4865603dd
(font-lock-defaults-alist): Remove the TeX entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31969
diff
changeset
|
1231 beg 'font-lock-multiline) |
33163
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1232 (point-min))) |
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1233 (goto-char beg) |
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1234 (setq beg (line-beginning-position))) |
35422
1f7abd8b98dd
(font-lock-default-fontify-region): Fix last
Gerd Moellmann <gerd@gnu.org>
parents:
35419
diff
changeset
|
1235 (when font-lock-multiline |
1f7abd8b98dd
(font-lock-default-fontify-region): Fix last
Gerd Moellmann <gerd@gnu.org>
parents:
35419
diff
changeset
|
1236 (setq end (or (text-property-any end (point-max) |
1f7abd8b98dd
(font-lock-default-fontify-region): Fix last
Gerd Moellmann <gerd@gnu.org>
parents:
35419
diff
changeset
|
1237 'font-lock-multiline nil) |
1f7abd8b98dd
(font-lock-default-fontify-region): Fix last
Gerd Moellmann <gerd@gnu.org>
parents:
35419
diff
changeset
|
1238 (point-max)))) |
33163
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1239 (goto-char end) |
34324
4d26cf62962c
(font-lock-default-fontify-region):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33642
diff
changeset
|
1240 (setq end (line-beginning-position 2)) |
13440
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1241 ;; Now do the fontification. |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
1242 (font-lock-unfontify-region beg end) |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1243 (when font-lock-syntactic-keywords |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1244 (font-lock-fontify-syntactic-keywords-region beg end)) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
1245 (unless font-lock-keywords-only |
13440
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1246 (font-lock-fontify-syntactically-region beg end loudly)) |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1247 (font-lock-fontify-keywords-region beg end loudly)) |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1248 ;; Clean up. |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
1249 (set-syntax-table old-syntax-table)))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1250 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1251 ;; The following must be rethought, since keywords can override fontification. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1252 ; ;; Now scan for keywords, but not if we are inside a comment now. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1253 ; (or (and (not font-lock-keywords-only) |
26620 | 1254 ; (let ((state (parse-partial-sexp beg end nil nil |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1255 ; font-lock-cache-state))) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1256 ; (or (nth 4 state) (nth 7 state)))) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1257 ; (font-lock-fontify-keywords-region beg end)) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1258 |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1259 (defvar font-lock-extra-managed-props nil |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1260 "Additional text properties managed by font-lock. |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1261 This is used by `font-lock-default-unfontify-region' to decide |
43736 | 1262 what properties to clear before refontifying a region. |
1263 Since it is more or less directly passed to `remove-text-properties', | |
1264 it should have the shape of a property list (i.e. every other element | |
1265 is ignored).") | |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1266 |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1267 (defun font-lock-default-unfontify-region (beg end) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
1268 (save-buffer-state nil |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1269 (remove-text-properties |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1270 beg end (append |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1271 font-lock-extra-managed-props |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1272 (if font-lock-syntactic-keywords |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1273 '(face nil syntax-table nil font-lock-multiline nil) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1274 '(face nil font-lock-multiline nil)))))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1275 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1276 ;; Called when any modification is made to buffer text. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1277 (defun font-lock-after-change-function (beg end old-len) |
18463
4f630b3e8f43
split up scheme and tex support; wrap inhibit-point-motion-hooks where nec.
Simon Marshall <simon@gnu.org>
parents:
18332
diff
changeset
|
1278 (let ((inhibit-point-motion-hooks t)) |
4f630b3e8f43
split up scheme and tex support; wrap inhibit-point-motion-hooks where nec.
Simon Marshall <simon@gnu.org>
parents:
18332
diff
changeset
|
1279 (save-excursion |
4f630b3e8f43
split up scheme and tex support; wrap inhibit-point-motion-hooks where nec.
Simon Marshall <simon@gnu.org>
parents:
18332
diff
changeset
|
1280 (save-match-data |
4f630b3e8f43
split up scheme and tex support; wrap inhibit-point-motion-hooks where nec.
Simon Marshall <simon@gnu.org>
parents:
18332
diff
changeset
|
1281 ;; Rescan between start of lines enclosing the region. |
4f630b3e8f43
split up scheme and tex support; wrap inhibit-point-motion-hooks where nec.
Simon Marshall <simon@gnu.org>
parents:
18332
diff
changeset
|
1282 (font-lock-fontify-region |
4f630b3e8f43
split up scheme and tex support; wrap inhibit-point-motion-hooks where nec.
Simon Marshall <simon@gnu.org>
parents:
18332
diff
changeset
|
1283 (progn (goto-char beg) (beginning-of-line) (point)) |
4f630b3e8f43
split up scheme and tex support; wrap inhibit-point-motion-hooks where nec.
Simon Marshall <simon@gnu.org>
parents:
18332
diff
changeset
|
1284 (progn (goto-char end) (forward-line 1) (point))))))) |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1285 |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1286 (defun font-lock-fontify-block (&optional arg) |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1287 "Fontify some lines the way `font-lock-fontify-buffer' would. |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1288 The lines could be a function or paragraph, or a specified number of lines. |
14516
9360c3107669
Moved `supported' from turn-on-font-lock-if-supported to turn-on-font-lock.
Simon Marshall <simon@gnu.org>
parents:
14468
diff
changeset
|
1289 If ARG is given, fontify that many lines before and after point, or 16 lines if |
9360c3107669
Moved `supported' from turn-on-font-lock-if-supported to turn-on-font-lock.
Simon Marshall <simon@gnu.org>
parents:
14468
diff
changeset
|
1290 no ARG is given and `font-lock-mark-block-function' is nil. |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1291 If `font-lock-mark-block-function' non-nil and no ARG is given, it is used to |
14516
9360c3107669
Moved `supported' from turn-on-font-lock-if-supported to turn-on-font-lock.
Simon Marshall <simon@gnu.org>
parents:
14468
diff
changeset
|
1292 delimit the region to fontify." |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1293 (interactive "P") |
18463
4f630b3e8f43
split up scheme and tex support; wrap inhibit-point-motion-hooks where nec.
Simon Marshall <simon@gnu.org>
parents:
18332
diff
changeset
|
1294 (let ((inhibit-point-motion-hooks t) font-lock-beginning-of-syntax-function |
4f630b3e8f43
split up scheme and tex support; wrap inhibit-point-motion-hooks where nec.
Simon Marshall <simon@gnu.org>
parents:
18332
diff
changeset
|
1295 deactivate-mark) |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1296 ;; Make sure we have the right `font-lock-keywords' etc. |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1297 (if (not font-lock-mode) (font-lock-set-defaults)) |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1298 (save-excursion |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1299 (save-match-data |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1300 (condition-case error-data |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1301 (if (or arg (not font-lock-mark-block-function)) |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1302 (let ((lines (if arg (prefix-numeric-value arg) 16))) |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1303 (font-lock-fontify-region |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1304 (save-excursion (forward-line (- lines)) (point)) |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1305 (save-excursion (forward-line lines) (point)))) |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1306 (funcall font-lock-mark-block-function) |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1307 (font-lock-fontify-region (point) (mark))) |
15442
b4c8360e450e
(global-font-lock-mode): Set up find-file-hooks.
Richard M. Stallman <rms@gnu.org>
parents:
14780
diff
changeset
|
1308 ((error quit) (message "Fontifying block...%s" error-data))))))) |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1309 |
14778
af95abc39d75
(font-lock-fontify-block): Use facemenu-keymap to make the binding.
Richard M. Stallman <rms@gnu.org>
parents:
14735
diff
changeset
|
1310 (define-key facemenu-keymap "\M-g" 'font-lock-fontify-block) |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
1311 |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
1312 ;;; End of Fontification functions. |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1313 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1314 ;;; Additional text property functions. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1315 |
16852
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1316 ;; The following text property functions should be builtins. This means they |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1317 ;; should be written in C and put with all the other text property functions. |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1318 ;; In the meantime, those that are used by font-lock.el are defined in Lisp |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1319 ;; below and given a `font-lock-' prefix. Those that are not used are defined |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1320 ;; in Lisp below and commented out. sm. |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1321 |
16852
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1322 (defun font-lock-prepend-text-property (start end prop value &optional object) |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1323 "Prepend to one property of the text from START to END. |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1324 Arguments PROP and VALUE specify the property and value to prepend to the value |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1325 already in place. The resulting property values are always lists. |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1326 Optional argument OBJECT is the string or buffer containing the text." |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1327 (let ((val (if (listp value) value (list value))) next prev) |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1328 (while (/= start end) |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1329 (setq next (next-single-property-change start prop object end) |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1330 prev (get-text-property start prop object)) |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1331 (put-text-property start next prop |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1332 (append val (if (listp prev) prev (list prev))) |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1333 object) |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1334 (setq start next)))) |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1335 |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1336 (defun font-lock-append-text-property (start end prop value &optional object) |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1337 "Append to one property of the text from START to END. |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1338 Arguments PROP and VALUE specify the property and value to append to the value |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1339 already in place. The resulting property values are always lists. |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1340 Optional argument OBJECT is the string or buffer containing the text." |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1341 (let ((val (if (listp value) value (list value))) next prev) |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1342 (while (/= start end) |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1343 (setq next (next-single-property-change start prop object end) |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1344 prev (get-text-property start prop object)) |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1345 (put-text-property start next prop |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1346 (append (if (listp prev) prev (list prev)) val) |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1347 object) |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1348 (setq start next)))) |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1349 |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1350 (defun font-lock-fillin-text-property (start end prop value &optional object) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1351 "Fill in one property of the text from START to END. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1352 Arguments PROP and VALUE specify the property and value to put where none are |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1353 already in place. Therefore existing property values are not overwritten. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1354 Optional argument OBJECT is the string or buffer containing the text." |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1355 (let ((start (text-property-any start end prop nil object)) next) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1356 (while start |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1357 (setq next (next-single-property-change start prop object end)) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1358 (put-text-property start next prop value object) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1359 (setq start (text-property-any next end prop nil object))))) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1360 |
16852
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1361 ;; For completeness: this is to `remove-text-properties' as `put-text-property' |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1362 ;; is to `add-text-properties', etc. |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1363 ;(defun remove-text-property (start end property &optional object) |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1364 ; "Remove a property from text from START to END. |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1365 ;Argument PROPERTY is the property to remove. |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1366 ;Optional argument OBJECT is the string or buffer containing the text. |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1367 ;Return t if the property was actually removed, nil otherwise." |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1368 ; (remove-text-properties start end (list property) object)) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1369 |
16852
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1370 ;; For consistency: maybe this should be called `remove-single-property' like |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1371 ;; `next-single-property-change' (not `next-single-text-property-change'), etc. |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1372 ;(defun remove-single-text-property (start end prop value &optional object) |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1373 ; "Remove a specific property value from text from START to END. |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1374 ;Arguments PROP and VALUE specify the property and value to remove. The |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1375 ;resulting property values are not equal to VALUE nor lists containing VALUE. |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1376 ;Optional argument OBJECT is the string or buffer containing the text." |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1377 ; (let ((start (text-property-not-all start end prop nil object)) next prev) |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1378 ; (while start |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1379 ; (setq next (next-single-property-change start prop object end) |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1380 ; prev (get-text-property start prop object)) |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1381 ; (cond ((and (symbolp prev) (eq value prev)) |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1382 ; (remove-text-property start next prop object)) |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1383 ; ((and (listp prev) (memq value prev)) |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1384 ; (let ((new (delq value prev))) |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1385 ; (cond ((null new) |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1386 ; (remove-text-property start next prop object)) |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1387 ; ((= (length new) 1) |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1388 ; (put-text-property start next prop (car new) object)) |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1389 ; (t |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1390 ; (put-text-property start next prop new object)))))) |
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1391 ; (setq start (text-property-not-all next end prop nil object))))) |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
1392 |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
1393 ;;; End of Additional text property functions. |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1394 |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1395 ;;; Syntactic regexp fontification functions. |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1396 |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1397 ;; These syntactic keyword pass functions are identical to those keyword pass |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1398 ;; functions below, with the following exceptions; (a) they operate on |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1399 ;; `font-lock-syntactic-keywords' of course, (b) they are all `defun' as speed |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1400 ;; is less of an issue, (c) eval of property value does not occur JIT as speed |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1401 ;; is less of an issue, (d) OVERRIDE cannot be `prepend' or `append' as it |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1402 ;; makes no sense for `syntax-table' property values, (e) they do not do it |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1403 ;; LOUDLY as it is not likely to be intensive. |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1404 |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1405 (defun font-lock-apply-syntactic-highlight (highlight) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1406 "Apply HIGHLIGHT following a match. |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1407 HIGHLIGHT should be of the form MATCH-HIGHLIGHT, |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1408 see `font-lock-syntactic-keywords'." |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1409 (let* ((match (nth 0 highlight)) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1410 (start (match-beginning match)) (end (match-end match)) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1411 (value (nth 1 highlight)) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1412 (override (nth 2 highlight))) |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1413 (if (not start) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1414 ;; No match but we might not signal an error. |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1415 (or (nth 3 highlight) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1416 (error "No match %d in highlight %S" match highlight)) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1417 (when (and (consp value) (not (numberp (car value)))) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1418 (setq value (eval value))) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1419 (when (stringp value) (setq value (string-to-syntax value))) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1420 ;; Flush the syntax-cache. I believe this is not necessary for |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1421 ;; font-lock's use of syntax-ppss, but I'm not 100% sure and it can |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1422 ;; still be necessary for other users of syntax-ppss anyway. |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1423 (syntax-ppss-after-change-function start) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1424 (cond |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1425 ((not override) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1426 ;; Cannot override existing fontification. |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1427 (or (text-property-not-all start end 'syntax-table nil) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1428 (put-text-property start end 'syntax-table value))) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1429 ((eq override t) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1430 ;; Override existing fontification. |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1431 (put-text-property start end 'syntax-table value)) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1432 ((eq override 'keep) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1433 ;; Keep existing fontification. |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1434 (font-lock-fillin-text-property start end 'syntax-table value)))))) |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1435 |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1436 (defun font-lock-fontify-syntactic-anchored-keywords (keywords limit) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1437 "Fontify according to KEYWORDS until LIMIT. |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1438 KEYWORDS should be of the form MATCH-ANCHORED, see `font-lock-keywords', |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1439 LIMIT can be modified by the value of its PRE-MATCH-FORM." |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1440 (let ((matcher (nth 0 keywords)) (lowdarks (nthcdr 3 keywords)) highlights |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1441 ;; Evaluate PRE-MATCH-FORM. |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1442 (pre-match-value (eval (nth 1 keywords)))) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1443 ;; Set LIMIT to value of PRE-MATCH-FORM or the end of line. |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1444 (if (and (numberp pre-match-value) (> pre-match-value (point))) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1445 (setq limit pre-match-value) |
27636
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
1446 (setq limit (line-end-position))) |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1447 (save-match-data |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1448 ;; Find an occurrence of `matcher' before `limit'. |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1449 (while (if (stringp matcher) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1450 (re-search-forward matcher limit t) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1451 (funcall matcher limit)) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1452 ;; Apply each highlight to this instance of `matcher'. |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1453 (setq highlights lowdarks) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1454 (while highlights |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1455 (font-lock-apply-syntactic-highlight (car highlights)) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1456 (setq highlights (cdr highlights))))) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1457 ;; Evaluate POST-MATCH-FORM. |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1458 (eval (nth 2 keywords)))) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1459 |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1460 (defun font-lock-fontify-syntactic-keywords-region (start end) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1461 "Fontify according to `font-lock-syntactic-keywords' between START and END. |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1462 START should be at the beginning of a line." |
32483
09a7b2ac5750
(font-lock-syntactically-fontified): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32474
diff
changeset
|
1463 ;; Ensure the beginning of the file is properly syntactic-fontified. |
09a7b2ac5750
(font-lock-syntactically-fontified): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32474
diff
changeset
|
1464 (when (and font-lock-syntactically-fontified |
09a7b2ac5750
(font-lock-syntactically-fontified): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32474
diff
changeset
|
1465 (< font-lock-syntactically-fontified start)) |
09a7b2ac5750
(font-lock-syntactically-fontified): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32474
diff
changeset
|
1466 (setq start (max font-lock-syntactically-fontified (point-min))) |
09a7b2ac5750
(font-lock-syntactically-fontified): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32474
diff
changeset
|
1467 (setq font-lock-syntactically-fontified end)) |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1468 ;; If `font-lock-syntactic-keywords' is a symbol, get the real keywords. |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1469 (when (symbolp font-lock-syntactic-keywords) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1470 (setq font-lock-syntactic-keywords (font-lock-eval-keywords |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1471 font-lock-syntactic-keywords))) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1472 ;; If `font-lock-syntactic-keywords' is not compiled, compile it. |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1473 (unless (eq (car font-lock-syntactic-keywords) t) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1474 (setq font-lock-syntactic-keywords (font-lock-compile-keywords |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1475 font-lock-syntactic-keywords))) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1476 ;; Get down to business. |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1477 (let ((case-fold-search font-lock-keywords-case-fold-search) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1478 (keywords (cdr font-lock-syntactic-keywords)) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1479 keyword matcher highlights) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1480 (while keywords |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1481 ;; Find an occurrence of `matcher' from `start' to `end'. |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1482 (setq keyword (car keywords) matcher (car keyword)) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1483 (goto-char start) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1484 (while (if (stringp matcher) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1485 (re-search-forward matcher end t) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1486 (funcall matcher end)) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1487 ;; Apply each highlight to this instance of `matcher', which may be |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1488 ;; specific highlights or more keywords anchored to `matcher'. |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1489 (setq highlights (cdr keyword)) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1490 (while highlights |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1491 (if (numberp (car (car highlights))) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1492 (font-lock-apply-syntactic-highlight (car highlights)) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1493 (font-lock-fontify-syntactic-anchored-keywords (car highlights) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1494 end)) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1495 (setq highlights (cdr highlights)))) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1496 (setq keywords (cdr keywords))))) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1497 |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1498 ;;; End of Syntactic regexp fontification functions. |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1499 |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1500 ;;; Syntactic fontification functions. |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1501 |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1502 (defun font-lock-fontify-syntactically-region (start end &optional loudly ppss) |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1503 "Put proper face on each string and comment between START and END. |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1504 START should be at the beginning of a line." |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1505 (let (state face beg) |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1506 (if loudly (message "Fontifying %s... (syntactically...)" (buffer-name))) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1507 (goto-char start) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1508 ;; |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1509 ;; Find the state at the `beginning-of-line' before `start'. |
41513
92d06d8cd81d
(font-lock-cache-state, font-lock-cache-position)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41226
diff
changeset
|
1510 (setq state (or ppss (syntax-ppss start))) |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1511 ;; |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1512 ;; Find each interesting place between here and `end'. |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1513 (while |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1514 (progn |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1515 (when (or (nth 3 state) (nth 4 state)) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1516 (setq face (funcall font-lock-syntactic-face-function state)) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1517 (setq beg (max (nth 8 state) start)) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1518 (setq state (parse-partial-sexp (point) end nil nil state |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1519 'syntax-table)) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1520 (when face (put-text-property beg (point) 'face face))) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1521 (setq state (parse-partial-sexp (point) end nil nil state |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1522 'syntax-table)) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1523 (< (point) end))))) |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1524 |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1525 ;;; End of Syntactic fontification functions. |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1526 |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1527 ;;; Keyword regexp fontification functions. |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1528 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1529 (defsubst font-lock-apply-highlight (highlight) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1530 "Apply HIGHLIGHT following a match. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1531 HIGHLIGHT should be of the form MATCH-HIGHLIGHT, see `font-lock-keywords'." |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1532 (let* ((match (nth 0 highlight)) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1533 (start (match-beginning match)) (end (match-end match)) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1534 (override (nth 2 highlight))) |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1535 (if (not start) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1536 ;; No match but we might not signal an error. |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1537 (or (nth 3 highlight) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1538 (error "No match %d in highlight %S" match highlight)) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1539 (let ((val (eval (nth 1 highlight)))) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1540 (when (eq (car-safe val) 'face) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1541 (add-text-properties start end (cddr val)) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1542 (setq val (cadr val))) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1543 (cond |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1544 ((not override) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1545 ;; Cannot override existing fontification. |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1546 (or (text-property-not-all start end 'face nil) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1547 (put-text-property start end 'face val))) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1548 ((eq override t) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1549 ;; Override existing fontification. |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1550 (put-text-property start end 'face val)) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1551 ((eq override 'prepend) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1552 ;; Prepend to existing fontification. |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1553 (font-lock-prepend-text-property start end 'face val)) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1554 ((eq override 'append) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1555 ;; Append to existing fontification. |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1556 (font-lock-append-text-property start end 'face val)) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1557 ((eq override 'keep) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1558 ;; Keep existing fontification. |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1559 (font-lock-fillin-text-property start end 'face val))))))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1560 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1561 (defsubst font-lock-fontify-anchored-keywords (keywords limit) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1562 "Fontify according to KEYWORDS until LIMIT. |
17055
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1563 KEYWORDS should be of the form MATCH-ANCHORED, see `font-lock-keywords', |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1564 LIMIT can be modified by the value of its PRE-MATCH-FORM." |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1565 (let ((matcher (nth 0 keywords)) (lowdarks (nthcdr 3 keywords)) highlights |
25596
359d6e7a6ffc
(font-lock-multiline): New text property contains
Richard M. Stallman <rms@gnu.org>
parents:
25331
diff
changeset
|
1566 (lead-start (match-beginning 0)) |
17055
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1567 ;; Evaluate PRE-MATCH-FORM. |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1568 (pre-match-value (eval (nth 1 keywords)))) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1569 ;; Set LIMIT to value of PRE-MATCH-FORM or the end of line. |
25596
359d6e7a6ffc
(font-lock-multiline): New text property contains
Richard M. Stallman <rms@gnu.org>
parents:
25331
diff
changeset
|
1570 (if (not (and (numberp pre-match-value) (> pre-match-value (point)))) |
27636
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
1571 (setq limit (line-end-position)) |
25596
359d6e7a6ffc
(font-lock-multiline): New text property contains
Richard M. Stallman <rms@gnu.org>
parents:
25331
diff
changeset
|
1572 (setq limit pre-match-value) |
33163
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1573 (when (and font-lock-multiline (>= limit (line-beginning-position 2))) |
25596
359d6e7a6ffc
(font-lock-multiline): New text property contains
Richard M. Stallman <rms@gnu.org>
parents:
25331
diff
changeset
|
1574 ;; this is a multiline anchored match |
33163
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1575 ;; (setq font-lock-multiline t) |
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1576 (put-text-property (if (= limit (line-beginning-position 2)) |
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1577 (1- limit) |
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1578 (min lead-start (point))) |
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1579 limit |
32216
82e4865603dd
(font-lock-defaults-alist): Remove the TeX entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31969
diff
changeset
|
1580 'font-lock-multiline t))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1581 (save-match-data |
13440
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1582 ;; Find an occurrence of `matcher' before `limit'. |
28087
9ca294cf76c7
(font-lock-keywords): Fix the doc now that regexp-opt-depth is unnecessary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28069
diff
changeset
|
1583 (while (and (< (point) limit) |
9ca294cf76c7
(font-lock-keywords): Fix the doc now that regexp-opt-depth is unnecessary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28069
diff
changeset
|
1584 (if (stringp matcher) |
9ca294cf76c7
(font-lock-keywords): Fix the doc now that regexp-opt-depth is unnecessary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28069
diff
changeset
|
1585 (re-search-forward matcher limit t) |
9ca294cf76c7
(font-lock-keywords): Fix the doc now that regexp-opt-depth is unnecessary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28069
diff
changeset
|
1586 (funcall matcher limit))) |
13440
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1587 ;; Apply each highlight to this instance of `matcher'. |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1588 (setq highlights lowdarks) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1589 (while highlights |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1590 (font-lock-apply-highlight (car highlights)) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1591 (setq highlights (cdr highlights))))) |
13440
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1592 ;; Evaluate POST-MATCH-FORM. |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1593 (eval (nth 2 keywords)))) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1594 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1595 (defun font-lock-fontify-keywords-region (start end &optional loudly) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1596 "Fontify according to `font-lock-keywords' between START and END. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1597 START should be at the beginning of a line." |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1598 (unless (eq (car font-lock-keywords) t) |
41226
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1599 (setq font-lock-keywords |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1600 (font-lock-compile-keywords font-lock-keywords t))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1601 (let ((case-fold-search font-lock-keywords-case-fold-search) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1602 (keywords (cdr font-lock-keywords)) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1603 (bufname (buffer-name)) (count 0) |
13440
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1604 keyword matcher highlights) |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1605 ;; |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1606 ;; Fontify each item in `font-lock-keywords' from `start' to `end'. |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1607 (while keywords |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1608 (if loudly (message "Fontifying %s... (regexps..%s)" bufname |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
1609 (make-string (incf count) ?.))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1610 ;; |
13440
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1611 ;; Find an occurrence of `matcher' from `start' to `end'. |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1612 (setq keyword (car keywords) matcher (car keyword)) |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1613 (goto-char start) |
25048
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
1614 (while (and (< (point) end) |
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
1615 (if (stringp matcher) |
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
1616 (re-search-forward matcher end t) |
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
1617 (funcall matcher end))) |
26775
ea2b51ce35a7
(font-lock-multiline): New variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26746
diff
changeset
|
1618 (when (and font-lock-multiline |
33163
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1619 (>= (point) |
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1620 (save-excursion (goto-char (match-beginning 0)) |
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1621 (forward-line 1) (point)))) |
25596
359d6e7a6ffc
(font-lock-multiline): New text property contains
Richard M. Stallman <rms@gnu.org>
parents:
25331
diff
changeset
|
1622 ;; this is a multiline regexp match |
33163
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1623 ;; (setq font-lock-multiline t) |
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1624 (put-text-property (if (= (point) |
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1625 (save-excursion |
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1626 (goto-char (match-beginning 0)) |
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1627 (forward-line 1) (point))) |
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1628 (1- (point)) |
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1629 (match-beginning 0)) |
aebffd7162d1
(font-lock-buffers): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32573
diff
changeset
|
1630 (point) |
25596
359d6e7a6ffc
(font-lock-multiline): New text property contains
Richard M. Stallman <rms@gnu.org>
parents:
25331
diff
changeset
|
1631 'font-lock-multiline t)) |
13440
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1632 ;; Apply each highlight to this instance of `matcher', which may be |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1633 ;; specific highlights or more keywords anchored to `matcher'. |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1634 (setq highlights (cdr keyword)) |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1635 (while highlights |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1636 (if (numberp (car (car highlights))) |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1637 (font-lock-apply-highlight (car highlights)) |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1638 (font-lock-fontify-anchored-keywords (car highlights) end)) |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1639 (setq highlights (cdr highlights)))) |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1640 (setq keywords (cdr keywords))))) |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
1641 |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1642 ;;; End of Keyword regexp fontification functions. |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1643 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1644 ;; Various functions. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1645 |
41226
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1646 (defun font-lock-compile-keywords (keywords &optional regexp) |
26620 | 1647 "Compile KEYWORDS into the form (t KEYWORD ...). |
1648 Here KEYWORD is of the form (MATCHER HIGHLIGHT ...) as shown in the | |
41226
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1649 `font-lock-keywords' doc string. |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1650 If REGEXP is non-nil, it means these keywords are used for |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1651 `font-lock-keywords' rather than for `font-lock-syntactic-keywords'." |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1652 (if (eq (car-safe keywords) t) |
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1653 keywords |
41226
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1654 (setq keywords (cons t (mapcar 'font-lock-compile-keyword keywords))) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1655 (if (and regexp |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1656 (eq (or syntax-begin-function |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1657 font-lock-beginning-of-syntax-function) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1658 'beginning-of-defun) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1659 (not beginning-of-defun-function)) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1660 ;; Try to detect when a string or comment contains something that |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1661 ;; looks like a defun and would thus confuse font-lock. |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1662 (nconc keywords |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1663 `((,(if defun-prompt-regexp |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1664 (concat "^\\(?:" defun-prompt-regexp "\\)?\\s(") |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1665 "^\\s(") |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1666 (0 |
41513
92d06d8cd81d
(font-lock-cache-state, font-lock-cache-position)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41226
diff
changeset
|
1667 (if (memq (get-text-property (1- (point)) 'face) |
41226
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1668 '(font-lock-string-face font-lock-doc-face |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1669 font-lock-comment-face)) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1670 font-lock-warning-face) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1671 prepend))))) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1672 keywords)) |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1673 |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1674 (defun font-lock-compile-keyword (keyword) |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
1675 (cond ((nlistp keyword) ; MATCHER |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1676 (list keyword '(0 font-lock-keyword-face))) |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
1677 ((eq (car keyword) 'eval) ; (eval . FORM) |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1678 (font-lock-compile-keyword (eval (cdr keyword)))) |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
1679 ((eq (car-safe (cdr keyword)) 'quote) ; (MATCHER . 'FORM) |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
1680 ;; If FORM is a FACENAME then quote it. Otherwise ignore the quote. |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
1681 (if (symbolp (nth 2 keyword)) |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
1682 (list (car keyword) (list 0 (cdr keyword))) |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
1683 (font-lock-compile-keyword (cons (car keyword) (nth 2 keyword))))) |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
1684 ((numberp (cdr keyword)) ; (MATCHER . MATCH) |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1685 (list (car keyword) (list (cdr keyword) 'font-lock-keyword-face))) |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
1686 ((symbolp (cdr keyword)) ; (MATCHER . FACENAME) |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1687 (list (car keyword) (list 0 (cdr keyword)))) |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
1688 ((nlistp (nth 1 keyword)) ; (MATCHER . HIGHLIGHT) |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1689 (list (car keyword) (cdr keyword))) |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
1690 (t ; (MATCHER HIGHLIGHT ...) |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1691 keyword))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1692 |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1693 (defun font-lock-eval-keywords (keywords) |
26620 | 1694 "Evalulate KEYWORDS if a function (funcall) or variable (eval) name." |
18463
4f630b3e8f43
split up scheme and tex support; wrap inhibit-point-motion-hooks where nec.
Simon Marshall <simon@gnu.org>
parents:
18332
diff
changeset
|
1695 (if (listp keywords) |
4f630b3e8f43
split up scheme and tex support; wrap inhibit-point-motion-hooks where nec.
Simon Marshall <simon@gnu.org>
parents:
18332
diff
changeset
|
1696 keywords |
4f630b3e8f43
split up scheme and tex support; wrap inhibit-point-motion-hooks where nec.
Simon Marshall <simon@gnu.org>
parents:
18332
diff
changeset
|
1697 (font-lock-eval-keywords (if (fboundp keywords) |
4f630b3e8f43
split up scheme and tex support; wrap inhibit-point-motion-hooks where nec.
Simon Marshall <simon@gnu.org>
parents:
18332
diff
changeset
|
1698 (funcall keywords) |
4f630b3e8f43
split up scheme and tex support; wrap inhibit-point-motion-hooks where nec.
Simon Marshall <simon@gnu.org>
parents:
18332
diff
changeset
|
1699 (eval keywords))))) |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
1700 |
14708
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
1701 (defun font-lock-value-in-major-mode (alist) |
26620 | 1702 "Return value in ALIST for `major-mode', or ALIST if it is not an alist. |
1703 Structure is ((MAJOR-MODE . VALUE) ...) where MAJOR-MODE may be t." | |
14708
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
1704 (if (consp alist) |
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
1705 (cdr (or (assq major-mode alist) (assq t alist))) |
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
1706 alist)) |
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
1707 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1708 (defun font-lock-choose-keywords (keywords level) |
26620 | 1709 "Return LEVELth element of KEYWORDS. |
1710 A LEVEL of nil is equal to a LEVEL of 0, a LEVEL of t is equal to | |
1711 \(1- (length KEYWORDS))." | |
32306
86a849ccfae1
(font-lock-defaults): Make buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32272
diff
changeset
|
1712 (cond ((not (and (listp keywords) (symbolp (car keywords)))) |
14708
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
1713 keywords) |
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
1714 ((numberp level) |
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
1715 (or (nth level keywords) (car (reverse keywords)))) |
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
1716 ((eq level t) |
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
1717 (car (reverse keywords))) |
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
1718 (t |
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
1719 (car keywords)))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1720 |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
1721 (defvar font-lock-set-defaults nil) ; Whether we have set up defaults. |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
1722 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1723 (defun font-lock-set-defaults () |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1724 "Set fontification defaults appropriately for this mode. |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1725 Sets various variables using `font-lock-defaults' (or, if nil, using |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1726 `font-lock-defaults-alist') and `font-lock-maximum-decoration'." |
27636
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
1727 ;; Set fontification defaults iff not previously set. |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
1728 (unless font-lock-set-defaults |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
1729 (set (make-local-variable 'font-lock-set-defaults) t) |
27636
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
1730 (make-local-variable 'font-lock-fontified) |
161ec77aa308
(font-lock-keywords): Fix doc for multiline matches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
27414
diff
changeset
|
1731 (make-local-variable 'font-lock-multiline) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
1732 (let* ((defaults (or font-lock-defaults |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
1733 (cdr (assq major-mode font-lock-defaults-alist)))) |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
1734 (keywords |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
1735 (font-lock-choose-keywords (nth 0 defaults) |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
1736 (font-lock-value-in-major-mode font-lock-maximum-decoration))) |
26920
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
1737 (local (cdr (assq major-mode font-lock-keywords-alist))) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
1738 (removed-keywords |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
1739 (cdr-safe (assq major-mode font-lock-removed-keywords-alist)))) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
1740 ;; Syntactic fontification? |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
1741 (when (nth 1 defaults) |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
1742 (set (make-local-variable 'font-lock-keywords-only) t)) |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
1743 ;; Case fold during regexp fontification? |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
1744 (when (nth 2 defaults) |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
1745 (set (make-local-variable 'font-lock-keywords-case-fold-search) t)) |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
1746 ;; Syntax table for regexp and syntactic fontification? |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
1747 (when (nth 3 defaults) |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1748 (set (make-local-variable 'font-lock-syntax-table) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1749 (copy-syntax-table (syntax-table))) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1750 (dolist (selem (nth 3 defaults)) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1751 ;; The character to modify may be a single CHAR or a STRING. |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1752 (let ((syntax (cdr selem))) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1753 (dolist (char (if (numberp (car selem)) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1754 (list (car selem)) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1755 (mapcar 'identity (car selem)))) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
1756 (modify-syntax-entry char syntax font-lock-syntax-table))))) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
1757 ;; Syntax function for syntactic fontification? |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
1758 (when (nth 4 defaults) |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
1759 (set (make-local-variable 'font-lock-beginning-of-syntax-function) |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
1760 (nth 4 defaults))) |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
1761 ;; Variable alist? |
34324
4d26cf62962c
(font-lock-default-fontify-region):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33642
diff
changeset
|
1762 (dolist (x (nthcdr 5 defaults)) |
41226
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1763 (set (make-local-variable (car x)) (cdr x))) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1764 ;; Setup `font-lock-keywords' last because its value might depend |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1765 ;; on other settings (e.g. font-lock-compile-keywords uses |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1766 ;; font-lock-beginning-of-syntax-function). |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1767 (set (make-local-variable 'font-lock-keywords) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1768 (font-lock-compile-keywords (font-lock-eval-keywords keywords) t)) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1769 ;; Local fontification? |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1770 (while local |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1771 (font-lock-add-keywords nil (car (car local)) (cdr (car local))) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1772 (setq local (cdr local))) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1773 (when removed-keywords |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
1774 (font-lock-remove-keywords nil removed-keywords))))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1775 |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
1776 ;;; Colour etc. support. |
4053 | 1777 |
17543
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1778 ;; Originally face attributes were specified via `font-lock-face-attributes'. |
18332
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
1779 ;; Users then changed the default face attributes by setting that variable. |
17543
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1780 ;; However, we try and be back-compatible and respect its value if set except |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1781 ;; for faces where M-x customize has been used to save changes for the face. |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1782 (when (boundp 'font-lock-face-attributes) |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1783 (let ((face-attributes font-lock-face-attributes)) |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1784 (while face-attributes |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1785 (let* ((face-attribute (pop face-attributes)) |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1786 (face (car face-attribute))) |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1787 ;; Rustle up a `defface' SPEC from a `font-lock-face-attributes' entry. |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1788 (unless (get face 'saved-face) |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1789 (let ((foreground (nth 1 face-attribute)) |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1790 (background (nth 2 face-attribute)) |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1791 (bold-p (nth 3 face-attribute)) |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1792 (italic-p (nth 4 face-attribute)) |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1793 (underline-p (nth 5 face-attribute)) |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1794 face-spec) |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1795 (when foreground |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1796 (setq face-spec (cons ':foreground (cons foreground face-spec)))) |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1797 (when background |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1798 (setq face-spec (cons ':background (cons background face-spec)))) |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1799 (when bold-p |
42449
b4510b1b83f3
(initializing from font-lock-face-attributes):
Richard M. Stallman <rms@gnu.org>
parents:
41934
diff
changeset
|
1800 (setq face-spec (append '(:weight bold) face-spec))) |
17543
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1801 (when italic-p |
42449
b4510b1b83f3
(initializing from font-lock-face-attributes):
Richard M. Stallman <rms@gnu.org>
parents:
41934
diff
changeset
|
1802 (setq face-spec (append '(:slant italic) face-spec))) |
17543
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1803 (when underline-p |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1804 (setq face-spec (append '(:underline t) face-spec))) |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1805 (custom-declare-face face (list (list t face-spec)) nil))))))) |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1806 |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1807 ;; But now we do it the custom way. Note that `defface' will not overwrite any |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1808 ;; faces declared above via `custom-declare-face'. |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1809 (defface font-lock-comment-face |
32573
8005157ad452
(font-lock-comment-face): Define a separate default
Eli Zaretskii <eliz@gnu.org>
parents:
32509
diff
changeset
|
1810 '((((type tty pc) (class color) (background light)) (:foreground "red")) |
38056
f912becdb93a
(font-lock-comment-face): For tty's with dark
Eli Zaretskii <eliz@gnu.org>
parents:
37829
diff
changeset
|
1811 (((type tty pc) (class color) (background dark)) (:foreground "red1")) |
25048
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
1812 (((class grayscale) (background light)) |
42449
b4510b1b83f3
(initializing from font-lock-face-attributes):
Richard M. Stallman <rms@gnu.org>
parents:
41934
diff
changeset
|
1813 (:foreground "DimGray" :weight bold :slant italic)) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1814 (((class grayscale) (background dark)) |
42449
b4510b1b83f3
(initializing from font-lock-face-attributes):
Richard M. Stallman <rms@gnu.org>
parents:
41934
diff
changeset
|
1815 (:foreground "LightGray" :weight bold :slant italic)) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1816 (((class color) (background light)) (:foreground "Firebrick")) |
32474
fc8c8c50646e
(font-lock-comment-face): Change dark-background,
Miles Bader <miles@gnu.org>
parents:
32306
diff
changeset
|
1817 (((class color) (background dark)) (:foreground "chocolate1")) |
42449
b4510b1b83f3
(initializing from font-lock-face-attributes):
Richard M. Stallman <rms@gnu.org>
parents:
41934
diff
changeset
|
1818 (t (:weight bold :slant italic))) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1819 "Font Lock mode face used to highlight comments." |
17543
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1820 :group 'font-lock-highlighting-faces) |
16852
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
1821 |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1822 (defface font-lock-string-face |
25048
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
1823 '((((type tty) (class color)) (:foreground "green")) |
42449
b4510b1b83f3
(initializing from font-lock-face-attributes):
Richard M. Stallman <rms@gnu.org>
parents:
41934
diff
changeset
|
1824 (((class grayscale) (background light)) (:foreground "DimGray" :slant italic)) |
b4510b1b83f3
(initializing from font-lock-face-attributes):
Richard M. Stallman <rms@gnu.org>
parents:
41934
diff
changeset
|
1825 (((class grayscale) (background dark)) (:foreground "LightGray" :slant italic)) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1826 (((class color) (background light)) (:foreground "RosyBrown")) |
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1827 (((class color) (background dark)) (:foreground "LightSalmon")) |
42449
b4510b1b83f3
(initializing from font-lock-face-attributes):
Richard M. Stallman <rms@gnu.org>
parents:
41934
diff
changeset
|
1828 (t (:slant italic))) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1829 "Font Lock mode face used to highlight strings." |
17543
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1830 :group 'font-lock-highlighting-faces) |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1831 |
33360
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
1832 (defface font-lock-doc-face |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
1833 '((t :inherit font-lock-string-face)) |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
1834 "Font Lock mode face used to highlight documentation." |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
1835 :group 'font-lock-highlighting-faces) |
cda8c854bb02
(font-lock-*-face) <defvar>: Move.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33163
diff
changeset
|
1836 |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1837 (defface font-lock-keyword-face |
25048
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
1838 '((((type tty) (class color)) (:foreground "cyan" :weight bold)) |
42449
b4510b1b83f3
(initializing from font-lock-face-attributes):
Richard M. Stallman <rms@gnu.org>
parents:
41934
diff
changeset
|
1839 (((class grayscale) (background light)) (:foreground "LightGray" :weight bold)) |
b4510b1b83f3
(initializing from font-lock-face-attributes):
Richard M. Stallman <rms@gnu.org>
parents:
41934
diff
changeset
|
1840 (((class grayscale) (background dark)) (:foreground "DimGray" :weight bold)) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1841 (((class color) (background light)) (:foreground "Purple")) |
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1842 (((class color) (background dark)) (:foreground "Cyan")) |
42449
b4510b1b83f3
(initializing from font-lock-face-attributes):
Richard M. Stallman <rms@gnu.org>
parents:
41934
diff
changeset
|
1843 (t (:weight bold))) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1844 "Font Lock mode face used to highlight keywords." |
17543
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1845 :group 'font-lock-highlighting-faces) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1846 |
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1847 (defface font-lock-builtin-face |
25048
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
1848 '((((type tty) (class color)) (:foreground "blue" :weight light)) |
42449
b4510b1b83f3
(initializing from font-lock-face-attributes):
Richard M. Stallman <rms@gnu.org>
parents:
41934
diff
changeset
|
1849 (((class grayscale) (background light)) (:foreground "LightGray" :weight bold)) |
b4510b1b83f3
(initializing from font-lock-face-attributes):
Richard M. Stallman <rms@gnu.org>
parents:
41934
diff
changeset
|
1850 (((class grayscale) (background dark)) (:foreground "DimGray" :weight bold)) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1851 (((class color) (background light)) (:foreground "Orchid")) |
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1852 (((class color) (background dark)) (:foreground "LightSteelBlue")) |
42449
b4510b1b83f3
(initializing from font-lock-face-attributes):
Richard M. Stallman <rms@gnu.org>
parents:
41934
diff
changeset
|
1853 (t (:weight bold))) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1854 "Font Lock mode face used to highlight builtins." |
17543
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1855 :group 'font-lock-highlighting-faces) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1856 |
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1857 (defface font-lock-function-name-face |
25048
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
1858 '((((type tty) (class color)) (:foreground "blue" :weight bold)) |
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
1859 (((class color) (background light)) (:foreground "Blue")) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1860 (((class color) (background dark)) (:foreground "LightSkyBlue")) |
42449
b4510b1b83f3
(initializing from font-lock-face-attributes):
Richard M. Stallman <rms@gnu.org>
parents:
41934
diff
changeset
|
1861 (t (:inverse-video t :weight bold))) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1862 "Font Lock mode face used to highlight function names." |
17543
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1863 :group 'font-lock-highlighting-faces) |
9487
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
1864 |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1865 (defface font-lock-variable-name-face |
25048
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
1866 '((((type tty) (class color)) (:foreground "yellow" :weight light)) |
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
1867 (((class grayscale) (background light)) |
42449
b4510b1b83f3
(initializing from font-lock-face-attributes):
Richard M. Stallman <rms@gnu.org>
parents:
41934
diff
changeset
|
1868 (:foreground "Gray90" :weight bold :slant italic)) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1869 (((class grayscale) (background dark)) |
42449
b4510b1b83f3
(initializing from font-lock-face-attributes):
Richard M. Stallman <rms@gnu.org>
parents:
41934
diff
changeset
|
1870 (:foreground "DimGray" :weight bold :slant italic)) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1871 (((class color) (background light)) (:foreground "DarkGoldenrod")) |
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1872 (((class color) (background dark)) (:foreground "LightGoldenrod")) |
42449
b4510b1b83f3
(initializing from font-lock-face-attributes):
Richard M. Stallman <rms@gnu.org>
parents:
41934
diff
changeset
|
1873 (t (:weight bold :slant italic))) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1874 "Font Lock mode face used to highlight variable names." |
17543
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1875 :group 'font-lock-highlighting-faces) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1876 |
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1877 (defface font-lock-type-face |
25048
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
1878 '((((type tty) (class color)) (:foreground "green")) |
42449
b4510b1b83f3
(initializing from font-lock-face-attributes):
Richard M. Stallman <rms@gnu.org>
parents:
41934
diff
changeset
|
1879 (((class grayscale) (background light)) (:foreground "Gray90" :weight bold)) |
b4510b1b83f3
(initializing from font-lock-face-attributes):
Richard M. Stallman <rms@gnu.org>
parents:
41934
diff
changeset
|
1880 (((class grayscale) (background dark)) (:foreground "DimGray" :weight bold)) |
18463
4f630b3e8f43
split up scheme and tex support; wrap inhibit-point-motion-hooks where nec.
Simon Marshall <simon@gnu.org>
parents:
18332
diff
changeset
|
1881 (((class color) (background light)) (:foreground "ForestGreen")) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1882 (((class color) (background dark)) (:foreground "PaleGreen")) |
42449
b4510b1b83f3
(initializing from font-lock-face-attributes):
Richard M. Stallman <rms@gnu.org>
parents:
41934
diff
changeset
|
1883 (t (:weight bold :underline t))) |
20951
ae0c93b9ac1f
Renamed font-lock-reference-face to font-lock-constant-face.
Simon Marshall <simon@gnu.org>
parents:
20923
diff
changeset
|
1884 "Font Lock mode face used to highlight type and classes." |
17543
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1885 :group 'font-lock-highlighting-faces) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1886 |
20951
ae0c93b9ac1f
Renamed font-lock-reference-face to font-lock-constant-face.
Simon Marshall <simon@gnu.org>
parents:
20923
diff
changeset
|
1887 (defface font-lock-constant-face |
25048
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
1888 '((((type tty) (class color)) (:foreground "magenta")) |
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
1889 (((class grayscale) (background light)) |
42449
b4510b1b83f3
(initializing from font-lock-face-attributes):
Richard M. Stallman <rms@gnu.org>
parents:
41934
diff
changeset
|
1890 (:foreground "LightGray" :weight bold :underline t)) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1891 (((class grayscale) (background dark)) |
42449
b4510b1b83f3
(initializing from font-lock-face-attributes):
Richard M. Stallman <rms@gnu.org>
parents:
41934
diff
changeset
|
1892 (:foreground "Gray50" :weight bold :underline t)) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1893 (((class color) (background light)) (:foreground "CadetBlue")) |
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1894 (((class color) (background dark)) (:foreground "Aquamarine")) |
42449
b4510b1b83f3
(initializing from font-lock-face-attributes):
Richard M. Stallman <rms@gnu.org>
parents:
41934
diff
changeset
|
1895 (t (:weight bold :underline t))) |
20951
ae0c93b9ac1f
Renamed font-lock-reference-face to font-lock-constant-face.
Simon Marshall <simon@gnu.org>
parents:
20923
diff
changeset
|
1896 "Font Lock mode face used to highlight constants and labels." |
17543
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1897 :group 'font-lock-highlighting-faces) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1898 |
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1899 (defface font-lock-warning-face |
25048
6d32371bea44
(top-level): Add jit-lock-mode as new support mode.
Gerd Moellmann <gerd@gnu.org>
parents:
25045
diff
changeset
|
1900 '((((type tty) (class color)) (:foreground "red")) |
42449
b4510b1b83f3
(initializing from font-lock-face-attributes):
Richard M. Stallman <rms@gnu.org>
parents:
41934
diff
changeset
|
1901 (((class color) (background light)) (:foreground "Red" :weight bold)) |
b4510b1b83f3
(initializing from font-lock-face-attributes):
Richard M. Stallman <rms@gnu.org>
parents:
41934
diff
changeset
|
1902 (((class color) (background dark)) (:foreground "Pink" :weight bold)) |
b4510b1b83f3
(initializing from font-lock-face-attributes):
Richard M. Stallman <rms@gnu.org>
parents:
41934
diff
changeset
|
1903 (t (:inverse-video t :weight bold))) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
1904 "Font Lock mode face used to highlight warnings." |
17543
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
1905 :group 'font-lock-highlighting-faces) |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
1906 |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
1907 ;;; End of Colour etc. support. |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1908 |
17055
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1909 ;;; Menu support. |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1910 |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1911 ;; This section of code is commented out because Emacs does not have real menu |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1912 ;; buttons. (We can mimic them by putting "( ) " or "(X) " at the beginning of |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1913 ;; the menu entry text, but with Xt it looks both ugly and embarrassingly |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1914 ;; amateur.) If/When Emacs gets real menus buttons, put in menu-bar.el after |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1915 ;; the entry for "Text Properties" something like: |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1916 ;; |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1917 ;; (define-key menu-bar-edit-menu [font-lock] |
20923
c6e733c90ed8
Keyword doc fixes and keyword tweaks.
Simon Marshall <simon@gnu.org>
parents:
20851
diff
changeset
|
1918 ;; (cons "Syntax Highlighting" font-lock-menu)) |
17055
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1919 ;; |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1920 ;; and remove a single ";" from the beginning of each line in the rest of this |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1921 ;; section. Probably the mechanism for telling the menu code what are menu |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1922 ;; buttons and when they are on or off needs tweaking. I have assumed that the |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1923 ;; mechanism is via `menu-toggle' and `menu-selected' symbol properties. sm. |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1924 |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1925 ;;;;###autoload |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1926 ;(progn |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1927 ; ;; Make the Font Lock menu. |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1928 ; (defvar font-lock-menu (make-sparse-keymap "Syntax Highlighting")) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1929 ; ;; Add the menu items in reverse order. |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1930 ; (define-key font-lock-menu [fontify-less] |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1931 ; '("Less In Current Buffer" . font-lock-fontify-less)) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1932 ; (define-key font-lock-menu [fontify-more] |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1933 ; '("More In Current Buffer" . font-lock-fontify-more)) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1934 ; (define-key font-lock-menu [font-lock-sep] |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1935 ; '("--")) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1936 ; (define-key font-lock-menu [font-lock-mode] |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1937 ; '("In Current Buffer" . font-lock-mode)) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1938 ; (define-key font-lock-menu [global-font-lock-mode] |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1939 ; '("In All Buffers" . global-font-lock-mode))) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1940 ; |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1941 ;;;;###autoload |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1942 ;(progn |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1943 ; ;; We put the appropriate `menu-enable' etc. symbol property values on when |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1944 ; ;; font-lock.el is loaded, so we don't need to autoload the three variables. |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1945 ; (put 'global-font-lock-mode 'menu-toggle t) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1946 ; (put 'font-lock-mode 'menu-toggle t) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1947 ; (put 'font-lock-fontify-more 'menu-enable '(identity)) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1948 ; (put 'font-lock-fontify-less 'menu-enable '(identity))) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1949 ; |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1950 ;;; Put the appropriate symbol property values on now. See above. |
20923
c6e733c90ed8
Keyword doc fixes and keyword tweaks.
Simon Marshall <simon@gnu.org>
parents:
20851
diff
changeset
|
1951 ;(put 'global-font-lock-mode 'menu-selected 'global-font-lock-mode) |
17055
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1952 ;(put 'font-lock-mode 'menu-selected 'font-lock-mode) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1953 ;(put 'font-lock-fontify-more 'menu-enable '(nth 2 font-lock-fontify-level)) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1954 ;(put 'font-lock-fontify-less 'menu-enable '(nth 1 font-lock-fontify-level)) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1955 ; |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1956 ;(defvar font-lock-fontify-level nil) ; For less/more fontification. |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1957 ; |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1958 ;(defun font-lock-fontify-level (level) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1959 ; (let ((font-lock-maximum-decoration level)) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1960 ; (when font-lock-mode |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1961 ; (font-lock-mode)) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1962 ; (font-lock-mode) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1963 ; (when font-lock-verbose |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1964 ; (message "Fontifying %s... level %d" (buffer-name) level)))) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1965 ; |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1966 ;(defun font-lock-fontify-less () |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1967 ; "Fontify the current buffer with less decoration. |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1968 ;See `font-lock-maximum-decoration'." |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1969 ; (interactive) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1970 ; ;; Check in case we get called interactively. |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1971 ; (if (nth 1 font-lock-fontify-level) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1972 ; (font-lock-fontify-level (1- (car font-lock-fontify-level))) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1973 ; (error "No less decoration"))) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1974 ; |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1975 ;(defun font-lock-fontify-more () |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1976 ; "Fontify the current buffer with more decoration. |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1977 ;See `font-lock-maximum-decoration'." |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1978 ; (interactive) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1979 ; ;; Check in case we get called interactively. |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1980 ; (if (nth 2 font-lock-fontify-level) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1981 ; (font-lock-fontify-level (1+ (car font-lock-fontify-level))) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1982 ; (error "No more decoration"))) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1983 ; |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1984 ;;; This should be called by `font-lock-set-defaults'. |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1985 ;(defun font-lock-set-menu () |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1986 ; ;; Activate less/more fontification entries if there are multiple levels for |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1987 ; ;; the current buffer. Sets `font-lock-fontify-level' to be of the form |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1988 ; ;; (CURRENT-LEVEL IS-LOWER-LEVEL-P IS-HIGHER-LEVEL-P) for menu activation. |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1989 ; (let ((keywords (or (nth 0 font-lock-defaults) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1990 ; (nth 1 (assq major-mode font-lock-defaults-alist)))) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1991 ; (level (font-lock-value-in-major-mode font-lock-maximum-decoration))) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1992 ; (make-local-variable 'font-lock-fontify-level) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1993 ; (if (or (symbolp keywords) (= (length keywords) 1)) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1994 ; (font-lock-unset-menu) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1995 ; (cond ((eq level t) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1996 ; (setq level (1- (length keywords)))) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1997 ; ((or (null level) (zerop level)) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1998 ; ;; The default level is usually, but not necessarily, level 1. |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
1999 ; (setq level (- (length keywords) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
2000 ; (length (member (eval (car keywords)) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
2001 ; (mapcar 'eval (cdr keywords)))))))) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
2002 ; (setq font-lock-fontify-level (list level (> level 1) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
2003 ; (< level (1- (length keywords)))))))) |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
2004 ; |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
2005 ;;; This should be called by `font-lock-unset-defaults'. |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
2006 ;(defun font-lock-unset-menu () |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
2007 ; ;; Deactivate less/more fontification entries. |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
2008 ; (setq font-lock-fontify-level nil)) |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
2009 |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
2010 ;;; End of Menu support. |
17055
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
2011 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2012 ;;; Various regexp information shared by several modes. |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
2013 ;;; Information specific to a single mode should go in its load library. |
4053 | 2014 |
16852
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
2015 ;; Font Lock support for C, C++, Objective-C and Java modes will one day be in |
17055
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
2016 ;; some cc-font.el (and required by cc-mode.el). However, the below function |
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
2017 ;; should stay in font-lock.el, since it is used by other libraries. sm. |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2018 |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2019 (defun font-lock-match-c-style-declaration-item-and-skip-to-next (limit) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2020 "Match, and move over, any declaration/definition item after point. |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2021 Matches after point, but ignores leading whitespace and `*' characters. |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2022 Does not move further than LIMIT. |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2023 |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2024 The expected syntax of a declaration/definition item is `word' (preceded by |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2025 optional whitespace and `*' characters and proceeded by optional whitespace) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2026 optionally followed by a `('. Everything following the item (but belonging to |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2027 it) is expected to by skip-able by `scan-sexps', and items are expected to be |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2028 separated with a `,' and to be terminated with a `;'. |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2029 |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2030 Thus the regexp matches after point: word ( |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2031 ^^^^ ^ |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2032 Where the match subexpressions are: 1 2 |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2033 |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2034 The item is delimited by (match-beginning 1) and (match-end 1). |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2035 If (match-beginning 2) is non-nil, the item is followed by a `('. |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2036 |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2037 This function could be MATCHER in a MATCH-ANCHORED `font-lock-keywords' item." |
40780
9639c00722d3
(font-lock-match-c-style-declaration-item-and-skip-to-next):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40540
diff
changeset
|
2038 (when (looking-at "[ \n\t*]*\\(\\sw+\\)[ \t\n]*\\(((?\\)?") |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2039 (when (and (match-end 2) (> (- (match-end 2) (match-beginning 2)) 1)) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2040 ;; If `word' is followed by a double open-paren, it's probably |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2041 ;; a macro used for "int myfun P_ ((int arg1))". Let's go back one |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2042 ;; word to try and match `myfun' rather than `P_'. |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2043 (let ((pos (point))) |
40780
9639c00722d3
(font-lock-match-c-style-declaration-item-and-skip-to-next):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40540
diff
changeset
|
2044 (skip-chars-backward " \t\n") |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2045 (skip-syntax-backward "w") |
40780
9639c00722d3
(font-lock-match-c-style-declaration-item-and-skip-to-next):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40540
diff
changeset
|
2046 (unless (looking-at "\\(\\sw+\\)[ \t\n]*\\sw*_\\sw*[ \t\n]*\\((\\)?") |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2047 ;; Looks like it was something else, so go back to where we |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2048 ;; were and reset the match data by rematching. |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2049 (goto-char pos) |
40780
9639c00722d3
(font-lock-match-c-style-declaration-item-and-skip-to-next):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40540
diff
changeset
|
2050 (looking-at "[ \n\t*]*\\(\\sw+\\)[ \t\n]*\\(((?\\)?")))) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2051 (save-match-data |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2052 (condition-case nil |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2053 (save-restriction |
40780
9639c00722d3
(font-lock-match-c-style-declaration-item-and-skip-to-next):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40540
diff
changeset
|
2054 ;; Restrict to the LIMIT. |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2055 (narrow-to-region (point-min) limit) |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2056 (goto-char (match-end 1)) |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2057 ;; Move over any item value, etc., to the next item. |
40780
9639c00722d3
(font-lock-match-c-style-declaration-item-and-skip-to-next):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40540
diff
changeset
|
2058 (while (not (looking-at "[ \t\n]*\\(\\(,\\)\\|;\\|\\'\\)")) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2059 (goto-char (or (scan-sexps (point) 1) (point-max)))) |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2060 (goto-char (match-end 2))) |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2061 (error t))))) |
18463
4f630b3e8f43
split up scheme and tex support; wrap inhibit-point-motion-hooks where nec.
Simon Marshall <simon@gnu.org>
parents:
18332
diff
changeset
|
2062 |
4f630b3e8f43
split up scheme and tex support; wrap inhibit-point-motion-hooks where nec.
Simon Marshall <simon@gnu.org>
parents:
18332
diff
changeset
|
2063 ;; Lisp. |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2064 |
4053 | 2065 (defconst lisp-font-lock-keywords-1 |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2066 (eval-when-compile |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2067 (list |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
2068 ;; |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
2069 ;; Definitions. |
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
2070 (list (concat "(\\(def\\(" |
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
2071 ;; Function declarations. |
37829
26eb27929419
(lisp-font-lock-keywords-1): Add `defvaralias'.
Gerd Moellmann <gerd@gnu.org>
parents:
37693
diff
changeset
|
2072 "\\(advice\\|varalias\\|alias\\|generic\\|macro\\*?\\|method\\|" |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2073 "setf\\|subst\\*?\\|un\\*?\\|" |
28891
70c93cd90fc6
(lisp-font-lock-keywords-1): Add define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28874
diff
changeset
|
2074 "ine-\\(condition\\|\\(?:derived\\|minor\\)-mode\\|" |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2075 "method-combination\\|setf-expander\\|skeleton\\|widget\\|" |
28891
70c93cd90fc6
(lisp-font-lock-keywords-1): Add define-minor-mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28874
diff
changeset
|
2076 "function\\|\\(compiler\\|modify\\|symbol\\)-macro\\)\\)\\|" |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2077 ;; Variable declarations. |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2078 "\\(const\\(ant\\)?\\|custom\\|face\\|parameter\\|var\\)\\|" |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2079 ;; Structure declarations. |
21946
b22c98ed245f
move defpackage to lisp-font-lock-keywords-1
Simon Marshall <simon@gnu.org>
parents:
21751
diff
changeset
|
2080 "\\(class\\|group\\|package\\|struct\\|type\\)" |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2081 "\\)\\)\\>" |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
2082 ;; Any whitespace and defined object. |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2083 "[ \t'\(]*" |
28069
bd586b823051
(lisp-font-lock-keywords-1): Highlight
Gerd Moellmann <gerd@gnu.org>
parents:
27905
diff
changeset
|
2084 "\\(setf[ \t]+\\sw+)\\|\\sw+\\)?") |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2085 '(1 font-lock-keyword-face) |
22857
33b46ddf75b7
(lisp-font-lock-keywords-1): Fontify `defconstant' and `defparameter'.
Richard M. Stallman <rms@gnu.org>
parents:
22757
diff
changeset
|
2086 '(9 (cond ((match-beginning 3) font-lock-function-name-face) |
22757
c4e492a7cb07
(lisp-font-lock-keywords-2): support `handler-*',
Richard M. Stallman <rms@gnu.org>
parents:
22730
diff
changeset
|
2087 ((match-beginning 6) font-lock-variable-name-face) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
2088 (t font-lock-type-face)) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2089 nil t)) |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
2090 ;; |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
2091 ;; Emacs Lisp autoload cookies. |
25720
56f5519d4750
(lisp-font-lock-keywords-1): Recognize an autoload
Richard M. Stallman <rms@gnu.org>
parents:
25596
diff
changeset
|
2092 '("^;;;###\\(autoload\\)" 1 font-lock-warning-face prepend) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2093 )) |
17055
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
2094 "Subdued level highlighting for Lisp modes.") |
4053 | 2095 |
2096 (defconst lisp-font-lock-keywords-2 | |
10879
73ce8261c2ce
Added font-lock-maximum-decoration; use it to set lisp-font-lock-keywords, and
Simon Marshall <simon@gnu.org>
parents:
10545
diff
changeset
|
2097 (append lisp-font-lock-keywords-1 |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2098 (eval-when-compile |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2099 (list |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2100 ;; |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
2101 ;; Control structures. Emacs Lisp forms. |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2102 (cons (concat |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2103 "(" (regexp-opt |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2104 '("cond" "if" "while" "let" "let*" |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2105 "prog" "progn" "progv" "prog1" "prog2" "prog*" |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2106 "inline" "lambda" "save-restriction" "save-excursion" |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2107 "save-window-excursion" "save-selected-window" |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2108 "save-match-data" "save-current-buffer" "unwind-protect" |
20923
c6e733c90ed8
Keyword doc fixes and keyword tweaks.
Simon Marshall <simon@gnu.org>
parents:
20851
diff
changeset
|
2109 "condition-case" "track-mouse" |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2110 "eval-after-load" "eval-and-compile" "eval-when-compile" |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2111 "eval-when" |
20190
bc7fabb22520
Allow any number of ::foos in declarative items.
Simon Marshall <simon@gnu.org>
parents:
19935
diff
changeset
|
2112 "with-current-buffer" "with-electric-help" |
bc7fabb22520
Allow any number of ::foos in declarative items.
Simon Marshall <simon@gnu.org>
parents:
19935
diff
changeset
|
2113 "with-output-to-string" "with-output-to-temp-buffer" |
23751
3fdde7281f9b
* font-lock.el (font-lock-defaults): Doc fix.
Simon Marshall <simon@gnu.org>
parents:
23163
diff
changeset
|
2114 "with-temp-buffer" "with-temp-file" "with-temp-message" |
20190
bc7fabb22520
Allow any number of ::foos in declarative items.
Simon Marshall <simon@gnu.org>
parents:
19935
diff
changeset
|
2115 "with-timeout") t) |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2116 "\\>") |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2117 1) |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2118 ;; |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
2119 ;; Control structures. Common Lisp forms. |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2120 (cons (concat |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2121 "(" (regexp-opt |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2122 '("when" "unless" "case" "ecase" "typecase" "etypecase" |
22757
c4e492a7cb07
(lisp-font-lock-keywords-2): support `handler-*',
Richard M. Stallman <rms@gnu.org>
parents:
22730
diff
changeset
|
2123 "ccase" "ctypecase" "handler-case" "handler-bind" |
22857
33b46ddf75b7
(lisp-font-lock-keywords-1): Fontify `defconstant' and `defparameter'.
Richard M. Stallman <rms@gnu.org>
parents:
22757
diff
changeset
|
2124 "restart-bind" "restart-case" "in-package" |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2125 "cerror" "break" "ignore-errors" |
22857
33b46ddf75b7
(lisp-font-lock-keywords-1): Fontify `defconstant' and `defparameter'.
Richard M. Stallman <rms@gnu.org>
parents:
22757
diff
changeset
|
2126 "loop" "do" "do*" "dotimes" "dolist" "the" "locally" |
22757
c4e492a7cb07
(lisp-font-lock-keywords-2): support `handler-*',
Richard M. Stallman <rms@gnu.org>
parents:
22730
diff
changeset
|
2127 "proclaim" "declaim" "declare" "symbol-macrolet" |
c4e492a7cb07
(lisp-font-lock-keywords-2): support `handler-*',
Richard M. Stallman <rms@gnu.org>
parents:
22730
diff
changeset
|
2128 "lexical-let" "lexical-let*" "flet" "labels" "compiler-let" |
c4e492a7cb07
(lisp-font-lock-keywords-2): support `handler-*',
Richard M. Stallman <rms@gnu.org>
parents:
22730
diff
changeset
|
2129 "destructuring-bind" "macrolet" "tagbody" "block" |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2130 "return" "return-from") t) |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2131 "\\>") |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
2132 1) |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
2133 ;; |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2134 ;; Exit/Feature symbols as constants. |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2135 (list (concat "(\\(catch\\|throw\\|featurep\\|provide\\|require\\)\\>" |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2136 "[ \t']*\\(\\sw+\\)?") |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2137 '(1 font-lock-keyword-face) |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2138 '(2 font-lock-constant-face nil t)) |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2139 ;; |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2140 ;; Erroneous structures. |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2141 '("(\\(abort\\|assert\\|error\\|signal\\)\\>" 1 font-lock-warning-face) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2142 ;; |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2143 ;; Words inside \\[] tend to be for `substitute-command-keys'. |
20951
ae0c93b9ac1f
Renamed font-lock-reference-face to font-lock-constant-face.
Simon Marshall <simon@gnu.org>
parents:
20923
diff
changeset
|
2144 '("\\\\\\\\\\[\\(\\sw+\\)]" 1 font-lock-constant-face prepend) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2145 ;; |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2146 ;; Words inside `' tend to be symbol names. |
20951
ae0c93b9ac1f
Renamed font-lock-reference-face to font-lock-constant-face.
Simon Marshall <simon@gnu.org>
parents:
20923
diff
changeset
|
2147 '("`\\(\\sw\\sw+\\)'" 1 font-lock-constant-face prepend) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2148 ;; |
20923
c6e733c90ed8
Keyword doc fixes and keyword tweaks.
Simon Marshall <simon@gnu.org>
parents:
20851
diff
changeset
|
2149 ;; Constant values. |
43753
5132a4e458ec
(lisp-font-lock-keywords-2): Highlight keywords of
Gerd Moellmann <gerd@gnu.org>
parents:
43736
diff
changeset
|
2150 '("\\<:\\sw+\\>" 0 font-lock-builtin-face) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2151 ;; |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2152 ;; ELisp and CLisp `&' keywords as types. |
25045
5312a58f3397
(lisp-font-lock-keywords-2): Fix regexp.
Karl Heuer <kwzh@gnu.org>
parents:
24976
diff
changeset
|
2153 '("\\&\\sw+\\>" . font-lock-type-face) |
30651
61c2f9fcb8f6
* emacs-lisp/cl-indent.el (toplevel): Indent `defclass',
Sam Steingold <sds@gnu.org>
parents:
29919
diff
changeset
|
2154 ;; |
61c2f9fcb8f6
* emacs-lisp/cl-indent.el (toplevel): Indent `defclass',
Sam Steingold <sds@gnu.org>
parents:
29919
diff
changeset
|
2155 ;; CL `with-' and `do-' constructs |
61c2f9fcb8f6
* emacs-lisp/cl-indent.el (toplevel): Indent `defclass',
Sam Steingold <sds@gnu.org>
parents:
29919
diff
changeset
|
2156 '("(\\(\\(do-\\|with-\\)\\(\\s_\\|\\w\\)*\\)" 1 font-lock-keyword-face) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2157 ))) |
12385
c80966dc0b60
Specify in font-lock-defaults/font-lock-defaults-alist which keywords we can
Simon Marshall <simon@gnu.org>
parents:
12268
diff
changeset
|
2158 "Gaudy level highlighting for Lisp modes.") |
4053 | 2159 |
12385
c80966dc0b60
Specify in font-lock-defaults/font-lock-defaults-alist which keywords we can
Simon Marshall <simon@gnu.org>
parents:
12268
diff
changeset
|
2160 (defvar lisp-font-lock-keywords lisp-font-lock-keywords-1 |
c80966dc0b60
Specify in font-lock-defaults/font-lock-defaults-alist which keywords we can
Simon Marshall <simon@gnu.org>
parents:
12268
diff
changeset
|
2161 "Default expressions to highlight in Lisp modes.") |
18463
4f630b3e8f43
split up scheme and tex support; wrap inhibit-point-motion-hooks where nec.
Simon Marshall <simon@gnu.org>
parents:
18332
diff
changeset
|
2162 |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2163 ;;; User choices. |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2164 |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2165 ;; These provide a means to fontify types not defined by the language. Those |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2166 ;; types might be the user's own or they might be generally accepted and used. |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
2167 ;; Generally accepted types are used to provide default variable values. |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2168 |
17543
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
2169 (define-widget 'font-lock-extra-types-widget 'radio |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
2170 "Widget `:type' for members of the custom group `font-lock-extra-types'. |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
2171 Members should `:load' the package `font-lock' to use this widget." |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
2172 :args '((const :tag "none" nil) |
18463
4f630b3e8f43
split up scheme and tex support; wrap inhibit-point-motion-hooks where nec.
Simon Marshall <simon@gnu.org>
parents:
18332
diff
changeset
|
2173 (repeat :tag "types" regexp))) |
17543
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
2174 |
35195
2ed799be6e5b
(c-font-lock-extra-types): Add "Lisp_Object".
Kenichi Handa <handa@m17n.org>
parents:
34324
diff
changeset
|
2175 (defcustom c-font-lock-extra-types '("FILE" "\\sw+_t" "Lisp_Object") |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2176 "*List of extra types to fontify in C mode. |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
2177 Each list item should be a regexp not containing word-delimiters. |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2178 For example, a value of (\"FILE\" \"\\\\sw+_t\") means the word FILE and words |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
2179 ending in _t are treated as type names. |
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
2180 |
17543
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
2181 The value of this variable is used when Font Lock mode is turned on." |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
2182 :type 'font-lock-extra-types-widget |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
2183 :group 'font-lock-extra-types) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2184 |
20646
a951fec2326c
(c++-font-lock-extra-types): Add some container classes.
Simon Marshall <simon@gnu.org>
parents:
20645
diff
changeset
|
2185 (defcustom c++-font-lock-extra-types |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2186 '("\\sw+_t" |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2187 "\\([iof]\\|str\\)+stream\\(buf\\)?" "ios" |
20646
a951fec2326c
(c++-font-lock-extra-types): Add some container classes.
Simon Marshall <simon@gnu.org>
parents:
20645
diff
changeset
|
2188 "string" "rope" |
a951fec2326c
(c++-font-lock-extra-types): Add some container classes.
Simon Marshall <simon@gnu.org>
parents:
20645
diff
changeset
|
2189 "list" "slist" |
a951fec2326c
(c++-font-lock-extra-types): Add some container classes.
Simon Marshall <simon@gnu.org>
parents:
20645
diff
changeset
|
2190 "deque" "vector" "bit_vector" |
a951fec2326c
(c++-font-lock-extra-types): Add some container classes.
Simon Marshall <simon@gnu.org>
parents:
20645
diff
changeset
|
2191 "set" "multiset" |
a951fec2326c
(c++-font-lock-extra-types): Add some container classes.
Simon Marshall <simon@gnu.org>
parents:
20645
diff
changeset
|
2192 "map" "multimap" |
a951fec2326c
(c++-font-lock-extra-types): Add some container classes.
Simon Marshall <simon@gnu.org>
parents:
20645
diff
changeset
|
2193 "hash\\(_\\(m\\(ap\\|ulti\\(map\\|set\\)\\)\\|set\\)\\)?" |
a951fec2326c
(c++-font-lock-extra-types): Add some container classes.
Simon Marshall <simon@gnu.org>
parents:
20645
diff
changeset
|
2194 "stack" "queue" "priority_queue" |
24976
1a1a57be6ae6
(c++-font-lock-extra-types): Add "type_info".
Karl Heuer <kwzh@gnu.org>
parents:
24969
diff
changeset
|
2195 "type_info" |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2196 "iterator" "const_iterator" "reverse_iterator" "const_reverse_iterator" |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2197 "reference" "const_reference") |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2198 "*List of extra types to fontify in C++ mode. |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
2199 Each list item should be a regexp not containing word-delimiters. |
20646
a951fec2326c
(c++-font-lock-extra-types): Add some container classes.
Simon Marshall <simon@gnu.org>
parents:
20645
diff
changeset
|
2200 For example, a value of (\"string\") means the word string is treated as a type |
a951fec2326c
(c++-font-lock-extra-types): Add some container classes.
Simon Marshall <simon@gnu.org>
parents:
20645
diff
changeset
|
2201 name. |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
2202 |
17543
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
2203 The value of this variable is used when Font Lock mode is turned on." |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
2204 :type 'font-lock-extra-types-widget |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
2205 :group 'font-lock-extra-types) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2206 |
17543
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
2207 (defcustom objc-font-lock-extra-types '("Class" "BOOL" "IMP" "SEL") |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2208 "*List of extra types to fontify in Objective-C mode. |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
2209 Each list item should be a regexp not containing word-delimiters. |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2210 For example, a value of (\"Class\" \"BOOL\" \"IMP\" \"SEL\") means the words |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
2211 Class, BOOL, IMP and SEL are treated as type names. |
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
2212 |
17543
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
2213 The value of this variable is used when Font Lock mode is turned on." |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
2214 :type 'font-lock-extra-types-widget |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
2215 :group 'font-lock-extra-types) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2216 |
24336
3c68ad53545e
* font-lock.el (c++-font-lock-keywords-3): Use c-at-toplevel-p to distinguish
Simon Marshall <simon@gnu.org>
parents:
24216
diff
changeset
|
2217 (defcustom java-font-lock-extra-types |
43835
d9af887af46c
(java-font-lock-extra-types): Add "URL" as separate item. Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents:
43753
diff
changeset
|
2218 '("[A-Z\300-\326\330-\337]\\sw*[a-z]\\sw*" "URL") |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2219 "*List of extra types to fontify in Java mode. |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
2220 Each list item should be a regexp not containing word-delimiters. |
43835
d9af887af46c
(java-font-lock-extra-types): Add "URL" as separate item. Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents:
43753
diff
changeset
|
2221 For example, a value of (\"[A-Z\300-\326\330-\337]\\\\sw*[a-z]\\\\sw*\" \"URL\") means |
d9af887af46c
(java-font-lock-extra-types): Add "URL" as separate item. Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents:
43753
diff
changeset
|
2222 capitalised words (that conform to the Java id spec) and URL are treated as |
d9af887af46c
(java-font-lock-extra-types): Add "URL" as separate item. Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents:
43753
diff
changeset
|
2223 type names. |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
2224 |
17543
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
2225 The value of this variable is used when Font Lock mode is turned on." |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
2226 :type 'font-lock-extra-types-widget |
9b75a01e03e5
Respect font-lock-face-attributes and custom fixes.
Simon Marshall <simon@gnu.org>
parents:
17507
diff
changeset
|
2227 :group 'font-lock-extra-types) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2228 |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2229 ;;; C. |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2230 |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2231 ;; [Murmur murmur murmur] Maestro, drum-roll please... [Murmur murmur murmur.] |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2232 ;; Ahem. [Murmur murmur murmur] Lay-dees an Gennel-men. [Murmur murmur shhh!] |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2233 ;; I am most proud and humbly honoured today [murmur murmur cough] to present |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2234 ;; to you good people, the winner of the Second Millennium Award for The Most |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2235 ;; Hairy Language Syntax. [Ahhh!] All rise please. [Shuffle shuffle |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2236 ;; shuffle.] And a round of applause please. For... The C Language! [Roar.] |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2237 ;; |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2238 ;; Thank you... You are too kind... It is with a feeling of great privilege |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2239 ;; and indeed emotion [sob] that I accept this award. It has been a long hard |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2240 ;; road. But we know our destiny. And our future. For we must not rest. |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2241 ;; There are more tokens to overload, more shoehorn, more methodologies. But |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2242 ;; more is a plus! [Ha ha ha.] And more means plus! [Ho ho ho.] The future |
16852
70e9b1d69d0d
Fix additional text prop fns to behave as proposed builtins.
Simon Marshall <simon@gnu.org>
parents:
16578
diff
changeset
|
2243 ;; is C++! [Ohhh!] The Third Millennium Award... Will be ours! [Roar.] |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2244 |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
2245 (let* ((c-keywords |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2246 (eval-when-compile |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2247 (regexp-opt '("break" "continue" "do" "else" "for" "if" "return" |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2248 "switch" "while" "sizeof" |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2249 ;; Type related, but we don't do anything special. |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2250 "typedef" "extern" "auto" "register" "static" |
24488
a8e006544aa5
(c-font-lock-keywords-2): Added "restrict" keyword.
Simon Marshall <simon@gnu.org>
parents:
24336
diff
changeset
|
2251 "volatile" "const" |
a8e006544aa5
(c-font-lock-keywords-2): Added "restrict" keyword.
Simon Marshall <simon@gnu.org>
parents:
24336
diff
changeset
|
2252 ;; Dan Nicolaescu <done@gnu.org> says this is new. |
41513
92d06d8cd81d
(font-lock-cache-state, font-lock-cache-position)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41226
diff
changeset
|
2253 "restrict" |
92d06d8cd81d
(font-lock-cache-state, font-lock-cache-position)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41226
diff
changeset
|
2254 ;; Henrik Enberg <henrik@enberg.org> says this is new. |
92d06d8cd81d
(font-lock-cache-state, font-lock-cache-position)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41226
diff
changeset
|
2255 "inline")))) |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2256 (c-type-specs |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2257 (eval-when-compile |
32306
86a849ccfae1
(font-lock-defaults): Make buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32272
diff
changeset
|
2258 (regexp-opt '("enum" "struct" "union")))) |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2259 (c-type-specs-depth |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2260 (regexp-opt-depth c-type-specs)) |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2261 (c-type-names |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
2262 `(mapconcat 'identity |
26620 | 2263 (cons |
31969
9ef4cd44aaab
Replace confusing (,@ with ,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31708
diff
changeset
|
2264 ,(eval-when-compile |
9ef4cd44aaab
Replace confusing (,@ with ,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31708
diff
changeset
|
2265 (regexp-opt |
9ef4cd44aaab
Replace confusing (,@ with ,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31708
diff
changeset
|
2266 '("char" "short" "int" "long" "signed" "unsigned" |
41513
92d06d8cd81d
(font-lock-cache-state, font-lock-cache-position)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41226
diff
changeset
|
2267 "float" "double" "void" "complex" |
92d06d8cd81d
(font-lock-cache-state, font-lock-cache-position)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41226
diff
changeset
|
2268 ;; Henrik Enberg <henrik@enberg.org> says these are new. |
92d06d8cd81d
(font-lock-cache-state, font-lock-cache-position)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41226
diff
changeset
|
2269 "_Complex" "_Imaginary" "_Bool"))) |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
2270 c-font-lock-extra-types) |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
2271 "\\|")) |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2272 (c-type-names-depth |
31969
9ef4cd44aaab
Replace confusing (,@ with ,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31708
diff
changeset
|
2273 `(regexp-opt-depth ,c-type-names)) |
26920
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2274 (c-preprocessor-directives |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2275 (eval-when-compile |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2276 (regexp-opt |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2277 '("define" "elif" "else" "endif" "error" "file" "if" "ifdef" |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2278 "ifndef" "include" "line" "pragma" "undef")))) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2279 (c-preprocessor-directives-depth |
31969
9ef4cd44aaab
Replace confusing (,@ with ,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31708
diff
changeset
|
2280 (regexp-opt-depth c-preprocessor-directives))) |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2281 (defconst c-font-lock-keywords-1 |
6093
00cee8387866
Clean up c-font-lock-keywords; now slightly more consistent about highlighting
Karl Heuer <kwzh@gnu.org>
parents:
5878
diff
changeset
|
2282 (list |
00cee8387866
Clean up c-font-lock-keywords; now slightly more consistent about highlighting
Karl Heuer <kwzh@gnu.org>
parents:
5878
diff
changeset
|
2283 ;; |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2284 ;; These are all anchored at the beginning of line for speed. |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2285 ;; Note that `c++-font-lock-keywords-1' depends on `c-font-lock-keywords-1'. |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2286 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2287 ;; Fontify function name definitions (GNU style; without type on line). |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2288 '("^\\(\\sw+\\)[ \t]*(" 1 font-lock-function-name-face) |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2289 ;; |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2290 ;; Fontify error directives. |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2291 '("^#[ \t]*error[ \t]+\\(.+\\)" 1 font-lock-warning-face prepend) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2292 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2293 ;; Fontify filenames in #include <...> preprocessor directives as strings. |
20923
c6e733c90ed8
Keyword doc fixes and keyword tweaks.
Simon Marshall <simon@gnu.org>
parents:
20851
diff
changeset
|
2294 '("^#[ \t]*\\(import\\|include\\)[ \t]*\\(<[^>\"\n]*>?\\)" |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2295 2 font-lock-string-face) |
6093
00cee8387866
Clean up c-font-lock-keywords; now slightly more consistent about highlighting
Karl Heuer <kwzh@gnu.org>
parents:
5878
diff
changeset
|
2296 ;; |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
2297 ;; Fontify function macro names. |
13701
1dab6f0d9239
Don't turn on in any buffer with a leading space in its name.
Simon Marshall <simon@gnu.org>
parents:
13641
diff
changeset
|
2298 '("^#[ \t]*define[ \t]+\\(\\sw+\\)(" 1 font-lock-function-name-face) |
6093
00cee8387866
Clean up c-font-lock-keywords; now slightly more consistent about highlighting
Karl Heuer <kwzh@gnu.org>
parents:
5878
diff
changeset
|
2299 ;; |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
2300 ;; Fontify symbol names in #elif or #if ... defined preprocessor directives. |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
2301 '("^#[ \t]*\\(elif\\|if\\)\\>" |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2302 ("\\<\\(defined\\)\\>[ \t]*(?\\(\\sw+\\)?" nil nil |
20646
a951fec2326c
(c++-font-lock-extra-types): Add some container classes.
Simon Marshall <simon@gnu.org>
parents:
20645
diff
changeset
|
2303 (1 font-lock-builtin-face) (2 font-lock-variable-name-face nil t))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2304 ;; |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
2305 ;; Fontify otherwise as symbol names, and the preprocessor directive names. |
26920
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2306 (list |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2307 (concat "^#[ \t]*\\(" c-preprocessor-directives |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2308 "\\)\\>[ \t!]*\\(\\sw+\\)?") |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2309 '(1 font-lock-builtin-face) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2310 (list (+ 2 c-preprocessor-directives-depth) |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2311 'font-lock-variable-name-face nil t))) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2312 "Subdued level highlighting for C mode.") |
6093
00cee8387866
Clean up c-font-lock-keywords; now slightly more consistent about highlighting
Karl Heuer <kwzh@gnu.org>
parents:
5878
diff
changeset
|
2313 |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2314 (defconst c-font-lock-keywords-2 |
6093
00cee8387866
Clean up c-font-lock-keywords; now slightly more consistent about highlighting
Karl Heuer <kwzh@gnu.org>
parents:
5878
diff
changeset
|
2315 (append c-font-lock-keywords-1 |
4053 | 2316 (list |
2317 ;; | |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2318 ;; Simple regexps for speed. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2319 ;; |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2320 ;; Fontify all type names. |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2321 `(eval . |
31969
9ef4cd44aaab
Replace confusing (,@ with ,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31708
diff
changeset
|
2322 (cons (concat "\\<\\(" ,c-type-names "\\)\\>") 'font-lock-type-face)) |
4053 | 2323 ;; |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2324 ;; Fontify all builtin keywords (except case, default and goto; see below). |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2325 (concat "\\<\\(" c-keywords "\\|" c-type-specs "\\)\\>") |
9487
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
2326 ;; |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2327 ;; Fontify case/goto keywords and targets, and case default/goto tags. |
26920
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2328 '("\\<\\(case\\|goto\\)\\>" |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2329 (1 font-lock-keyword-face) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2330 ("\\(-[0-9]+\\|\\sw+\\)" |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2331 ;; Return limit of search. |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2332 (save-excursion (skip-chars-forward "^:\n") (point)) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2333 nil |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2334 (1 font-lock-constant-face nil t))) |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2335 ;; Anders Lindgren <andersl@andersl.com> points out that it is quicker |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2336 ;; to use MATCH-ANCHORED to effectively anchor the regexp on the left. |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2337 ;; This must come after the one for keywords and targets. |
41226
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2338 ;; Note: the lack of `:' in the first char-range prevents `bar' from being |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2339 ;; highlighted in "foo: bar:". But adding `:' would break cases like |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2340 ;; "test1 ? test2 ? foo : bar : baz". |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2341 '(":" ("\\(?:^\\|[{};]\\)[ \t]*\\(\\sw+\\)[ \t]*:" |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2342 (beginning-of-line) (end-of-line) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2343 (1 font-lock-constant-face))) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2344 )) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2345 "Medium level highlighting for C mode. See also `c-font-lock-extra-types'.") |
6219
d960f0463014
(c++-font-lock-keywords-1, c++-font-lock-keywords-2): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6093
diff
changeset
|
2346 |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2347 (defconst c-font-lock-keywords-3 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2348 (append c-font-lock-keywords-2 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2349 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2350 ;; More complicated regexps for more complete highlighting for types. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2351 ;; We still have to fontify type specifiers individually, as C is so hairy. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2352 (list |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2353 ;; |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2354 ;; Fontify all storage types, plus their items. |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2355 `(eval . |
31969
9ef4cd44aaab
Replace confusing (,@ with ,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31708
diff
changeset
|
2356 (list (concat "\\<\\(" ,c-type-names "\\)\\>" |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2357 "\\([ \t*&]+\\sw+\\>\\)*") |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2358 ;; Fontify each declaration item. |
41226
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2359 `(font-lock-match-c-style-declaration-item-and-skip-to-next |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2360 ;; Start with point after all type specifiers. |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2361 (prog1 (progn (skip-chars-forward "^;{}") (point)) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2362 (goto-char (or (match-beginning |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2363 ,(+ ,c-type-names-depth 2)) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2364 (match-end 1)))) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2365 ;; Finish with point after first type specifier. |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2366 (goto-char (match-end 1)) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2367 ;; Fontify as a variable or function name. |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2368 (1 (if (match-beginning 2) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2369 font-lock-function-name-face |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2370 font-lock-variable-name-face))))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2371 ;; |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2372 ;; Fontify all storage specs and types, plus their items. |
41226
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2373 `(,(concat "\\<\\(" c-type-specs "\\)\\>" "[ \t]*\\(\\sw+\\)?") |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2374 (1 font-lock-keyword-face) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2375 (,(+ c-type-specs-depth 2) font-lock-type-face nil t) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2376 (font-lock-match-c-style-declaration-item-and-skip-to-next |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2377 (save-excursion (skip-chars-forward "^;{}") (point)) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2378 ;; Finish with point after the variable name if |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2379 ;; there is one. |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2380 (if (match-end 2) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2381 (goto-char (match-end 2))) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2382 ;; Fontify as a variable or function name. |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2383 (1 (if (match-beginning 2) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2384 font-lock-function-name-face |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2385 font-lock-variable-name-face) nil t))) |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2386 ;; |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2387 ;; Fontify structures, or typedef names, plus their items. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2388 '("\\(}\\)[ \t*]*\\sw" |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2389 (font-lock-match-c-style-declaration-item-and-skip-to-next |
41226
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2390 (prog1 (progn (skip-chars-forward "^;{}") (point)) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2391 (goto-char (match-end 1))) nil |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2392 (1 font-lock-type-face))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2393 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2394 ;; Fontify anything at beginning of line as a declaration or definition. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2395 '("^\\(\\sw+\\)\\>\\([ \t*]+\\sw+\\>\\)*" |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2396 (1 font-lock-type-face) |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2397 (font-lock-match-c-style-declaration-item-and-skip-to-next |
41226
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2398 (prog1 (progn (skip-chars-forward "^;{}") (point)) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2399 (goto-char (or (match-beginning 2) (match-end 1)))) nil |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2400 (1 (if (match-beginning 2) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2401 font-lock-function-name-face |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2402 font-lock-variable-name-face)))) |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2403 )) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2404 "Gaudy level highlighting for C mode. |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2405 See also `c-font-lock-extra-types'.")) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2406 |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2407 (defun c-font-lock-syntactic-face-function (state) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2408 (save-excursion |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2409 (if (nth 3 state) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2410 ;; Check whether the string is properly terminated. |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2411 (let ((nstate (parse-partial-sexp (point) (line-end-position) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2412 nil nil state 'syntax-table))) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2413 (if (and (eolp) (not (nth 5 nstate)) (nth 3 nstate)) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2414 ;; We're inside a string, at EOL and there was no \. |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2415 font-lock-warning-face |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2416 font-lock-string-face)) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2417 (goto-char (nth 8 state)) |
43193
448551584591
(save-buffer-state): Use restore-buffer-modified-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
42449
diff
changeset
|
2418 ;; `doxygen' uses /*! while others use /**. |
448551584591
(save-buffer-state): Use restore-buffer-modified-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
42449
diff
changeset
|
2419 (if (looking-at "/\\*[*!]\n") |
448551584591
(save-buffer-state): Use restore-buffer-modified-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
42449
diff
changeset
|
2420 font-lock-doc-face font-lock-comment-face)))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2421 |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2422 (defvar c-font-lock-keywords c-font-lock-keywords-1 |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2423 "Default expressions to highlight in C mode. |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2424 See also `c-font-lock-extra-types'.") |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2425 |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2426 ;;; C++. |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2427 |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2428 (defun font-lock-match-c++-style-declaration-item-and-skip-to-next (limit) |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2429 ;; Regexp matches after point: word<word>::word ( |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2430 ;; ^^^^ ^^^^ ^^^^ ^ |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2431 ;; Where the match subexpressions are: 1 3 5 6 |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2432 ;; |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2433 ;; Item is delimited by (match-beginning 1) and (match-end 1). |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2434 ;; If (match-beginning 3) is non-nil, that part of the item incloses a `<>'. |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2435 ;; If (match-beginning 5) is non-nil, that part of the item follows a `::'. |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2436 ;; If (match-beginning 6) is non-nil, the item is followed by a `('. |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2437 (when (looking-at (eval-when-compile |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
2438 (concat |
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
2439 ;; Skip any leading whitespace. |
41226
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2440 "[ \t\n*&]*" |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
2441 ;; This is `c++-type-spec' from below. (Hint hint!) |
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
2442 "\\(\\sw+\\)" ; The instance? |
41226
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2443 "\\([ \t\n]*<\\(\\(?:[^<>]\\|<[^>]+>\\)+\\)[ \t\n*&]*>\\)?" ; Or template? |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2444 "\\([ \t\n]*::[ \t\n*~]*\\(\\sw+\\)\\)*" ; Or member? |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
2445 ;; Match any trailing parenthesis. |
41226
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2446 "[ \t\n]*\\((\\)?"))) |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2447 (save-match-data |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2448 (condition-case nil |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2449 (save-restriction |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2450 ;; Restrict to the end of line, currently guaranteed to be LIMIT. |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2451 (narrow-to-region (point-min) limit) |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2452 (goto-char (match-end 1)) |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2453 ;; Move over any item value, etc., to the next item. |
41226
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2454 (while (not (looking-at "[ \t\n]*\\(\\(,\\)\\|;\\|\\'\\)")) |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2455 (goto-char (or (scan-sexps (point) 1) (point-max)))) |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2456 (goto-char (match-end 2))) |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2457 (error t))))) |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2458 |
26920
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2459 (defun font-lock-match-c++-structor-declaration (limit) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2460 ;; Match C++ constructors and destructors inside class declarations. |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2461 (let ((res nil) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2462 (regexp (concat "^\\s-+\\(\\(virtual\\|explicit\\)\\s-+\\)*~?\\(\\<" |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2463 (mapconcat 'identity |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2464 c++-font-lock-extra-types "\\|") |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2465 "\\>\\)\\s-*(" |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2466 ;; Don't match function pointer declarations, e.g.: |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2467 ;; Foo (*fptr)(); |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2468 "\\s-*[^*( \t]"))) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2469 (while (progn (setq res (re-search-forward regexp limit t)) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2470 (and res |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2471 (save-excursion |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2472 (beginning-of-line) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2473 (save-match-data |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2474 (not (vectorp (c-at-toplevel-p)))))))) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2475 res)) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2476 |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2477 (let* ((c++-keywords |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2478 (eval-when-compile |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2479 (regexp-opt |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2480 '("break" "continue" "do" "else" "for" "if" "return" "switch" |
19846
f5f2feb0bd0f
Try to comment where font-lock-keyword order is important.
Simon Marshall <simon@gnu.org>
parents:
19788
diff
changeset
|
2481 "while" "asm" "catch" "delete" "new" "sizeof" "this" "throw" "try" |
24969 | 2482 "typeid" |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2483 ;; Branko Cibej <branko.cibej@hermes.si> says this is new. |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2484 "export" |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2485 ;; Mark Mitchell <mmitchell@usa.net> says these are new. |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2486 "mutable" "explicit" |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2487 ;; Alain Picard <ap@abelard.apana.org.au> suggests treating these |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2488 ;; as keywords not types. |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2489 "typedef" "template" |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2490 "extern" "auto" "register" "const" "volatile" "static" |
38491
bbe532496c7e
(c++-keywords): Add Standard C++ operator names.
Gerd Moellmann <gerd@gnu.org>
parents:
38282
diff
changeset
|
2491 "inline" "friend" "virtual" |
bbe532496c7e
(c++-keywords): Add Standard C++ operator names.
Gerd Moellmann <gerd@gnu.org>
parents:
38282
diff
changeset
|
2492 ;; Standard C++ operator names. |
bbe532496c7e
(c++-keywords): Add Standard C++ operator names.
Gerd Moellmann <gerd@gnu.org>
parents:
38282
diff
changeset
|
2493 "and" "and_eq" "bitand" "bitor" "compl" "not" "not_eq" |
bbe532496c7e
(c++-keywords): Add Standard C++ operator names.
Gerd Moellmann <gerd@gnu.org>
parents:
38282
diff
changeset
|
2494 "or" "or_eq" "xor" "xor_eq")))) |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2495 (c++-operators |
18332
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
2496 (eval-when-compile |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
2497 (regexp-opt |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
2498 ;; Taken from Stroustrup, minus keywords otherwise fontified. |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
2499 '("+" "-" "*" "/" "%" "^" "&" "|" "~" "!" "=" "<" ">" "+=" "-=" |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
2500 "*=" "/=" "%=" "^=" "&=" "|=" "<<" ">>" ">>=" "<<=" "==" "!=" |
ee997de5b74b
Rearrange custom options. Also enable custom control of Global Font Lock mode.
Simon Marshall <simon@gnu.org>
parents:
18025
diff
changeset
|
2501 "<=" ">=" "&&" "||" "++" "--" "->*" "," "->" "[]" "()")))) |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2502 (c++-type-specs |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2503 (eval-when-compile |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2504 (regexp-opt |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2505 '("class" "public" "private" "protected" "typename" |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2506 "struct" "union" "enum" "namespace" "using" |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2507 ;; Eric Hopper <hopper@omnifarious.mn.org> says these are new. |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2508 "static_cast" "dynamic_cast" "const_cast" "reinterpret_cast") t))) |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2509 (c++-type-specs-depth |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2510 (regexp-opt-depth c++-type-specs)) |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2511 (c++-type-names |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2512 `(mapconcat 'identity |
26620 | 2513 (cons |
31969
9ef4cd44aaab
Replace confusing (,@ with ,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31708
diff
changeset
|
2514 ,(eval-when-compile |
9ef4cd44aaab
Replace confusing (,@ with ,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31708
diff
changeset
|
2515 (regexp-opt |
9ef4cd44aaab
Replace confusing (,@ with ,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31708
diff
changeset
|
2516 '("signed" "unsigned" "short" "long" |
9ef4cd44aaab
Replace confusing (,@ with ,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31708
diff
changeset
|
2517 "int" "char" "float" "double" "void" |
9ef4cd44aaab
Replace confusing (,@ with ,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31708
diff
changeset
|
2518 "bool" "complex"))) |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2519 c++-font-lock-extra-types) |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2520 "\\|")) |
31969
9ef4cd44aaab
Replace confusing (,@ with ,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31708
diff
changeset
|
2521 (c++-type-names-depth `(regexp-opt-depth ,c++-type-names)) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
2522 ;; |
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
2523 ;; A brave attempt to match templates following a type and/or match |
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
2524 ;; class membership. See and sync the above function |
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
2525 ;; `font-lock-match-c++-style-declaration-item-and-skip-to-next'. |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2526 (c++-type-suffix (concat "\\([ \t]*<\\(\\(?:[^<>\n]\\|<[^>\n]+>\\)+\\)[ \t*&]*>\\)?" |
20190
bc7fabb22520
Allow any number of ::foos in declarative items.
Simon Marshall <simon@gnu.org>
parents:
19935
diff
changeset
|
2527 "\\([ \t]*::[ \t*~]*\\(\\sw+\\)\\)*")) |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2528 (c++-type-suffix-depth (regexp-opt-depth c++-type-suffix)) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
2529 ;; If the string is a type, it may be followed by the cruft above. |
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
2530 (c++-type-spec (concat "\\(\\sw+\\)\\>" c++-type-suffix)) |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2531 (c++-type-spec-depth (regexp-opt-depth c++-type-spec)) |
17495
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
2532 ;; |
83dabcc0a796
Customise. And a few code cleanups.
Simon Marshall <simon@gnu.org>
parents:
17468
diff
changeset
|
2533 ;; Parenthesis depth of user-defined types not forgetting their cruft. |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2534 (c++-type-depth `(regexp-opt-depth |
31969
9ef4cd44aaab
Replace confusing (,@ with ,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31708
diff
changeset
|
2535 (concat ,c++-type-names ,c++-type-suffix))) |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
2536 ) |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2537 (defconst c++-font-lock-keywords-1 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2538 (append |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2539 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2540 ;; The list `c-font-lock-keywords-1' less that for function names. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2541 (cdr c-font-lock-keywords-1) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2542 (list |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2543 ;; |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2544 ;; Fontify function name definitions, possibly incorporating class names. |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2545 (list (concat "^" c++-type-spec "[ \t]*(") |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2546 '(1 (if (or (match-beginning 2) (match-beginning 4)) |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2547 font-lock-type-face |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2548 font-lock-function-name-face)) |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2549 '(3 font-lock-type-face nil t) |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2550 '(5 font-lock-function-name-face nil t)) |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2551 )) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2552 "Subdued level highlighting for C++ mode.") |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2553 |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2554 (defconst c++-font-lock-keywords-2 |
9487
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
2555 (append c++-font-lock-keywords-1 |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
2556 (list |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2557 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2558 ;; The list `c-font-lock-keywords-2' for C++ plus operator overloading. |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2559 `(eval . |
31969
9ef4cd44aaab
Replace confusing (,@ with ,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31708
diff
changeset
|
2560 (cons (concat "\\<\\(" ,c++-type-names "\\)\\>") |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2561 'font-lock-type-face)) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2562 ;; |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2563 ;; Fontify operator overloading. |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2564 (list (concat "\\<\\(operator\\)\\>[ \t]*\\(" c++-operators "\\)?") |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2565 '(1 font-lock-keyword-face) |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2566 '(2 font-lock-builtin-face nil t)) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2567 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2568 ;; Fontify case/goto keywords and targets, and case default/goto tags. |
26920
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2569 '("\\<\\(case\\|goto\\)\\>" |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2570 (1 font-lock-keyword-face) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2571 ("\\(-[0-9]+\\|\\sw+\\)[ \t]*\\(::\\)?" |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2572 ;; Return limit of search. |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2573 (save-excursion |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2574 (while (progn |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2575 (skip-chars-forward "^:\n") |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2576 (looking-at "::")) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2577 (forward-char 2)) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2578 (point)) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2579 nil |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2580 (1 (if (match-beginning 2) |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2581 font-lock-type-face |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2582 font-lock-constant-face) nil t))) |
19846
f5f2feb0bd0f
Try to comment where font-lock-keyword order is important.
Simon Marshall <simon@gnu.org>
parents:
19788
diff
changeset
|
2583 ;; This must come after the one for keywords and targets. |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2584 '(":" ("^[ \t]*\\(\\sw+\\)[ \t]*:\\($\\|[^:]\\)" |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2585 (beginning-of-line) (end-of-line) |
20951
ae0c93b9ac1f
Renamed font-lock-reference-face to font-lock-constant-face.
Simon Marshall <simon@gnu.org>
parents:
20923
diff
changeset
|
2586 (1 font-lock-constant-face))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2587 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2588 ;; Fontify other builtin keywords. |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2589 (concat "\\<\\(" c++-keywords "\\|" c++-type-specs "\\)\\>") |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2590 ;; |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2591 ;; Eric Hopper <hopper@omnifarious.mn.org> says `true' and `false' are new. |
20951
ae0c93b9ac1f
Renamed font-lock-reference-face to font-lock-constant-face.
Simon Marshall <simon@gnu.org>
parents:
20923
diff
changeset
|
2592 '("\\<\\(false\\|true\\)\\>" . font-lock-constant-face) |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2593 )) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2594 "Medium level highlighting for C++ mode. |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2595 See also `c++-font-lock-extra-types'.") |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2596 |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2597 (defconst c++-font-lock-keywords-3 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2598 (append c++-font-lock-keywords-2 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2599 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2600 ;; More complicated regexps for more complete highlighting for types. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2601 (list |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2602 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2603 ;; Fontify all storage classes and type specifiers, plus their items. |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2604 `(eval . |
31969
9ef4cd44aaab
Replace confusing (,@ with ,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31708
diff
changeset
|
2605 (list (concat "\\<\\(" ,c++-type-names "\\)\\>" ,c++-type-suffix |
9ef4cd44aaab
Replace confusing (,@ with ,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31708
diff
changeset
|
2606 "\\([ \t*&]+" ,c++-type-spec "\\)*") |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2607 ;; The name of any template type. |
41226
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2608 `(,(+ ,c++-type-names-depth 3) font-lock-type-face nil t) |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2609 ;; Fontify each declaration item. |
41226
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2610 `(font-lock-match-c++-style-declaration-item-and-skip-to-next |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2611 ;; Start with point after all type specifiers. |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2612 (prog1 (progn (skip-chars-forward "^;{}") (point)) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2613 (goto-char (or (match-beginning |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2614 ,(+ ,c++-type-depth 2)) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2615 (match-end 1)))) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2616 ;; Finish with point after first type specifier. |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2617 (goto-char (match-end 1)) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2618 ;; Fontify as a variable or function name. |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2619 (1 (cond ((or (match-beginning 2) (match-beginning 4)) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2620 font-lock-type-face) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2621 ((and (match-beginning 6) (c-at-toplevel-p)) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2622 font-lock-function-name-face) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2623 (t |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2624 font-lock-variable-name-face))) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2625 (3 font-lock-type-face nil t) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2626 (5 (if (match-beginning 6) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2627 font-lock-function-name-face |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2628 font-lock-variable-name-face) nil t)))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2629 ;; |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2630 ;; Fontify all storage specs and types, plus their items. |
41226
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2631 `(,(concat "\\<" c++-type-specs "\\>" c++-type-suffix |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2632 "[ \t]*\\(" c++-type-spec "\\)?") |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2633 ;; The name of any template type. |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2634 (,(+ c++-type-specs-depth 2) 'font-lock-type-face nil t) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2635 ;; The name of any type. |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2636 (,(+ c++-type-specs-depth c++-type-suffix-depth 2) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2637 font-lock-type-face nil t) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2638 ;; Fontify each declaration item. |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2639 (font-lock-match-c++-style-declaration-item-and-skip-to-next |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2640 ;; Start with point after all type specifiers. |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2641 (save-excursion (skip-chars-forward "^;{}") (point)) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2642 ;; Finish with point after first type specifier. |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2643 nil |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2644 ;; Fontify as a variable or function name. |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2645 (1 (cond ((or (match-beginning 2) (match-beginning 4)) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2646 font-lock-type-face) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2647 ((and (match-beginning 6) (c-at-toplevel-p)) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2648 font-lock-function-name-face) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2649 (t |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2650 font-lock-variable-name-face))) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2651 (3 font-lock-type-face nil t) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2652 (5 (if (match-beginning 6) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2653 font-lock-function-name-face |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2654 font-lock-variable-name-face) nil t))) |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2655 ;; |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2656 ;; Fontify structures, or typedef names, plus their items. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2657 '("\\(}\\)[ \t*]*\\sw" |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2658 (font-lock-match-c++-style-declaration-item-and-skip-to-next |
41226
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2659 (prog1 (progn (skip-chars-forward "^;{}") (point)) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2660 (goto-char (match-end 1))) nil |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2661 (1 font-lock-type-face))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2662 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2663 ;; Fontify anything at beginning of line as a declaration or definition. |
41226
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2664 `(,(concat "^\\(" c++-type-spec "[ \t*&]*\\)+") |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2665 (font-lock-match-c++-style-declaration-item-and-skip-to-next |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2666 (prog1 (progn (skip-chars-forward "^;{}") (point)) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2667 (goto-char (match-beginning 1))) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2668 (goto-char (match-end 1)) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2669 (1 (cond ((or (match-beginning 2) (match-beginning 4)) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2670 font-lock-type-face) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2671 ((match-beginning 6) font-lock-function-name-face) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2672 (t font-lock-variable-name-face))) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2673 (3 font-lock-type-face nil t) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2674 (5 (if (match-beginning 6) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2675 font-lock-function-name-face |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2676 font-lock-variable-name-face) nil t))) |
26920
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2677 ;; |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2678 ;; Fontify constructors and destructors inside class declarations. |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2679 '(font-lock-match-c++-structor-declaration |
e510f839bc63
System for adding and removing keywords.
Gerd Moellmann <gerd@gnu.org>
parents:
26915
diff
changeset
|
2680 (3 font-lock-function-name-face t)) |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2681 )) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2682 "Gaudy level highlighting for C++ mode. |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2683 See also `c++-font-lock-extra-types'.") |
6093
00cee8387866
Clean up c-font-lock-keywords; now slightly more consistent about highlighting
Karl Heuer <kwzh@gnu.org>
parents:
5878
diff
changeset
|
2684 ) |
4053 | 2685 |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2686 (defvar c++-font-lock-keywords c++-font-lock-keywords-1 |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2687 "Default expressions to highlight in C++ mode. |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2688 See also `c++-font-lock-extra-types'.") |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2689 |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2690 ;;; Objective-C. |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2691 |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2692 ;; Regexps written with help from Stephen Peters <speters@us.oracle.com> and |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2693 ;; Jacques Duthen Prestataire <duthen@cegelec-red.fr>. |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
2694 (let* ((objc-keywords |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2695 (eval-when-compile |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2696 (regexp-opt '("break" "continue" "do" "else" "for" "if" "return" |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2697 "switch" "while" "sizeof" "self" "super" |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2698 "typedef" "auto" "extern" "static" |
32306
86a849ccfae1
(font-lock-defaults): Make buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32272
diff
changeset
|
2699 "volatile" "const")))) |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2700 (objc-type-specs |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2701 (eval-when-compile |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2702 (regexp-opt |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2703 '("register" "struct" "union" "enum" |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2704 "oneway" "in" "out" "inout" "bycopy" "byref") t))) |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2705 (objc-type-specs-depth |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2706 (regexp-opt-depth objc-type-specs)) |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2707 (objc-type-names |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
2708 `(mapconcat 'identity |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
2709 (cons |
31969
9ef4cd44aaab
Replace confusing (,@ with ,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31708
diff
changeset
|
2710 ,(eval-when-compile |
9ef4cd44aaab
Replace confusing (,@ with ,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31708
diff
changeset
|
2711 (regexp-opt |
9ef4cd44aaab
Replace confusing (,@ with ,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31708
diff
changeset
|
2712 '("signed" "unsigned" "short" "long" |
9ef4cd44aaab
Replace confusing (,@ with ,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31708
diff
changeset
|
2713 "int" "char" "float" "double" "void" |
9ef4cd44aaab
Replace confusing (,@ with ,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31708
diff
changeset
|
2714 "id"))) |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
2715 objc-font-lock-extra-types) |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
2716 "\\|")) |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2717 (objc-type-names-depth |
31969
9ef4cd44aaab
Replace confusing (,@ with ,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31708
diff
changeset
|
2718 `(regexp-opt-depth ,objc-type-names)) |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
2719 ) |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2720 (defconst objc-font-lock-keywords-1 |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2721 (append |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2722 ;; |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2723 ;; The list `c-font-lock-keywords-1' less that for function names. |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2724 (cdr c-font-lock-keywords-1) |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2725 (list |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2726 ;; |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2727 ;; Fontify compiler directives. |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2728 '("@\\(\\sw+\\)\\>" |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2729 (1 font-lock-keyword-face) |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2730 ("\\=[ \t:<,]*\\(\\sw+\\)" nil nil |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2731 (1 font-lock-type-face))) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2732 ;; |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2733 ;; Fontify method names and arguments. Oh Lordy! |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2734 ;; First, on the same line as the function declaration. |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2735 '("^[+-][ \t]*\\(PRIVATE\\>\\)?[ \t]*\\(([^)\n]+)\\)?[ \t]*\\(\\sw+\\)" |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2736 (1 font-lock-keyword-face nil t) |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2737 (3 font-lock-function-name-face) |
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2738 ("\\=[ \t]*\\(\\sw+\\)?:[ \t]*\\(([^)\n]+)\\)?[ \t]*\\(\\sw+\\)" |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2739 nil nil |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2740 (1 font-lock-function-name-face nil t) |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2741 (3 font-lock-variable-name-face))) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2742 ;; Second, on lines following the function declaration. |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2743 '(":" ("^[ \t]*\\(\\sw+\\)?:[ \t]*\\(([^)\n]+)\\)?[ \t]*\\(\\sw+\\)" |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2744 (beginning-of-line) (end-of-line) |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2745 (1 font-lock-function-name-face nil t) |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2746 (3 font-lock-variable-name-face))) |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2747 )) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2748 "Subdued level highlighting for Objective-C mode.") |
4053 | 2749 |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2750 (defconst objc-font-lock-keywords-2 |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2751 (append objc-font-lock-keywords-1 |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2752 (list |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2753 ;; |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2754 ;; Simple regexps for speed. |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2755 ;; |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2756 ;; Fontify all type specifiers. |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2757 `(eval . |
31969
9ef4cd44aaab
Replace confusing (,@ with ,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31708
diff
changeset
|
2758 (cons (concat "\\<\\(" ,objc-type-names "\\)\\>") |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2759 'font-lock-type-face)) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2760 ;; |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2761 ;; Fontify all builtin keywords (except case, default and goto; see below). |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2762 (concat "\\<\\(" objc-keywords "\\|" objc-type-specs "\\)\\>") |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2763 ;; |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2764 ;; Fontify case/goto keywords and targets, and case default/goto tags. |
17055
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
2765 '("\\<\\(case\\|goto\\)\\>[ \t]*\\(-?\\sw+\\)?" |
20951
ae0c93b9ac1f
Renamed font-lock-reference-face to font-lock-constant-face.
Simon Marshall <simon@gnu.org>
parents:
20923
diff
changeset
|
2766 (1 font-lock-keyword-face) (2 font-lock-constant-face nil t)) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2767 ;; Fontify tags iff sole statement on line, otherwise we detect selectors. |
19846
f5f2feb0bd0f
Try to comment where font-lock-keyword order is important.
Simon Marshall <simon@gnu.org>
parents:
19788
diff
changeset
|
2768 ;; This must come after the one for keywords and targets. |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2769 '(":" ("^[ \t]*\\(\\sw+\\)[ \t]*:[ \t]*$" |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2770 (beginning-of-line) (end-of-line) |
20951
ae0c93b9ac1f
Renamed font-lock-reference-face to font-lock-constant-face.
Simon Marshall <simon@gnu.org>
parents:
20923
diff
changeset
|
2771 (1 font-lock-constant-face))) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2772 ;; |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2773 ;; Fontify null object pointers. |
20951
ae0c93b9ac1f
Renamed font-lock-reference-face to font-lock-constant-face.
Simon Marshall <simon@gnu.org>
parents:
20923
diff
changeset
|
2774 '("\\<[Nn]il\\>" . font-lock-constant-face) |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2775 )) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2776 "Medium level highlighting for Objective-C mode. |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2777 See also `objc-font-lock-extra-types'.") |
4053 | 2778 |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2779 (defconst objc-font-lock-keywords-3 |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2780 (append objc-font-lock-keywords-2 |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2781 ;; |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2782 ;; More complicated regexps for more complete highlighting for types. |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2783 ;; We still have to fontify type specifiers individually, as C is so hairy. |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2784 (list |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2785 ;; |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2786 ;; Fontify all storage classes and type specifiers, plus their items. |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2787 `(eval . |
31969
9ef4cd44aaab
Replace confusing (,@ with ,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31708
diff
changeset
|
2788 (list (concat "\\<\\(" ,objc-type-names "\\)\\>" |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2789 "\\([ \t*&]+\\sw+\\>\\)*") |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2790 ;; Fontify each declaration item. |
41226
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2791 `(font-lock-match-c-style-declaration-item-and-skip-to-next |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2792 ;; Start with point after all type specifiers. |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2793 (prog1 (progn (skip-chars-forward "^;{}") (point)) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2794 (goto-char (or (match-beginning |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2795 ,(+ ,objc-type-names-depth 2)) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2796 (match-end 1)))) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2797 ;; Finish with point after first type specifier. |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2798 (goto-char (match-end 1)) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2799 ;; Fontify as a variable or function name. |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2800 (1 (if (match-beginning 2) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2801 font-lock-function-name-face |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2802 font-lock-variable-name-face))))) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2803 ;; |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2804 ;; Fontify all storage specs and types, plus their items. |
41226
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2805 `(,(concat "\\<\\(" objc-type-specs "[ \t]*\\)+\\>" "[ \t]*\\(\\sw+\\)?") |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2806 ;; The name of any type. |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2807 (,(+ objc-type-specs-depth 2) font-lock-type-face nil t) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2808 ;; Fontify each declaration item. |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2809 (font-lock-match-c++-style-declaration-item-and-skip-to-next |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2810 (save-excursion (skip-chars-forward "^;{}") (point)) nil |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2811 ;; Fontify as a variable or function name. |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2812 (1 (if (match-beginning 2) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2813 font-lock-function-name-face |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2814 font-lock-variable-name-face)))) |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2815 ;; |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2816 ;; Fontify structures, or typedef names, plus their items. |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2817 '("\\(}\\)[ \t*]*\\sw" |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2818 (font-lock-match-c-style-declaration-item-and-skip-to-next |
41226
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2819 (prog1 (progn (skip-chars-forward "^;{}") (point)) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2820 (goto-char (match-end 1))) nil |
23163
e754d3dcb5e8
(tex-font-lock-keywords-2): Fontify \nocite like \cite.
Simon Marshall <simon@gnu.org>
parents:
22892
diff
changeset
|
2821 (1 font-lock-type-face))) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2822 ;; |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2823 ;; Fontify anything at beginning of line as a declaration or definition. |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2824 '("^\\(\\sw+\\)\\>\\([ \t*]+\\sw+\\>\\)*" |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2825 (1 font-lock-type-face) |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2826 (font-lock-match-c-style-declaration-item-and-skip-to-next |
41226
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2827 (prog1 (progn (skip-chars-forward "^;{}") (point)) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2828 (goto-char (or (match-beginning 2) (match-end 1)))) nil |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2829 (1 (if (match-beginning 2) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2830 font-lock-function-name-face |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2831 font-lock-variable-name-face)))) |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2832 )) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2833 "Gaudy level highlighting for Objective-C mode. |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2834 See also `objc-font-lock-extra-types'.") |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2835 ) |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2836 |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2837 (defvar objc-font-lock-keywords objc-font-lock-keywords-1 |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2838 "Default expressions to highlight in Objective-C mode. |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2839 See also `objc-font-lock-extra-types'.") |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2840 |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2841 ;;; Java. |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2842 |
24512
ca92d7df3b48
* font-lock.el (c-font-lock-keywords-2): Only fontify a label if it is
Simon Marshall <simon@gnu.org>
parents:
24502
diff
changeset
|
2843 ;; Regexps written with help from Fred White <fwhite@bbn.com>, |
ca92d7df3b48
* font-lock.el (c-font-lock-keywords-2): Only fontify a label if it is
Simon Marshall <simon@gnu.org>
parents:
24502
diff
changeset
|
2844 ;; Anders Lindgren <andersl@andersl.com> and Carl Manning <caroma@ai.mit.edu>. |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
2845 (let* ((java-keywords |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2846 (eval-when-compile |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2847 (regexp-opt |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2848 '("catch" "do" "else" "super" "this" "finally" "for" "if" |
24336
3c68ad53545e
* font-lock.el (c++-font-lock-keywords-3): Use c-at-toplevel-p to distinguish
Simon Marshall <simon@gnu.org>
parents:
24216
diff
changeset
|
2849 ;; Anders Lindgren <andersl@andersl.com> says these have gone. |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2850 ;; "cast" "byvalue" "future" "generic" "operator" "var" |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2851 ;; "inner" "outer" "rest" |
24336
3c68ad53545e
* font-lock.el (c++-font-lock-keywords-3): Use c-at-toplevel-p to distinguish
Simon Marshall <simon@gnu.org>
parents:
24216
diff
changeset
|
2852 "implements" "extends" "throws" "instanceof" "new" |
32306
86a849ccfae1
(font-lock-defaults): Make buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32272
diff
changeset
|
2853 "interface" "return" "switch" "throw" "try" "while")))) |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
2854 ;; |
24336
3c68ad53545e
* font-lock.el (c++-font-lock-keywords-3): Use c-at-toplevel-p to distinguish
Simon Marshall <simon@gnu.org>
parents:
24216
diff
changeset
|
2855 ;; Classes immediately followed by an object name. |
3c68ad53545e
* font-lock.el (c++-font-lock-keywords-3): Use c-at-toplevel-p to distinguish
Simon Marshall <simon@gnu.org>
parents:
24216
diff
changeset
|
2856 (java-type-names |
3c68ad53545e
* font-lock.el (c++-font-lock-keywords-3): Use c-at-toplevel-p to distinguish
Simon Marshall <simon@gnu.org>
parents:
24216
diff
changeset
|
2857 `(mapconcat 'identity |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2858 (cons |
31969
9ef4cd44aaab
Replace confusing (,@ with ,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31708
diff
changeset
|
2859 ,(eval-when-compile |
9ef4cd44aaab
Replace confusing (,@ with ,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31708
diff
changeset
|
2860 (regexp-opt '("boolean" "char" "byte" "short" "int" "long" |
9ef4cd44aaab
Replace confusing (,@ with ,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31708
diff
changeset
|
2861 "float" "double" "void"))) |
24336
3c68ad53545e
* font-lock.el (c++-font-lock-keywords-3): Use c-at-toplevel-p to distinguish
Simon Marshall <simon@gnu.org>
parents:
24216
diff
changeset
|
2862 java-font-lock-extra-types) |
3c68ad53545e
* font-lock.el (c++-font-lock-keywords-3): Use c-at-toplevel-p to distinguish
Simon Marshall <simon@gnu.org>
parents:
24216
diff
changeset
|
2863 "\\|")) |
31969
9ef4cd44aaab
Replace confusing (,@ with ,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31708
diff
changeset
|
2864 (java-type-names-depth `(regexp-opt-depth ,java-type-names)) |
17161
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
2865 ;; |
a2d3b455c6f4
Allow arbitrary regexps in *-font-lock-extra-types.
Simon Marshall <simon@gnu.org>
parents:
17055
diff
changeset
|
2866 ;; These are eventually followed by an object name. |
24336
3c68ad53545e
* font-lock.el (c++-font-lock-keywords-3): Use c-at-toplevel-p to distinguish
Simon Marshall <simon@gnu.org>
parents:
24216
diff
changeset
|
2867 (java-type-specs |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2868 (eval-when-compile |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2869 (regexp-opt |
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2870 '("abstract" "const" "final" "synchronized" "transient" "static" |
24336
3c68ad53545e
* font-lock.el (c++-font-lock-keywords-3): Use c-at-toplevel-p to distinguish
Simon Marshall <simon@gnu.org>
parents:
24216
diff
changeset
|
2871 ;; Anders Lindgren <andersl@andersl.com> says this has gone. |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2872 ;; "threadsafe" |
24502
5583aa06a287
added strictfp type modifier.
Simon Marshall <simon@gnu.org>
parents:
24501
diff
changeset
|
2873 "volatile" "public" "private" "protected" "native" |
5583aa06a287
added strictfp type modifier.
Simon Marshall <simon@gnu.org>
parents:
24501
diff
changeset
|
2874 ;; Carl Manning <caroma@ai.mit.edu> says this is new. |
5583aa06a287
added strictfp type modifier.
Simon Marshall <simon@gnu.org>
parents:
24501
diff
changeset
|
2875 "strictfp")))) |
18025
9f9f522cdc27
Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents:
17543
diff
changeset
|
2876 ) |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2877 (defconst java-font-lock-keywords-1 |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2878 (list |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2879 ;; |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2880 ;; Fontify class names. |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2881 '("\\<\\(class\\)\\>[ \t]*\\(\\sw+\\)?" |
24512
ca92d7df3b48
* font-lock.el (c-font-lock-keywords-2): Only fontify a label if it is
Simon Marshall <simon@gnu.org>
parents:
24502
diff
changeset
|
2882 (1 font-lock-keyword-face) (2 font-lock-type-face nil t)) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2883 ;; |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2884 ;; Fontify package names in import directives. |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2885 '("\\<\\(import\\|package\\)\\>[ \t]*\\(\\sw+\\)?" |
24336
3c68ad53545e
* font-lock.el (c++-font-lock-keywords-3): Use c-at-toplevel-p to distinguish
Simon Marshall <simon@gnu.org>
parents:
24216
diff
changeset
|
2886 (1 font-lock-keyword-face) |
3c68ad53545e
* font-lock.el (c++-font-lock-keywords-3): Use c-at-toplevel-p to distinguish
Simon Marshall <simon@gnu.org>
parents:
24216
diff
changeset
|
2887 (2 font-lock-constant-face nil t) |
3c68ad53545e
* font-lock.el (c++-font-lock-keywords-3): Use c-at-toplevel-p to distinguish
Simon Marshall <simon@gnu.org>
parents:
24216
diff
changeset
|
2888 ("\\=\\.\\(\\*\\|\\sw+\\)" nil nil |
3c68ad53545e
* font-lock.el (c++-font-lock-keywords-3): Use c-at-toplevel-p to distinguish
Simon Marshall <simon@gnu.org>
parents:
24216
diff
changeset
|
2889 (1 font-lock-constant-face nil t))) |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2890 ) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2891 "Subdued level highlighting for Java mode.") |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2892 |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2893 (defconst java-font-lock-keywords-2 |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2894 (append java-font-lock-keywords-1 |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2895 (list |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2896 ;; |
24336
3c68ad53545e
* font-lock.el (c++-font-lock-keywords-3): Use c-at-toplevel-p to distinguish
Simon Marshall <simon@gnu.org>
parents:
24216
diff
changeset
|
2897 ;; Fontify class names. |
3c68ad53545e
* font-lock.el (c++-font-lock-keywords-3): Use c-at-toplevel-p to distinguish
Simon Marshall <simon@gnu.org>
parents:
24216
diff
changeset
|
2898 `(eval . |
31969
9ef4cd44aaab
Replace confusing (,@ with ,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31708
diff
changeset
|
2899 (cons (concat "\\<\\(" ,java-type-names "\\)\\>[^.]") |
24512
ca92d7df3b48
* font-lock.el (c-font-lock-keywords-2): Only fontify a label if it is
Simon Marshall <simon@gnu.org>
parents:
24502
diff
changeset
|
2900 '(1 font-lock-type-face))) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2901 ;; |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2902 ;; Fontify all builtin keywords (except below). |
24336
3c68ad53545e
* font-lock.el (c++-font-lock-keywords-3): Use c-at-toplevel-p to distinguish
Simon Marshall <simon@gnu.org>
parents:
24216
diff
changeset
|
2903 (concat "\\<\\(" java-keywords "\\|" java-type-specs "\\)\\>") |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2904 ;; |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2905 ;; Fontify keywords and targets, and case default/goto tags. |
17055
f0f8005780cc
1. If PRE-MATCH-FORM returns a suitable number, use that as a value for LIMIT.
Simon Marshall <simon@gnu.org>
parents:
16852
diff
changeset
|
2906 (list "\\<\\(break\\|case\\|continue\\|goto\\)\\>[ \t]*\\(-?\\sw+\\)?" |
20951
ae0c93b9ac1f
Renamed font-lock-reference-face to font-lock-constant-face.
Simon Marshall <simon@gnu.org>
parents:
20923
diff
changeset
|
2907 '(1 font-lock-keyword-face) '(2 font-lock-constant-face nil t)) |
19846
f5f2feb0bd0f
Try to comment where font-lock-keyword order is important.
Simon Marshall <simon@gnu.org>
parents:
19788
diff
changeset
|
2908 ;; This must come after the one for keywords and targets. |
24512
ca92d7df3b48
* font-lock.el (c-font-lock-keywords-2): Only fontify a label if it is
Simon Marshall <simon@gnu.org>
parents:
24502
diff
changeset
|
2909 '(":" ("^[ \t]*\\(\\sw+\\)[ \t]*:[ \t]*$" |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2910 (beginning-of-line) (end-of-line) |
20951
ae0c93b9ac1f
Renamed font-lock-reference-face to font-lock-constant-face.
Simon Marshall <simon@gnu.org>
parents:
20923
diff
changeset
|
2911 (1 font-lock-constant-face))) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2912 ;; |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2913 ;; Fontify all constants. |
20951
ae0c93b9ac1f
Renamed font-lock-reference-face to font-lock-constant-face.
Simon Marshall <simon@gnu.org>
parents:
20923
diff
changeset
|
2914 '("\\<\\(false\\|null\\|true\\)\\>" . font-lock-constant-face) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2915 ;; |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2916 ;; Javadoc tags within comments. |
27905
2c4966aa6acd
(java-keywords): Added missing java 1.2.2 Javadoc tags.
Gerd Moellmann <gerd@gnu.org>
parents:
27636
diff
changeset
|
2917 (list |
2c4966aa6acd
(java-keywords): Added missing java 1.2.2 Javadoc tags.
Gerd Moellmann <gerd@gnu.org>
parents:
27636
diff
changeset
|
2918 (concat "@\\(" |
2c4966aa6acd
(java-keywords): Added missing java 1.2.2 Javadoc tags.
Gerd Moellmann <gerd@gnu.org>
parents:
27636
diff
changeset
|
2919 "author\\|deprecated\\|exception" |
2c4966aa6acd
(java-keywords): Added missing java 1.2.2 Javadoc tags.
Gerd Moellmann <gerd@gnu.org>
parents:
27636
diff
changeset
|
2920 "\\|link\\|return\\|see\\|serial\\|serialData\\|serialField" |
2c4966aa6acd
(java-keywords): Added missing java 1.2.2 Javadoc tags.
Gerd Moellmann <gerd@gnu.org>
parents:
27636
diff
changeset
|
2921 "\\|since\\|throws" |
2c4966aa6acd
(java-keywords): Added missing java 1.2.2 Javadoc tags.
Gerd Moellmann <gerd@gnu.org>
parents:
27636
diff
changeset
|
2922 "\\|version" |
33642
26e82f006e90
(java-keywords): Add MATCH-HIGHLIGHT part for
Gerd Moellmann <gerd@gnu.org>
parents:
33360
diff
changeset
|
2923 "\\)\\>") |
26e82f006e90
(java-keywords): Add MATCH-HIGHLIGHT part for
Gerd Moellmann <gerd@gnu.org>
parents:
33360
diff
changeset
|
2924 '(1 font-lock-constant-face prepend)) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2925 '("@\\(param\\)\\>[ \t]*\\(\\sw+\\)?" |
20951
ae0c93b9ac1f
Renamed font-lock-reference-face to font-lock-constant-face.
Simon Marshall <simon@gnu.org>
parents:
20923
diff
changeset
|
2926 (1 font-lock-constant-face prepend) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2927 (2 font-lock-variable-name-face prepend t)) |
26915
11fddded9ceb
(java-keywords): Add Javadoc tags as of JDK 1.2.1.
Gerd Moellmann <gerd@gnu.org>
parents:
26775
diff
changeset
|
2928 '("@\\(exception\\|throws\\)\\>[ \t]*\\(\\S-+\\)?" |
11fddded9ceb
(java-keywords): Add Javadoc tags as of JDK 1.2.1.
Gerd Moellmann <gerd@gnu.org>
parents:
26775
diff
changeset
|
2929 (1 font-lock-constant-face prepend) |
11fddded9ceb
(java-keywords): Add Javadoc tags as of JDK 1.2.1.
Gerd Moellmann <gerd@gnu.org>
parents:
26775
diff
changeset
|
2930 (2 font-lock-type-face prepend t)) |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2931 )) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2932 "Medium level highlighting for Java mode. |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2933 See also `java-font-lock-extra-types'.") |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2934 |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2935 (defconst java-font-lock-keywords-3 |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2936 (append java-font-lock-keywords-2 |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2937 ;; |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2938 ;; More complicated regexps for more complete highlighting for types. |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2939 ;; We still have to fontify type specifiers individually, as Java is hairy. |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2940 (list |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2941 ;; |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2942 ;; Fontify random types immediately followed by an item or items. |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2943 `(eval . |
31969
9ef4cd44aaab
Replace confusing (,@ with ,
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31708
diff
changeset
|
2944 (list (concat "\\<\\(" ,java-type-names "\\)\\>" |
16578
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2945 "\\([ \t]*\\[[ \t]*\\]\\)*" |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2946 "\\([ \t]*\\sw\\)") |
c921b60ee783
(a) add font-lock-keywords-alist, (b) fix compilation of quoted conses in keyword form, (c) make simple font-lock-match-c-style-declaration-item-and-skip-to-next and more complex font-lock-match-c++-style-declaration-item-and-skip-to-next.
Simon Marshall <simon@gnu.org>
parents:
16456
diff
changeset
|
2947 ;; Fontify each declaration item. |
41226
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2948 `(font-lock-match-c-style-declaration-item-and-skip-to-next |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2949 ;; Start and finish with point after the type specifier. |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2950 (prog1 (progn (skip-chars-forward "^;{}") (point)) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2951 (goto-char (match-beginning ,(+ ,java-type-names-depth 3)))) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2952 (goto-char (match-beginning ,(+ ,java-type-names-depth 3))) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2953 ;; Fontify as a variable or function name. |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2954 (1 (if (match-beginning 2) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2955 font-lock-function-name-face |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2956 font-lock-variable-name-face))))) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2957 ;; |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2958 ;; Fontify those that are eventually followed by an item or items. |
41226
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2959 `(,(concat "\\<\\(" java-type-specs "\\)\\>" |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2960 "\\([ \t]+\\sw+\\>" |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2961 "\\([ \t]*\\[[ \t]*\\]\\)*" |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2962 "\\)*") |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2963 ;; Fontify each declaration item. |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2964 (font-lock-match-c-style-declaration-item-and-skip-to-next |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2965 ;; Start with point after all type specifiers. |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2966 (prog1 (progn (skip-chars-forward "^;{}") (point)) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2967 (goto-char (or (match-beginning 5) (match-end 1)))) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2968 ;; Finish with point after first type specifier. |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2969 (goto-char (match-end 1)) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2970 ;; Fontify as a variable or function name. |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2971 (1 (if (match-beginning 2) |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2972 font-lock-function-name-face |
170c7bb7fc74
(font-lock-compile-keywords): New arg `regexp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40780
diff
changeset
|
2973 font-lock-variable-name-face)))) |
40394
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2974 )) |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2975 "Gaudy level highlighting for Java mode. |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2976 See also `java-font-lock-extra-types'.") |
b2fcb3933879
Require `syntax'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40339
diff
changeset
|
2977 ) |
16456
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2978 |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2979 (defvar java-font-lock-keywords java-font-lock-keywords-1 |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2980 "Default expressions to highlight in Java mode. |
63b6583c9e5c
Changes to font-lock-fontify-syntactically-region: (a) the cache position must be a marker, (b) use a loop to look for comment start, some speedups.
Simon Marshall <simon@gnu.org>
parents:
15814
diff
changeset
|
2981 See also `java-font-lock-extra-types'.") |
12813
c9ed95ec05b6
Functionality for font-lock-beginning-of-syntax-function to be used by font-lock-fontify-region when calculating the cache state. Also wrap value of buffer-file-truename to guard against clash detection. Also add scheme-font-lock-keywords.
Simon Marshall <simon@gnu.org>
parents:
12626
diff
changeset
|
2982 |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
2983 ;; Provide ourselves: |
7491
621c162a80db
(font-lock-no-comments): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
2984 |
40540
e5cf2302abcd
(java-font-lock-syntactic-face-function): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40394
diff
changeset
|
2985 (defun java-font-lock-syntactic-face-function (state) |
e5cf2302abcd
(java-font-lock-syntactic-face-function): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40394
diff
changeset
|
2986 (save-excursion |
e5cf2302abcd
(java-font-lock-syntactic-face-function): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40394
diff
changeset
|
2987 (if (nth 3 state) |
e5cf2302abcd
(java-font-lock-syntactic-face-function): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40394
diff
changeset
|
2988 ;; Check whether the string is properly terminated. |
e5cf2302abcd
(java-font-lock-syntactic-face-function): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40394
diff
changeset
|
2989 (let ((nstate (parse-partial-sexp (point) (line-end-position) |
e5cf2302abcd
(java-font-lock-syntactic-face-function): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40394
diff
changeset
|
2990 nil nil state 'syntax-table))) |
e5cf2302abcd
(java-font-lock-syntactic-face-function): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40394
diff
changeset
|
2991 (if (and (eolp) (nth 3 nstate)) |
e5cf2302abcd
(java-font-lock-syntactic-face-function): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40394
diff
changeset
|
2992 ;; We're inside a string, at EOL. The JLS says that: |
e5cf2302abcd
(java-font-lock-syntactic-face-function): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40394
diff
changeset
|
2993 ;; It is a compile-time error for a line terminator to |
e5cf2302abcd
(java-font-lock-syntactic-face-function): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40394
diff
changeset
|
2994 ;; appear after the opening " and before the closing |
e5cf2302abcd
(java-font-lock-syntactic-face-function): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40394
diff
changeset
|
2995 ;; matching ". |
e5cf2302abcd
(java-font-lock-syntactic-face-function): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40394
diff
changeset
|
2996 font-lock-warning-face |
e5cf2302abcd
(java-font-lock-syntactic-face-function): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40394
diff
changeset
|
2997 font-lock-string-face)) |
e5cf2302abcd
(java-font-lock-syntactic-face-function): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40394
diff
changeset
|
2998 (goto-char (nth 8 state)) |
e5cf2302abcd
(java-font-lock-syntactic-face-function): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40394
diff
changeset
|
2999 (if (looking-at "/\\*\\*") |
e5cf2302abcd
(java-font-lock-syntactic-face-function): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40394
diff
changeset
|
3000 font-lock-doc-face |
e5cf2302abcd
(java-font-lock-syntactic-face-function): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40394
diff
changeset
|
3001 font-lock-comment-face)))) |
e5cf2302abcd
(java-font-lock-syntactic-face-function): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40394
diff
changeset
|
3002 |
4053 | 3003 (provide 'font-lock) |
39146
d1a5ac2a48eb
(toplevel): Require `jit-lock' only if
Gerd Moellmann <gerd@gnu.org>
parents:
38491
diff
changeset
|
3004 |
d1a5ac2a48eb
(toplevel): Require `jit-lock' only if
Gerd Moellmann <gerd@gnu.org>
parents:
38491
diff
changeset
|
3005 (when (eq font-lock-support-mode 'jit-lock-mode) |
d1a5ac2a48eb
(toplevel): Require `jit-lock' only if
Gerd Moellmann <gerd@gnu.org>
parents:
38491
diff
changeset
|
3006 (require 'jit-lock)) |
4053 | 3007 |
3008 ;;; font-lock.el ends here |