Mercurial > emacs
annotate lisp/font-lock.el @ 16632:5dd86f31843a
(compose-mail): Handle several more args:
other-headers continue switch-function yank-action send-action.
(sendmail-user-agent): Rewrite to handle new args.
(assoc-ignore-case): New function.
(define-mail-user-agent): Doc fix.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Sat, 07 Dec 1996 21:30:17 +0000 |
parents | c921b60ee783 |
children | 70e9b1d69d0d |
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 |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
3 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc. |
4053 | 4 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
5 ;; Author: jwz, then rms, then sm <simon@gnu.ai.mit.edu> |
4053 | 6 ;; Maintainer: FSF |
7 ;; Keywords: languages, faces | |
8 | |
9 ;; This file is part of GNU Emacs. | |
10 | |
11 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
12 ;; it under the terms of the GNU General Public License as published by | |
13 ;; the Free Software Foundation; either version 2, or (at your option) | |
14 ;; any later version. | |
15 | |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
14169 | 22 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
23 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
24 ;; Boston, MA 02111-1307, USA. | |
4053 | 25 |
26 ;;; Commentary: | |
27 | |
9487
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
28 ;; 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
|
29 ;; one face, strings in another, reserved words in another, and so on. |
4053 | 30 ;; |
31 ;; Comments will be displayed in `font-lock-comment-face'. | |
32 ;; 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
|
33 ;; Regexps are used to display selected patterns in other faces. |
4053 | 34 ;; |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
35 ;; 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
|
36 ;; 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
|
37 ;; every insertion or deletion. |
4053 | 38 ;; |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
39 ;; To turn Font Lock mode on automatically, add this to your ~/.emacs file: |
4053 | 40 ;; |
9487
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
41 ;; (add-hook 'emacs-lisp-mode-hook 'turn-on-font-lock) |
4053 | 42 ;; |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
43 ;; 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
|
44 ;; |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
45 ;; (global-font-lock-mode t) |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
46 ;; |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
47 ;; 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
|
48 ;; 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
|
49 ;; 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
|
50 ;; 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
|
51 ;; 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
|
52 |
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
|
53 ;;; 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
|
54 |
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
|
55 ;; 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
|
56 ;; 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
|
57 ;; 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
|
58 ;; 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
|
59 ;; 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
|
60 ;; 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
|
61 ;; 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
|
62 ;; 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
|
63 ;; (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
|
64 ;; 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
|
65 ;; fontification based on `font-lock-maximum-decoration'. |
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
|
66 |
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
|
67 ;;; 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
|
68 |
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
|
69 ;; 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
|
70 ;; |
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
|
71 ;; Nasty regexps of the form "bar\\(\\|lo\\)\\|f\\(oo\\|u\\(\\|bar\\)\\)\\|lo" |
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
|
72 ;; are made thusly: (make-regexp '("foo" "fu" "fubar" "bar" "barlo" "lo")) for |
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
|
73 ;; efficiency. See /pub/gnu/emacs/elisp-archive/functions/make-regexp.el.Z on |
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
|
74 ;; archive.cis.ohio-state.edu for this and other functions not just by simon. |
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
|
75 |
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
|
76 ;;; 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
|
77 |
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
|
78 ;; 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
|
79 ;; 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
|
80 ;; 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
|
81 ;; `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
|
82 ;; 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
|
83 ;; 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
|
84 ;; |
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
|
85 ;; (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
|
86 ;; |
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
|
87 ;; 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
|
88 ;; 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
|
89 ;; 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
|
90 |
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
|
91 ;;; 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
|
92 |
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
|
93 ;; 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
|
94 ;; 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
|
95 ;; 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
|
96 ;; 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
|
97 ;; 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
|
98 ;; 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
|
99 ;; 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
|
100 ;; |
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
|
101 ;; (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
|
102 ;; '(("\\<\\(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
|
103 ;; ("\\<\\(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
|
104 ;; "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
|
105 ;; |
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
106 ;; (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
|
107 ;; (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
|
108 ;; (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
|
109 ;; (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
|
110 |
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 ;;; 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
|
112 |
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
|
113 ;; 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
|
114 ;; 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
|
115 ;; 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
|
116 ;; 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
|
117 ;; 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
|
118 ;; 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
|
119 ;; 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
|
120 ;; 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
|
121 ;; |
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
|
122 ;; (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
|
123 ;; '(("\\<\\(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
|
124 ;; ("\\<\\(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
|
125 ;; "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
|
126 ;; |
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 ;; 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
|
128 ;; |
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 ;; (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
|
130 ;; (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
|
131 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
132 ;; 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
|
133 ;; 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
|
134 ;; 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
|
135 ;; 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
|
136 ;; 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
|
137 ;; 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
|
138 ;; 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
|
139 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
140 ;; So, here are my opinions/advice/guidelines: |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
141 ;; |
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
|
142 ;; - 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
|
143 ;; 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
|
144 ;; 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
|
145 ;; - 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
|
146 ;; i.e., (a) above. |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
147 ;; - 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
|
148 ;; 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
|
149 ;; 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
|
150 ;; - 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
|
151 ;; 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
|
152 ;; 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
|
153 ;; 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
|
154 ;; - 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
|
155 ;; 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
|
156 ;; 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
|
157 ;; 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
|
158 ;; - Err, that's it. |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
159 |
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
|
160 ;;; 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
|
161 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
162 ;; User variables. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
163 |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
164 (defvar font-lock-verbose (* 0 1024) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
165 "*If non-nil, means show status messages for buffer fontification. |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
166 If a number, only buffers greater than this size have fontification messages.") |
4053 | 167 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
168 ;;;###autoload |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
169 (defvar font-lock-maximum-decoration nil |
14780
1d10e4a2fb51
Treat font-lock-keywords of (t) the same as nil.
Simon Marshall <simon@gnu.org>
parents:
14778
diff
changeset
|
170 "*Maximum decoration level for fontification. |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
171 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
|
172 If t, use the maximum decoration available. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
173 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
|
174 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
|
175 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
|
176 ((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
|
177 means use the maximum decoration available for buffers in C mode, level 2 |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
178 decoration for buffers in C++ mode, and level 1 decoration otherwise.") |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
179 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
180 ;;;###autoload |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
181 (defvar font-lock-maximum-size (* 250 1024) |
14780
1d10e4a2fb51
Treat font-lock-keywords of (t) the same as nil.
Simon Marshall <simon@gnu.org>
parents:
14778
diff
changeset
|
182 "*Maximum size of a buffer for buffer fontification. |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
183 Only buffers less than this can be fontified when Font Lock mode is turned on. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
184 If nil, means size is irrelevant. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
185 If a list, each element should be a cons pair of the form (MAJOR-MODE . SIZE), |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
186 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
|
187 ((c-mode . 256000) (c++-mode . 256000) (rmail-mode . 1048576)) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
188 means that the maximum size is 250K for buffers in C or C++ modes, one megabyte |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
189 for buffers in Rmail mode, and size is irrelevant otherwise.") |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
190 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
191 ;; Fontification variables: |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
192 |
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
|
193 ;; Originally these variable values were face names such as `bold' etc. |
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
|
194 ;; Now we create our own faces, but we keep these variables for compatibility |
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
|
195 ;; and they give users another mechanism for changing face appearance. |
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
|
196 ;; We now allow a FACENAME in `font-lock-keywords' to be any expression that |
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
|
197 ;; returns a face. So the easiest thing is to continue using these variables, |
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
|
198 ;; rather than sometimes evaling FACENAME and sometimes not. |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
199 (defvar font-lock-comment-face 'font-lock-comment-face |
4053 | 200 "Face to use for comments.") |
201 | |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
202 (defvar font-lock-string-face 'font-lock-string-face |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
203 "Face to use for strings.") |
4053 | 204 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
205 (defvar font-lock-keyword-face 'font-lock-keyword-face |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
206 "Face to use for keywords.") |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
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 (defvar font-lock-builtin-face 'font-lock-builtin-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
|
209 "Face to use for builtins.") |
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
|
210 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
211 (defvar font-lock-function-name-face 'font-lock-function-name-face |
4053 | 212 "Face to use for function names.") |
213 | |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
214 (defvar font-lock-variable-name-face 'font-lock-variable-name-face |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
215 "Face to use for variable names.") |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
216 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
217 (defvar font-lock-type-face 'font-lock-type-face |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
218 "Face to use for type names.") |
4053 | 219 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
220 (defvar font-lock-reference-face 'font-lock-reference-face |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
221 "Face to use for reference names.") |
4053 | 222 |
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
|
223 (defvar font-lock-warning-face 'font-lock-warning-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
|
224 "Face to use for things that should stand out.") |
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
|
225 |
4053 | 226 (defvar font-lock-keywords 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
|
227 "*A list of the keywords to highlight. |
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
|
228 Each element should be of the form: |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
229 |
11515
0ebfc7701ebf
Make font-lock.el use compiled keywords; added FN as possible matcher.
Simon Marshall <simon@gnu.org>
parents:
11467
diff
changeset
|
230 MATCHER |
0ebfc7701ebf
Make font-lock.el use compiled keywords; added FN as possible matcher.
Simon Marshall <simon@gnu.org>
parents:
11467
diff
changeset
|
231 (MATCHER . MATCH) |
0ebfc7701ebf
Make font-lock.el use compiled keywords; added FN as possible matcher.
Simon Marshall <simon@gnu.org>
parents:
11467
diff
changeset
|
232 (MATCHER . FACENAME) |
0ebfc7701ebf
Make font-lock.el use compiled keywords; added FN as possible matcher.
Simon Marshall <simon@gnu.org>
parents:
11467
diff
changeset
|
233 (MATCHER . HIGHLIGHT) |
0ebfc7701ebf
Make font-lock.el use compiled keywords; added FN as possible matcher.
Simon Marshall <simon@gnu.org>
parents:
11467
diff
changeset
|
234 (MATCHER HIGHLIGHT ...) |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
235 (eval . FORM) |
4053 | 236 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
237 where HIGHLIGHT should be either MATCH-HIGHLIGHT or MATCH-ANCHORED. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
238 |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
239 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
|
240 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
|
241 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
|
242 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
243 For highlighting single items, typically only MATCH-HIGHLIGHT is required. |
13982 | 244 However, if an item or (typically) items are to be highlighted following the |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
245 instance of another item (the anchor) then MATCH-ANCHORED may be required. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
246 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
247 MATCH-HIGHLIGHT should be of the form: |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
248 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
249 (MATCH FACENAME OVERRIDE LAXMATCH) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
250 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
251 Where MATCHER can be either the regexp to search for, or the function name to |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
252 call to make the search (called with one argument, the limit of the search). |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
253 MATCH is the subexpression of MATCHER to be highlighted. FACENAME is an |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
254 expression whose value is the face name to use. FACENAME's default attributes |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
255 may be defined in `font-lock-face-attributes'. |
4053 | 256 |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
257 OVERRIDE and LAXMATCH are flags. If OVERRIDE is t, existing fontification may |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
258 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
|
259 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
|
260 which the new or existing fontification, respectively, takes precedence. |
13982 | 261 If LAXMATCH is non-nil, no error is signaled if there is no MATCH in MATCHER. |
4053 | 262 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
263 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
|
264 |
13440
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
265 \"\\\\\\=<foo\\\\\\=>\" Discrete occurrences of \"foo\" in the value of the |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
266 variable `font-lock-keyword-face'. |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
267 (\"fu\\\\(bar\\\\)\" . 1) Substring \"bar\" within all occurrences of \"fubar\" in |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
268 the value of `font-lock-keyword-face'. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
269 (\"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
|
270 (\"foo\\\\|bar\" 0 foo-bar-face t) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
271 Occurrences of either \"foo\" or \"bar\" in the value |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
272 of `foo-bar-face', even if already highlighted. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
273 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
274 MATCH-ANCHORED should be of the form: |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
275 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
276 (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
|
277 |
13440
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
278 Where MATCHER is as for MATCH-HIGHLIGHT with one exception. The limit of the |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
279 search is currently guaranteed to be (no greater than) the end of the line. |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
280 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
|
281 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
|
282 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
|
283 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
|
284 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
|
285 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
|
286 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
287 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
|
288 |
13440
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
289 (\"\\\\\\=<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
|
290 |
13440
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
291 Discrete occurrences of \"anchor\" in the value of `anchor-face', and subsequent |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
292 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
|
293 (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
|
294 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
|
295 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
|
296 for \"item\" concluded.) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
297 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
298 Note that the MATCH-ANCHORED feature is experimental; in the future, we may |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
299 replace it with other ways of providing this functionality. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
300 |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
301 These regular expressions should not match text which spans lines. While |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
302 \\[font-lock-fontify-buffer] handles multi-line patterns correctly, updating |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
303 when you edit the buffer does not, since it considers text one line at a time. |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
304 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
305 Be very careful composing regexps for this list; |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
306 the wrong pattern can dramatically slow things down!") |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
307 (make-variable-buffer-local 'font-lock-keywords) |
4053 | 308 |
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
|
309 ;; 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
|
310 ;; 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
|
311 ;; 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
|
312 (defvar font-lock-defaults nil |
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
313 "If set by a major mode, should be the defaults for Font Lock mode. |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
314 The value should be like the `cdr' of an item in `font-lock-defaults-alist'.") |
9487
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
315 |
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
|
316 ;; 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
|
317 (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
|
318 (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
|
319 ;; 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
|
320 ;; 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
|
321 (c-mode-defaults |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
322 '((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
|
323 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
|
324 nil nil ((?_ . "w")) beginning-of-defun |
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
|
325 (font-lock-comment-start-regexp . "/[*/]") |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
326 (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
|
327 (c++-mode-defaults |
c80966dc0b60
Specify in font-lock-defaults/font-lock-defaults-alist which keywords we can
Simon Marshall <simon@gnu.org>
parents:
12268
diff
changeset
|
328 '((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
|
329 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
|
330 nil nil ((?_ . "w") (?~ . "w")) beginning-of-defun |
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
|
331 (font-lock-comment-start-regexp . "/[*/]") |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
332 (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
|
333 (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
|
334 '((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
|
335 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
|
336 nil nil ((?_ . "w") (?$ . "w")) 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
|
337 (font-lock-comment-start-regexp . "/[*/]") |
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
|
338 (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
|
339 (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
|
340 '((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
|
341 java-font-lock-keywords-2 java-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
|
342 nil nil ((?_ . "w") (?$ . "w") (?. . "w")) 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
|
343 (font-lock-comment-start-regexp . "/[*/]") |
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
|
344 (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
|
345 (lisp-mode-defaults |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
346 '((lisp-font-lock-keywords |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
347 lisp-font-lock-keywords-1 lisp-font-lock-keywords-2) |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
348 nil nil (("+-*/.<>=!?$%_&~^:" . "w")) beginning-of-defun |
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
|
349 (font-lock-comment-start-regexp . ";") |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
350 (font-lock-mark-block-function . mark-defun))) |
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
|
351 (scheme-mode-defaults |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
352 '(scheme-font-lock-keywords |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
353 nil t (("+-*/.<>=!?$%_&~^:" . "w")) beginning-of-defun |
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
|
354 (font-lock-comment-start-regexp . ";") |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
355 (font-lock-mark-block-function . mark-defun))) |
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
|
356 ;; For TeX modes we could use `backward-paragraph' for the same reason. |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
357 ;; But we don't, because paragraph breaks are arguably likely enough to |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
358 ;; occur within a genuine syntactic block to make it too risky. |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
359 ;; However, we do specify a MARK-BLOCK function as that cannot result |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
360 ;; in a mis-fontification even if it might not fontify enough. --sm. |
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
|
361 (tex-mode-defaults |
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
|
362 '(tex-font-lock-keywords nil nil ((?$ . "\"")) nil |
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
|
363 (font-lock-comment-start-regexp . "%") |
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
|
364 (font-lock-mark-block-function . mark-paragraph))) |
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
|
365 ) |
11515
0ebfc7701ebf
Make font-lock.el use compiled keywords; added FN as possible matcher.
Simon Marshall <simon@gnu.org>
parents:
11467
diff
changeset
|
366 (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
|
367 (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
|
368 (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
|
369 (cons 'objc-mode 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
|
370 (cons 'java-mode java-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
|
371 (cons 'emacs-lisp-mode lisp-mode-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
|
372 (cons 'inferior-scheme-mode scheme-mode-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
|
373 (cons 'latex-mode tex-mode-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
|
374 (cons 'lisp-mode lisp-mode-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
|
375 (cons 'lisp-interaction-mode lisp-mode-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
|
376 (cons 'plain-tex-mode tex-mode-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
|
377 (cons 'scheme-mode scheme-mode-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
|
378 (cons 'scheme-interaction-mode scheme-mode-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
|
379 (cons 'slitex-mode tex-mode-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
|
380 (cons 'tex-mode tex-mode-defaults))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
381 "Alist of default major mode and 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
|
382 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
|
383 |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
384 (MAJOR-MODE . (KEYWORDS KEYWORDS-ONLY CASE-FOLD SYNTAX-ALIST SYNTAX-BEGIN |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
385 ...)) |
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
|
386 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
387 where MAJOR-MODE is a symbol. KEYWORDS may be a symbol (a variable or function |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
388 whose value is the keywords to use for fontification) or a list of symbols. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
389 If KEYWORDS-ONLY is non-nil, syntactic fontification (strings and comments) is |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
390 not performed. If CASE-FOLD is non-nil, the case of the keywords is ignored |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
391 when fontifying. If SYNTAX-ALIST is non-nil, it should be a list of cons pairs |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
392 of the form (CHAR-OR-STRING . STRING) used to set the local Font Lock syntax |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
393 table, for keyword and syntactic fontification (see `modify-syntax-entry'). |
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
|
394 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
395 If SYNTAX-BEGIN is non-nil, it should be a function with no args used to move |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
396 backwards outside any enclosing syntactic block, for syntactic fontification. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
397 Typical values are `beginning-of-line' (i.e., the start of the line is known to |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
398 be outside a syntactic block), or `beginning-of-defun' for programming modes or |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
399 `backward-paragraph' for textual modes (i.e., the mode-dependent function is |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
400 known to move outside a syntactic block). If nil, the beginning of the buffer |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
401 is used as a position outside of a syntactic block, in the worst case. |
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
|
402 |
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
|
403 These item elements are used by Font Lock mode to set the variables |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
404 `font-lock-keywords', `font-lock-keywords-only', |
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
|
405 `font-lock-keywords-case-fold-search', `font-lock-syntax-table' and |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
406 `font-lock-beginning-of-syntax-function', respectively. |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
407 |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
408 Further item elements are alists of the form (VARIABLE . VALUE) and are in no |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
409 particular order. Each VARIABLE is made buffer-local before set to VALUE. |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
410 |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
411 Currently, appropriate variables include `font-lock-mark-block-function'. |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
412 If this is non-nil, it should be a function with no args used to mark any |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
413 enclosing block of text, for fontification via \\[font-lock-fontify-block]. |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
414 Typical values are `mark-defun' for programming modes or `mark-paragraph' for |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
415 textual modes (i.e., the mode-dependent function is known to put point and mark |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
416 around a text block relevant to that mode). |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
417 |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
418 Other variables include those for buffer-specialised fontification functions, |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
419 `font-lock-fontify-buffer-function', `font-lock-unfontify-buffer-function', |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
420 `font-lock-fontify-region-function', `font-lock-unfontify-region-function', |
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
|
421 `font-lock-comment-start-regexp', `font-lock-inhibit-thing-lock' and |
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
|
422 `font-lock-maximum-size'.") |
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
|
423 |
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
|
424 (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
|
425 "*Alist of `font-lock-keywords' local to a `major-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
|
426 This is normally set via `font-lock-add-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
|
427 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
428 (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
|
429 "*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
|
430 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
|
431 |
4053 | 432 (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
|
433 "*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
|
434 This is normally set via `font-lock-defaults'.") |
4053 | 435 |
8457
c0492d7043b2
(font-lock-syntax-table): New syntax table.
Richard M. Stallman <rms@gnu.org>
parents:
7915
diff
changeset
|
436 (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
|
437 "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
|
438 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
|
439 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
|
440 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
441 ;; If this is nil, we only use the beginning of the buffer if we can't use |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
442 ;; `font-lock-cache-position' and `font-lock-cache-state'. |
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
|
443 (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
|
444 "*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
|
445 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
|
446 enclosing syntactic block. |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
447 If this is nil, the beginning of the buffer is used (in the worst case). |
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
|
448 This is normally set via `font-lock-defaults'.") |
8457
c0492d7043b2
(font-lock-syntax-table): New syntax table.
Richard M. Stallman <rms@gnu.org>
parents:
7915
diff
changeset
|
449 |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
450 (defvar font-lock-mark-block-function nil |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
451 "*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
|
452 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
|
453 enclosing textual block and mark at the end. |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
454 This is normally set via `font-lock-defaults'.") |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
455 |
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
|
456 (defvar font-lock-comment-start-regexp nil |
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
|
457 "*Regexp to match the start of a comment. |
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
|
458 This need not discriminate between genuine comments and quoted comment |
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
|
459 characters or comment characters within strings. |
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
|
460 If nil, `comment-start-skip' is used instead; see that variable for more info. |
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
|
461 This is normally set via `font-lock-defaults'.") |
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
|
462 |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
463 (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
|
464 "Function to use for fontifying the buffer. |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
465 This is normally set via `font-lock-defaults'.") |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
466 |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
467 (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
|
468 "Function to use for unfontifying the buffer. |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
469 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
|
470 This is normally set via `font-lock-defaults'.") |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
471 |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
472 (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
|
473 "Function to use for fontifying a region. |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
474 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
|
475 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
|
476 This is normally set via `font-lock-defaults'.") |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
477 |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
478 (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
|
479 "Function to use for unfontifying a region. |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
480 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
|
481 This is normally set via `font-lock-defaults'.") |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
482 |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
483 (defvar font-lock-inhibit-thing-lock nil |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
484 "List of Font Lock mode related modes that should not be turned on. |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
485 Currently, valid mode names as `fast-lock-mode' and `lazy-lock-mode'. |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
486 This is normally set via `font-lock-defaults'.") |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
487 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
488 (defvar font-lock-mode nil) ; For the modeline. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
489 (defvar font-lock-fontified nil) ; Whether we have fontified the buffer. |
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
|
490 |
73ce8261c2ce
Added font-lock-maximum-decoration; use it to set lisp-font-lock-keywords, and
Simon Marshall <simon@gnu.org>
parents:
10545
diff
changeset
|
491 ;;;###autoload |
4053 | 492 (defvar font-lock-mode-hook nil |
493 "Function or functions to run on entry to Font Lock mode.") | |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
494 |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
495 ;; Font Lock mode. |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
496 |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
497 (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
|
498 ;; |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
499 ;; 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
|
500 (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
|
501 ;; |
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 ;; 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
|
503 ;; 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
|
504 (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
|
505 "Bind variables according to VARLIST and eval BODY restoring buffer state." |
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
|
506 (` (let* ((,@ (append varlist |
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
|
507 '((modified (buffer-modified-p)) |
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
|
508 (inhibit-read-only t) (buffer-undo-list 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
|
509 before-change-functions after-change-functions |
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
|
510 deactivate-mark buffer-file-name buffer-file-truename)))) |
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
|
511 (,@ 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
|
512 (when (and (not modified) (buffer-modified-p)) |
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
|
513 (set-buffer-modified-p 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
|
514 (put 'save-buffer-state 'lisp-indent-function 1)) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
515 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
516 ;;;###autoload |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
517 (defun font-lock-mode (&optional arg) |
13452
5aab5c1f2c33
Oops; left a note in a doc-string.
Simon Marshall <simon@gnu.org>
parents:
13440
diff
changeset
|
518 "Toggle Font Lock mode. |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
519 With arg, turn Font Lock mode on if and only if arg is positive. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
520 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
521 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
|
522 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
523 - Comments are displayed in `font-lock-comment-face'; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
524 - Strings are displayed in `font-lock-string-face'; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
525 - 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
|
526 value of the variable `font-lock-keywords'. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
527 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
528 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
|
529 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
|
530 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
531 (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
|
532 |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
533 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
|
534 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
|
535 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
|
536 |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
537 (global-font-lock-mode t) |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
538 |
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
|
539 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
|
540 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
|
541 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
|
542 `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
|
543 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
|
544 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
|
545 |
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
|
546 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
|
547 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
|
548 |
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
|
549 (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
|
550 (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
|
551 |
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
|
552 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
|
553 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
|
554 |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
555 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
|
556 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
|
557 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
|
558 |
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
|
559 The default Font Lock mode highlighting are normally selected via the variable |
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
|
560 `font-lock-maximum-decoration'. You can add your own highlighting for some |
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
|
561 mode, by calling `font-lock-add-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
|
562 |
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
|
563 The default Font Lock mode faces and their attributes are defined in the |
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
|
564 variable `font-lock-face-attributes', and Font Lock mode default settings in |
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
|
565 the variable `font-lock-defaults-alist'. You can set your own default settings |
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
|
566 for some mode, by setting a buffer local value for `font-lock-defaults', via |
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
|
567 its mode hook." |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
568 (interactive "P") |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
569 ;; 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
|
570 ;; batch job) or if the buffer is invisible (the name starts with a space). |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
571 (let ((on-p (and (not noninteractive) |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
572 (not (eq (aref (buffer-name) 0) ?\ )) |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
573 (if arg |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
574 (> (prefix-numeric-value arg) 0) |
14708
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
575 (not font-lock-mode))))) |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
576 (set (make-local-variable 'font-lock-mode) on-p) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
577 ;; Turn on Font Lock mode. |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
578 (when on-p |
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
|
579 (make-local-hook 'after-change-functions) |
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
|
580 (add-hook 'after-change-functions 'font-lock-after-change-function nil t) |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
581 (font-lock-set-defaults) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
582 (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
|
583 (run-hooks 'font-lock-mode-hook) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
584 ;; Fontify the buffer if we have to. |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
585 (let ((max-size (font-lock-value-in-major-mode font-lock-maximum-size))) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
586 (cond (font-lock-fontified |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
587 nil) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
588 ((or (null max-size) (> max-size (buffer-size))) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
589 (font-lock-fontify-buffer)) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
590 (font-lock-verbose |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
591 (message "Fontifying %s...buffer too big" (buffer-name)))))) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
592 ;; Turn off Font Lock 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
|
593 (unless on-p |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
594 (remove-hook 'after-change-functions 'font-lock-after-change-function t) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
595 (font-lock-unfontify-buffer) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
596 (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
|
597 (font-lock-unset-defaults)) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
598 (force-mode-line-update))) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
599 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
600 ;;;###autoload |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
601 (defun turn-on-font-lock () |
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
|
602 "Turn on Font Lock mode conditionally. |
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
|
603 Turn on only if the terminal can display it." |
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
|
604 (when window-system |
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
|
605 (font-lock-mode 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
|
606 |
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
|
607 ;;;###autoload |
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
|
608 (defun font-lock-add-keywords (major-mode keywords &optional 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
|
609 "Add highlighting KEYWORDS for MAJOR-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
|
610 MODE should be a symbol, the major mode command name, such as `c-mode' or 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
|
611 If nil, highlighting keywords are added for the current buffer. |
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
|
612 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
|
613 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
|
614 If optional argument APPEND is `set', they are used to replace the current |
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
|
615 highlighting list. If APPEND has any other value, e.g., t, they are added at |
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
|
616 the end 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
|
617 |
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
|
618 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
|
619 |
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
|
620 (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
|
621 '((\"\\\\\\=<\\\\(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
|
622 (\"\\\\\\=<\\\\(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
|
623 |
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
|
624 adds two fontification patterns for C mode, to fontify `FIXME:' words, even in |
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
|
625 comments, and to fontify `and', `or' and `not' words as 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
|
626 (cond (major-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
|
627 ;; If MAJOR-MODE is non-nil, add the KEYWORDS and APPEND spec 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
|
628 ;; `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
|
629 (let ((spec (cons keywords append)) cell) |
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
|
630 (if (setq cell (assq major-mode font-lock-keywords-alist)) |
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
|
631 (setcdr cell (append (cdr cell) (list spec))) |
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
|
632 (push (list major-mode spec) font-lock-keywords-alist)))) |
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
|
633 (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
|
634 ;; Otherwise if Font Lock mode is on, set or add the keywords now. |
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
|
635 (if (eq append 'set) |
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
|
636 (setq font-lock-keywords 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
|
637 (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
|
638 (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
|
639 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
|
640 (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
|
641 (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
|
642 (append keywords old)))))))) |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
643 |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
644 ;; Global Font Lock mode. |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
645 ;; |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
646 ;; 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
|
647 ;; 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
|
648 ;; 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
|
649 ;; 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
|
650 ;; 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
|
651 ;; 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
|
652 ;; 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
|
653 |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
654 ;; Implementation. |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
655 ;; |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
656 ;; 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
|
657 ;; 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
|
658 ;; 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
|
659 ;; 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
|
660 ;; 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
|
661 ;; 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
|
662 ;; 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
|
663 ;; 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
|
664 ;; `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
|
665 ;; `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
|
666 ;; 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
|
667 ;; 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
|
668 ;; 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
|
669 ;; |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
670 ;; 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
|
671 ;; 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
|
672 ;; 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
|
673 ;; 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
|
674 ;; 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
|
675 ;; 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
|
676 ;; |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
677 ;; 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
|
678 ;; 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
|
679 ;; 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
|
680 ;; 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
|
681 ;; come up with another solution? |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
682 |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
683 ;; User interface. |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
684 ;; |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
685 ;; 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
|
686 ;; 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
|
687 ;; 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
|
688 ;; 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
|
689 ;; |
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
|
690 ;; 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
|
691 ;; 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
|
692 ;; (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
|
693 ;; 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
|
694 ;; loading a file tells you nothing about the feature or how to control it. It |
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
|
695 ;; would also be contrary to the Principle of Least Surprise. |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
696 |
14780
1d10e4a2fb51
Treat font-lock-keywords of (t) the same as nil.
Simon Marshall <simon@gnu.org>
parents:
14778
diff
changeset
|
697 (defvar font-lock-buffers nil) ; For remembering buffers. |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
698 (defvar global-font-lock-mode nil) |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
699 |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
700 ;;;###autoload |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
701 (defvar font-lock-global-modes t |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
702 "*Modes for which Font Lock mode is automagically turned on. |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
703 Global Font Lock mode is controlled by the `global-font-lock-mode' command. |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
704 If nil, means no modes have Font Lock mode automatically turned on. |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
705 If t, all modes that support Font Lock mode have it automatically turned on. |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
706 If a list, it should be a list of `major-mode' symbol names for which Font Lock |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
707 mode should be automatically turned on. The sense of the list is negated if it |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
708 begins with `not'. For example: |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
709 (c-mode c++-mode) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
710 means that Font Lock mode is turned on for buffers in C and C++ modes only.") |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
711 |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
712 ;;;###autoload |
14708
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
713 (defun global-font-lock-mode (&optional arg message) |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
714 "Toggle Global Font Lock mode. |
14708
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
715 With prefix ARG, turn Global Font Lock mode on if and only if ARG is positive. |
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
716 Displays a message saying whether the mode is on or off if MESSAGE is non-nil. |
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
717 Returns the new status of Global Font Lock mode (non-nil means on). |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
718 |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
719 When Global Font Lock mode is enabled, Font Lock mode is automagically |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
720 turned on in a buffer if its major mode is one of `font-lock-global-modes'." |
14708
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
721 (interactive "P\np") |
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
722 (let ((off-p (if arg |
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
723 (<= (prefix-numeric-value arg) 0) |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
724 global-font-lock-mode))) |
14708
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
725 (if off-p |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
726 (remove-hook 'find-file-hooks 'turn-on-font-lock-if-enabled) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
727 (add-hook 'find-file-hooks 'turn-on-font-lock-if-enabled) |
14708
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
728 (add-hook 'post-command-hook 'turn-on-font-lock-if-enabled) |
14780
1d10e4a2fb51
Treat font-lock-keywords of (t) the same as nil.
Simon Marshall <simon@gnu.org>
parents:
14778
diff
changeset
|
729 (setq font-lock-buffers (buffer-list))) |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
730 (when message |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
731 (message "Global Font Lock mode is now %s." (if off-p "OFF" "ON"))) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
732 (setq global-font-lock-mode (not off-p)))) |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
733 |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
734 (defun font-lock-change-major-mode () |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
735 ;; Turn off Font Lock mode if it's on. |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
736 (when font-lock-mode |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
737 (font-lock-mode nil)) |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
738 ;; Gross hack warning: Delicate readers should avert eyes now. |
14708
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
739 ;; Something is running `kill-all-local-variables', which generally means the |
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
740 ;; major mode is being changed. Run `turn-on-font-lock-if-enabled' after the |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
741 ;; file is visited or the current command has finished. |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
742 (when global-font-lock-mode |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
743 (add-hook 'post-command-hook 'turn-on-font-lock-if-enabled) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
744 (add-to-list 'font-lock-buffers (current-buffer)))) |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
745 |
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
|
746 (defun turn-on-font-lock-if-enabled () |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
747 ;; Gross hack warning: Delicate readers should avert eyes now. |
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
|
748 ;; Turn on Font Lock mode if it's supported by the major mode and enabled by |
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
|
749 ;; the user. |
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
|
750 (remove-hook 'post-command-hook 'turn-on-font-lock-if-enabled) |
14780
1d10e4a2fb51
Treat font-lock-keywords of (t) the same as nil.
Simon Marshall <simon@gnu.org>
parents:
14778
diff
changeset
|
751 (while font-lock-buffers |
1d10e4a2fb51
Treat font-lock-keywords of (t) the same as nil.
Simon Marshall <simon@gnu.org>
parents:
14778
diff
changeset
|
752 (if (buffer-live-p (car font-lock-buffers)) |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
753 (save-excursion |
14780
1d10e4a2fb51
Treat font-lock-keywords of (t) the same as nil.
Simon Marshall <simon@gnu.org>
parents:
14778
diff
changeset
|
754 (set-buffer (car font-lock-buffers)) |
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
|
755 (if (and (or font-lock-defaults |
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
|
756 (assq major-mode font-lock-defaults-alist)) |
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
|
757 (or (eq font-lock-global-modes 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
|
758 (if (eq (car-safe font-lock-global-modes) 'not) |
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
|
759 (not (memq major-mode (cdr font-lock-global-modes))) |
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
|
760 (memq major-mode font-lock-global-modes)))) |
14708
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
761 (let (inhibit-quit) |
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
762 (turn-on-font-lock))))) |
14780
1d10e4a2fb51
Treat font-lock-keywords of (t) the same as nil.
Simon Marshall <simon@gnu.org>
parents:
14778
diff
changeset
|
763 (setq font-lock-buffers (cdr font-lock-buffers)))) |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
764 |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
765 (add-hook 'change-major-mode-hook 'font-lock-change-major-mode) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
766 |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
767 ;; End of Global Font Lock mode. |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
768 |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
769 ;; Font Lock Support mode. |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
770 ;; |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
771 ;; 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
|
772 ;; 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
|
773 ;; 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
|
774 ;; `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
|
775 ;; themselves. |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
776 |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
777 ;;;###autoload |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
778 (defvar font-lock-support-mode nil |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
779 "*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
|
780 Support modes speed up Font Lock mode by being choosy about when fontification |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
781 occurs. Known support modes are Fast Lock mode (symbol `fast-lock-mode') and |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
782 Lazy Lock mode (symbol `lazy-lock-mode'). See those modes for more info. |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
783 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
|
784 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
|
785 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
|
786 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
|
787 ((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
|
788 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
|
789 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
|
790 |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
791 The value of this variable is used when Font Lock mode is turned on.") |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
792 |
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
|
793 (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
|
794 (defvar lazy-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
|
795 |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
796 (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
|
797 (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
|
798 (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
|
799 (fast-lock-mode t)) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
800 ((eq thing-mode 'lazy-lock-mode) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
801 (lazy-lock-mode t))))) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
802 |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
803 (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
|
804 (cond (fast-lock-mode |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
805 (fast-lock-mode nil)) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
806 (lazy-lock-mode |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
807 (lazy-lock-mode nil)))) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
808 |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
809 (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
|
810 (cond (fast-lock-mode |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
811 (fast-lock-after-fontify-buffer)) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
812 (lazy-lock-mode |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
813 (lazy-lock-after-fontify-buffer)))) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
814 |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
815 (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
|
816 (cond (fast-lock-mode |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
817 (fast-lock-after-unfontify-buffer)) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
818 (lazy-lock-mode |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
819 (lazy-lock-after-unfontify-buffer)))) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
820 |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
821 ;; End of Font Lock Support mode. |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
822 |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
823 ;; Fontification functions. |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
824 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
825 ;;;###autoload |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
826 (defun font-lock-fontify-buffer () |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
827 "Fontify the current buffer the way `font-lock-mode' would." |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
828 (interactive) |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
829 (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
|
830 (funcall font-lock-fontify-buffer-function))) |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
831 |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
832 (defun font-lock-unfontify-buffer () |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
833 (funcall font-lock-unfontify-buffer-function)) |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
834 |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
835 (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
|
836 (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
|
837 |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
838 (defun font-lock-unfontify-region (beg end) |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
839 (funcall font-lock-unfontify-region-function beg end)) |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
840 |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
841 (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
|
842 (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
|
843 (> (buffer-size) font-lock-verbose) |
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
844 font-lock-verbose))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
845 (if verbose (message "Fontifying %s..." (buffer-name))) |
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
|
846 ;; Make sure we have the right `font-lock-keywords' etc. |
1dab6f0d9239
Don't turn on in any buffer with a leading space in its name.
Simon Marshall <simon@gnu.org>
parents:
13641
diff
changeset
|
847 (if (not font-lock-mode) (font-lock-set-defaults)) |
1dab6f0d9239
Don't turn on in any buffer with a leading space in its name.
Simon Marshall <simon@gnu.org>
parents:
13641
diff
changeset
|
848 ;; Make sure we fontify etc. in the whole 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
|
849 (save-restriction |
1dab6f0d9239
Don't turn on in any buffer with a leading space in its name.
Simon Marshall <simon@gnu.org>
parents:
13641
diff
changeset
|
850 (widen) |
1dab6f0d9239
Don't turn on in any buffer with a leading space in its name.
Simon Marshall <simon@gnu.org>
parents:
13641
diff
changeset
|
851 (condition-case nil |
1dab6f0d9239
Don't turn on in any buffer with a leading space in its name.
Simon Marshall <simon@gnu.org>
parents:
13641
diff
changeset
|
852 (save-excursion |
1dab6f0d9239
Don't turn on in any buffer with a leading space in its name.
Simon Marshall <simon@gnu.org>
parents:
13641
diff
changeset
|
853 (save-match-data |
1dab6f0d9239
Don't turn on in any buffer with a leading space in its name.
Simon Marshall <simon@gnu.org>
parents:
13641
diff
changeset
|
854 (font-lock-fontify-region (point-min) (point-max) verbose) |
14374
e2423983be05
Support for local fontification.
Simon Marshall <simon@gnu.org>
parents:
14365
diff
changeset
|
855 (font-lock-after-fontify-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
|
856 (setq font-lock-fontified t))) |
1dab6f0d9239
Don't turn on in any buffer with a leading space in its name.
Simon Marshall <simon@gnu.org>
parents:
13641
diff
changeset
|
857 ;; We don't restore the old fontification, so it's best to unfontify. |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
858 (quit (font-lock-unfontify-buffer)))) |
15442
b4c8360e450e
(global-font-lock-mode): Set up find-file-hooks.
Richard M. Stallman <rms@gnu.org>
parents:
14780
diff
changeset
|
859 (if verbose (message "Fontifying %s...%s" (buffer-name) |
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
|
860 (if font-lock-fontified "done" "quit"))))) |
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
|
861 |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
862 (defun font-lock-default-unfontify-buffer () |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
863 (save-restriction |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
864 (widen) |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
865 (font-lock-unfontify-region (point-min) (point-max)) |
14374
e2423983be05
Support for local fontification.
Simon Marshall <simon@gnu.org>
parents:
14365
diff
changeset
|
866 (font-lock-after-unfontify-buffer) |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
867 (setq font-lock-fontified nil))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
868 |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
869 (defun font-lock-default-fontify-region (beg end loudly) |
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
|
870 (save-buffer-state ((old-syntax-table (syntax-table))) |
13440
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
871 (unwind-protect |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
872 (save-restriction |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
873 (widen) |
13440
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
874 ;; 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
|
875 (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
|
876 (set-syntax-table font-lock-syntax-table)) |
13440
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
877 ;; 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
|
878 (font-lock-unfontify-region beg end) |
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
|
879 (unless font-lock-keywords-only |
13440
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
880 (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
|
881 (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
|
882 ;; 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
|
883 (set-syntax-table old-syntax-table)))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
884 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
885 ;; 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
|
886 ; ;; 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
|
887 ; (or (and (not font-lock-keywords-only) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
888 ; (let ((state (parse-partial-sexp beg end nil nil |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
889 ; font-lock-cache-state))) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
890 ; (or (nth 4 state) (nth 7 state)))) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
891 ; (font-lock-fontify-keywords-region beg end)) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
892 |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
893 (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
|
894 (save-buffer-state 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
|
895 (remove-text-properties beg end '(face nil)))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
896 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
897 ;; 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
|
898 (defun font-lock-after-change-function (beg end old-len) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
899 (save-excursion |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
900 (save-match-data |
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
|
901 ;; Rescan between start of lines enclosing the region. |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
902 (font-lock-fontify-region |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
903 (progn (goto-char beg) (beginning-of-line) (point)) |
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
|
904 (progn (goto-char (+ end old-len)) (forward-line 1) (point)))))) |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
905 |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
906 (defun font-lock-fontify-block (&optional arg) |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
907 "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
|
908 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
|
909 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
|
910 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
|
911 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
|
912 delimit the region to fontify." |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
913 (interactive "P") |
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
|
914 (let (font-lock-beginning-of-syntax-function deactivate-mark) |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
915 ;; 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
|
916 (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
|
917 (save-excursion |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
918 (save-match-data |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
919 (condition-case error-data |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
920 (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
|
921 (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
|
922 (font-lock-fontify-region |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
923 (save-excursion (forward-line (- lines)) (point)) |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
924 (save-excursion (forward-line lines) (point)))) |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
925 (funcall font-lock-mark-block-function) |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
926 (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
|
927 ((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
|
928 |
14778
af95abc39d75
(font-lock-fontify-block): Use facemenu-keymap to make the binding.
Richard M. Stallman <rms@gnu.org>
parents:
14735
diff
changeset
|
929 (define-key facemenu-keymap "\M-g" 'font-lock-fontify-block) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
930 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
931 ;; Syntactic fontification functions. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
932 |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
933 ;; These record the parse state at a particular position, always the start of a |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
934 ;; line. Used to make `font-lock-fontify-syntactically-region' faster. |
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
|
935 ;; Previously, `font-lock-cache-position' was just a buffer position. However, |
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
|
936 ;; under certain situations, this occasionally resulted in mis-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
|
937 ;; I think those "situations" were deletion with Lazy Lock mode's deferral. |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
938 (defvar font-lock-cache-state 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
|
939 (defvar font-lock-cache-position nil) |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
940 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
941 (defun font-lock-fontify-syntactically-region (start end &optional loudly) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
942 "Put proper face on each string and comment between START and END. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
943 START should be at the beginning of a line." |
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
|
944 (let ((synstart (cond (font-lock-comment-start-regexp |
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
|
945 (concat "\\s\"\\|" font-lock-comment-start-regexp)) |
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
|
946 (comment-start-skip |
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
|
947 (concat "\\s\"\\|" comment-start-skip)) |
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
|
948 (t |
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
|
949 "\\s\""))) |
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
|
950 (cache (marker-position font-lock-cache-position)) |
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
|
951 state prev here beg) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
952 (if loudly (message "Fontifying %s... (syntactically...)" (buffer-name))) |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
953 (goto-char start) |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
954 ;; |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
955 ;; Find the state at the `beginning-of-line' before `start'. |
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
|
956 (if (eq start cache) |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
957 ;; Use the cache for the state of `start'. |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
958 (setq state font-lock-cache-state) |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
959 ;; Find the state of `start'. |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
960 (if (null font-lock-beginning-of-syntax-function) |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
961 ;; Use the state at the previous cache position, if any, or |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
962 ;; otherwise calculate from `point-min'. |
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
|
963 (if (or (null cache) (< start cache)) |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
964 (setq state (parse-partial-sexp (point-min) start)) |
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
|
965 (setq state (parse-partial-sexp cache start 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
|
966 font-lock-cache-state))) |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
967 ;; Call the function to move outside any syntactic block. |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
968 (funcall font-lock-beginning-of-syntax-function) |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
969 (setq state (parse-partial-sexp (point) start))) |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
970 ;; Cache the state and position of `start'. |
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
|
971 (setq font-lock-cache-state state) |
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
|
972 (set-marker font-lock-cache-position start)) |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
973 ;; |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
974 ;; If the region starts inside a string, show the extent of it. |
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
|
975 (when (nth 3 state) |
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
|
976 (setq here (point)) |
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
|
977 (while (and (re-search-forward "\\s\"" end 'move) |
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
|
978 ;; Verify the state so we don't get fooled by quoting. |
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
|
979 (nth 3 (parse-partial-sexp here (point) nil nil state)))) |
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
|
980 (put-text-property here (point) 'face font-lock-string-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
|
981 (setq state (parse-partial-sexp here (point) nil nil state))) |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
982 ;; |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
983 ;; Likewise for a comment. |
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
|
984 (when (or (nth 4 state) (nth 7 state)) |
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
|
985 (let ((comstart (cond (font-lock-comment-start-regexp |
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 font-lock-comment-start-regexp) |
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 (comment-start-skip |
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 (concat "\\s<\\|" comment-start-skip)) |
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 (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
|
990 "\\s<"))) |
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
|
991 (count 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
|
992 (setq here (point)) |
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
|
993 (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
|
994 (save-restriction |
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
|
995 (narrow-to-region (point-min) end) |
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
|
996 ;; Go back to the real start of the comment. |
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
|
997 (re-search-backward comstart) |
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
|
998 (forward-comment 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
|
999 ;; If there is more than one comment type, then the previous |
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
|
1000 ;; comment start might not be the real comment start. |
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
|
1001 ;; For example, in C++ code, `here' might be on a line following |
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
|
1002 ;; a // comment that is actually within a /* */ comment. |
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
|
1003 (while (<= (point) here) |
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
|
1004 (goto-char here) |
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
|
1005 (re-search-backward comstart nil nil (incf count)) |
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
|
1006 (forward-comment 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
|
1007 ;; Go back to the real end of the comment. |
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
|
1008 (skip-chars-backward " \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
|
1009 (error (goto-char end))) |
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
|
1010 (put-text-property here (point) 'face font-lock-comment-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
|
1011 (setq state (parse-partial-sexp here (point) nil nil state)))) |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1012 ;; |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1013 ;; Find each interesting place between here and `end'. |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1014 (while (and (< (point) 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
|
1015 (setq prev (point)) |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1016 (re-search-forward synstart end 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
|
1017 (setq state (parse-partial-sexp prev (point) nil nil state))) |
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
|
1018 (cond ((nth 3 state) |
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
|
1019 ;; |
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
|
1020 ;; Found a real string start. |
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
|
1021 (setq here (point) beg (match-beginning 0)) |
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
|
1022 (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
|
1023 (save-restriction |
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
|
1024 (narrow-to-region (point-min) end) |
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
|
1025 (goto-char (scan-sexps beg 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
|
1026 (error (goto-char end))) |
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
|
1027 (put-text-property beg (point) 'face font-lock-string-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
|
1028 (setq state (parse-partial-sexp here (point) nil nil state))) |
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
|
1029 ((or (nth 4 state) (nth 7 state)) |
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
|
1030 ;; |
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
|
1031 ;; Found a real comment start. |
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
|
1032 (setq here (point) beg (or (match-end 1) (match-beginning 0))) |
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
|
1033 (goto-char beg) |
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
|
1034 (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
|
1035 (save-restriction |
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
|
1036 (narrow-to-region (point-min) end) |
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
|
1037 (forward-comment 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
|
1038 (skip-chars-backward " \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
|
1039 (error (goto-char end))) |
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
|
1040 (put-text-property beg (point) 'face font-lock-comment-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
|
1041 (setq state (parse-partial-sexp here (point) nil nil state))))))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1042 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1043 ;;; Additional text property functions. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1044 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1045 ;; The following three text property functions are not generally available (and |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1046 ;; it's not certain that they should be) so they are inlined for speed. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1047 ;; The case for `fillin-text-property' is simple; it may or not be generally |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1048 ;; useful. (Since it is used here, it is useful in at least one place.;-) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1049 ;; However, the case for `append-text-property' and `prepend-text-property' is |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1050 ;; more complicated. Should they remove duplicate property values or not? If |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1051 ;; so, should the first or last duplicate item remain? Or the one that was |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1052 ;; added? In our implementation, the first duplicate remains. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1053 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1054 (defsubst font-lock-fillin-text-property (start end prop value &optional object) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1055 "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
|
1056 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
|
1057 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
|
1058 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
|
1059 (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
|
1060 (while start |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1061 (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
|
1062 (put-text-property start next prop value object) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1063 (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
|
1064 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1065 ;; This function (from simon's unique.el) is rewritten and inlined for speed. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1066 ;(defun unique (list function) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1067 ; "Uniquify LIST, deleting elements using FUNCTION. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1068 ;Return the list with subsequent duplicate items removed by side effects. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1069 ;FUNCTION is called with an element of LIST and a list of elements from LIST, |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1070 ;and should return the list of elements with occurrences of the element removed, |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1071 ;i.e., a function such as `delete' or `delq'. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1072 ;This function will work even if LIST is unsorted. See also `uniq'." |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1073 ; (let ((list list)) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1074 ; (while list |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1075 ; (setq list (setcdr list (funcall function (car list) (cdr list)))))) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1076 ; list) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1077 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1078 (defsubst font-lock-unique (list) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1079 "Uniquify LIST, deleting elements using `delq'. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1080 Return the list with subsequent duplicate items removed by side effects." |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1081 (let ((list list)) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1082 (while list |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1083 (setq list (setcdr list (delq (car list) (cdr list)))))) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1084 list) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1085 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1086 ;; A generalisation of `facemenu-add-face' for any property, but without the |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1087 ;; removal of inactive faces via `facemenu-discard-redundant-faces' and special |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1088 ;; treatment of `default'. Uses `unique' to remove duplicate property values. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1089 (defsubst font-lock-prepend-text-property (start end prop value &optional object) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1090 "Prepend to 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
|
1091 Arguments PROP and VALUE specify the property and value to prepend to the value |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1092 already in place. The resulting property values are always lists, and unique. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1093 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
|
1094 (let ((val (if (listp value) value (list value))) next prev) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1095 (while (/= start end) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1096 (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
|
1097 prev (get-text-property start prop object)) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1098 (put-text-property |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1099 start next prop |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1100 (font-lock-unique (append val (if (listp prev) prev (list prev)))) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1101 object) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1102 (setq start next)))) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1103 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1104 (defsubst font-lock-append-text-property (start end prop value &optional object) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1105 "Append to 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
|
1106 Arguments PROP and VALUE specify the property and value to append to the value |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1107 already in place. The resulting property values are always lists, and unique. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1108 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
|
1109 (let ((val (if (listp value) value (list value))) next prev) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1110 (while (/= start end) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1111 (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
|
1112 prev (get-text-property start prop object)) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1113 (put-text-property |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1114 start next prop |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1115 (font-lock-unique (append (if (listp prev) prev (list prev)) val)) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1116 object) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1117 (setq start next)))) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1118 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1119 ;;; Regexp fontification functions. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1120 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1121 (defsubst font-lock-apply-highlight (highlight) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1122 "Apply HIGHLIGHT following a match. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1123 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
|
1124 (let* ((match (nth 0 highlight)) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1125 (start (match-beginning match)) (end (match-end match)) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1126 (override (nth 2 highlight))) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1127 (cond ((not start) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1128 ;; No match but we might not signal an error. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1129 (or (nth 3 highlight) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1130 (error "No match %d in highlight %S" match highlight))) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1131 ((not override) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1132 ;; Cannot override existing fontification. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1133 (or (text-property-not-all start end 'face nil) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1134 (put-text-property start end 'face (eval (nth 1 highlight))))) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1135 ((eq override t) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1136 ;; Override existing fontification. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1137 (put-text-property start end 'face (eval (nth 1 highlight)))) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1138 ((eq override 'prepend) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1139 ;; Prepend to existing fontification. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1140 (font-lock-prepend-text-property start end 'face |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1141 (eval (nth 1 highlight)))) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1142 ((eq override 'append) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1143 ;; Append to existing fontification. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1144 (font-lock-append-text-property start end '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
|
1145 (eval (nth 1 highlight)))) |
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
|
1146 ((eq override 'keep) |
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
|
1147 ;; Keep existing fontification. |
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
|
1148 (font-lock-fillin-text-property start end 'face |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1149 (eval (nth 1 highlight))))))) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1150 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1151 (defsubst font-lock-fontify-anchored-keywords (keywords limit) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1152 "Fontify according to KEYWORDS until LIMIT. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1153 KEYWORDS should be of the form MATCH-ANCHORED, see `font-lock-keywords'." |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1154 (let ((matcher (nth 0 keywords)) (lowdarks (nthcdr 3 keywords)) highlights) |
13440
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1155 ;; Until we come up with a cleaner solution, we make LIMIT the end of line. |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1156 (save-excursion (end-of-line) (setq limit (min limit (point)))) |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1157 ;; Evaluate PRE-MATCH-FORM. |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1158 (eval (nth 1 keywords)) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1159 (save-match-data |
13440
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1160 ;; Find an occurrence of `matcher' before `limit'. |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1161 (while (if (stringp matcher) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1162 (re-search-forward matcher limit t) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1163 (funcall matcher limit)) |
13440
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1164 ;; 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
|
1165 (setq highlights lowdarks) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1166 (while highlights |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1167 (font-lock-apply-highlight (car highlights)) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1168 (setq highlights (cdr highlights))))) |
13440
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1169 ;; Evaluate POST-MATCH-FORM. |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1170 (eval (nth 2 keywords)))) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1171 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1172 (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
|
1173 "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
|
1174 START should be at the beginning of a line." |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1175 (let ((case-fold-search font-lock-keywords-case-fold-search) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1176 (keywords (cdr (if (eq (car-safe font-lock-keywords) t) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1177 font-lock-keywords |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1178 (font-lock-compile-keywords)))) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1179 (bufname (buffer-name)) (count 0) |
13440
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1180 keyword matcher highlights) |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1181 ;; |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1182 ;; 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
|
1183 (while keywords |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1184 (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
|
1185 (make-string (incf count) ?.))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1186 ;; |
13440
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1187 ;; 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
|
1188 (setq keyword (car keywords) matcher (car keyword)) |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1189 (goto-char start) |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1190 (while (if (stringp matcher) |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1191 (re-search-forward matcher end t) |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1192 (funcall matcher end)) |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1193 ;; 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
|
1194 ;; 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
|
1195 (setq highlights (cdr keyword)) |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1196 (while highlights |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1197 (if (numberp (car (car highlights))) |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1198 (font-lock-apply-highlight (car highlights)) |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1199 (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
|
1200 (setq highlights (cdr highlights)))) |
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1201 (setq keywords (cdr keywords))))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1202 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1203 ;; Various functions. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1204 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1205 (defun font-lock-compile-keywords (&optional keywords) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1206 ;; Compile `font-lock-keywords' into the form (t KEYWORD ...) where KEYWORD |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1207 ;; is the (MATCHER HIGHLIGHT ...) shown in the variable's doc string. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1208 (let ((keywords (or keywords font-lock-keywords))) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1209 (setq font-lock-keywords |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1210 (if (eq (car-safe keywords) t) |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1211 keywords |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1212 (cons t (mapcar 'font-lock-compile-keyword keywords)))))) |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1213 |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1214 (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
|
1215 (cond ((nlistp keyword) ; MATCHER |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1216 (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
|
1217 ((eq (car keyword) 'eval) ; (eval . FORM) |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1218 (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
|
1219 ((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
|
1220 ;; 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
|
1221 (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
|
1222 (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
|
1223 (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
|
1224 ((numberp (cdr keyword)) ; (MATCHER . MATCH) |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1225 (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
|
1226 ((symbolp (cdr keyword)) ; (MATCHER . FACENAME) |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1227 (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
|
1228 ((nlistp (nth 1 keyword)) ; (MATCHER . HIGHLIGHT) |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1229 (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
|
1230 (t ; (MATCHER HIGHLIGHT ...) |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1231 keyword))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1232 |
14708
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
1233 (defun font-lock-value-in-major-mode (alist) |
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
1234 ;; Return value in ALIST for `major-mode', or ALIST if it is not an 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
|
1235 ;; 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
|
1236 (if (consp alist) |
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
1237 (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
|
1238 alist)) |
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
1239 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1240 (defun font-lock-choose-keywords (keywords level) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1241 ;; Return LEVELth element of KEYWORDS. A LEVEL of nil is equal to a |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1242 ;; LEVEL of 0, a LEVEL of t is equal to (1- (length KEYWORDS)). |
14708
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
1243 (cond ((symbolp keywords) |
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
1244 keywords) |
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
1245 ((numberp level) |
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
1246 (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
|
1247 ((eq level t) |
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
1248 (car (reverse keywords))) |
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
1249 (t |
da278f255507
Make global-font-lock-mode show status messages, and fontification interruptable.
Simon Marshall <simon@gnu.org>
parents:
14516
diff
changeset
|
1250 (car keywords)))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1251 |
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
|
1252 (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
|
1253 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1254 (defun font-lock-set-defaults () |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1255 "Set fontification defaults appropriately for this mode. |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1256 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
|
1257 `font-lock-defaults-alist') and `font-lock-maximum-decoration'." |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1258 ;; Set face defaults. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1259 (font-lock-make-faces) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1260 ;; Set fontification defaults. |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1261 (make-local-variable 'font-lock-fontified) |
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
|
1262 ;; Set iff not previously set. |
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
|
1263 (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
|
1264 (set (make-local-variable 'font-lock-set-defaults) 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
|
1265 (set (make-local-variable 'font-lock-cache-state) 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
|
1266 (set (make-local-variable 'font-lock-cache-position) (make-marker)) |
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
|
1267 (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
|
1268 (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
|
1269 (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
|
1270 (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
|
1271 (font-lock-value-in-major-mode font-lock-maximum-decoration))) |
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
|
1272 (local (cdr (assq major-mode font-lock-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
|
1273 ;; 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
|
1274 (setq font-lock-keywords (if (fboundp 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
|
1275 (funcall 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
|
1276 (eval 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
|
1277 ;; Local fontification? |
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
|
1278 (while local |
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
|
1279 (font-lock-add-keywords nil (car (car local)) (cdr (car local))) |
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
|
1280 (setq local (cdr local))) |
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
|
1281 ;; 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
|
1282 (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
|
1283 (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
|
1284 ;; 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
|
1285 (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
|
1286 (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
|
1287 ;; 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
|
1288 (when (nth 3 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
|
1289 (let ((slist (nth 3 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
|
1290 (set (make-local-variable '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
|
1291 (copy-syntax-table (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
|
1292 (while slist |
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
|
1293 ;; The character to modify may be a single CHAR or a STRING. |
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
|
1294 (let ((chars (if (numberp (car (car slist))) |
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
|
1295 (list (car (car slist))) |
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
|
1296 (mapcar 'identity (car (car slist))))) |
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
|
1297 (syntax (cdr (car slist)))) |
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
|
1298 (while chars |
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
|
1299 (modify-syntax-entry (car chars) syntax |
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
|
1300 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
|
1301 (setq chars (cdr chars))) |
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
|
1302 (setq slist (cdr slist)))))) |
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
|
1303 ;; 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
|
1304 (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
|
1305 (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
|
1306 (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
|
1307 ;; Variable 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
|
1308 (let ((alist (nthcdr 5 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
|
1309 (while 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
|
1310 (set (make-local-variable (car (car alist))) (cdr (car 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
|
1311 (setq alist (cdr alist))))))) |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1312 |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1313 (defun font-lock-unset-defaults () |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1314 "Unset fontification defaults. See `font-lock-set-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
|
1315 (setq font-lock-set-defaults 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
|
1316 font-lock-keywords nil |
14365
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1317 font-lock-keywords-only nil |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1318 font-lock-keywords-case-fold-search nil |
ef148b168aad
Support for buffer local fontification functions.
Simon Marshall <simon@gnu.org>
parents:
14266
diff
changeset
|
1319 font-lock-syntax-table nil |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1320 font-lock-beginning-of-syntax-function nil) |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1321 (let* ((defaults (or font-lock-defaults |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1322 (cdr (assq major-mode font-lock-defaults-alist)))) |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1323 (alist (nthcdr 5 defaults))) |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1324 (while alist |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1325 (set (car (car alist)) (default-value (car (car alist)))) |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1326 (setq alist (cdr alist))))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1327 |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1328 ;; Colour etc. support. |
4053 | 1329 |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1330 ;; This section of code is crying out for revision. |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1331 |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1332 ;; To begin with, `display-type' and `background-mode' are `frame-parameters' |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1333 ;; so we don't have to calculate them here anymore. But all the face stuff |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1334 ;; should be frame-local (and thus display-local) anyway. Because we're not |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1335 ;; sure what support Emacs is going to have for general frame-local face |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1336 ;; attributes, we leave this section of code as it is. For now. --sm. |
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1337 |
9487
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
1338 (defvar font-lock-display-type nil |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1339 "A symbol indicating the display Emacs is running under. |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1340 The symbol should be one of `color', `grayscale' or `mono'. |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1341 If Emacs guesses this display attribute wrongly, either set this variable in |
9487
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
1342 your `~/.emacs' or set the resource `Emacs.displayType' in your `~/.Xdefaults'. |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1343 See also `font-lock-background-mode' and `font-lock-face-attributes'.") |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1344 |
9487
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
1345 (defvar font-lock-background-mode nil |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1346 "A symbol indicating the Emacs background brightness. |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1347 The symbol should be one of `light' or `dark'. |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1348 If Emacs guesses this frame attribute wrongly, either set this variable in |
9487
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
1349 your `~/.emacs' or set the resource `Emacs.backgroundMode' in your |
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
1350 `~/.Xdefaults'. |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1351 See also `font-lock-display-type' and `font-lock-face-attributes'.") |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1352 |
9487
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
1353 (defvar font-lock-face-attributes nil |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1354 "A list of default attributes to use for face attributes. |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1355 Each element of the list should be of the form |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1356 |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1357 (FACE FOREGROUND BACKGROUND BOLD-P ITALIC-P UNDERLINE-P) |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1358 |
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
|
1359 where FACE could be one of the face symbols `font-lock-comment-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
|
1360 `font-lock-string-face', `font-lock-keyword-face', `font-lock-builtin-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
|
1361 `font-lock-type-face', `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
|
1362 `font-lock-variable-name-face', `font-lock-reference-face' and |
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
|
1363 `font-lock-warning-face', or any other face symbols and attributes may 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
|
1364 specified here and used in `font-lock-keywords'. |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1365 |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1366 Subsequent element items should be the attributes for the corresponding |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1367 Font Lock mode faces. Attributes FOREGROUND and BACKGROUND should be strings |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1368 \(default if nil), while BOLD-P, ITALIC-P, and UNDERLINE-P should specify the |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1369 corresponding face attributes (yes if non-nil). |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1370 |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1371 Emacs uses default attributes based on display type and background brightness. |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1372 See variables `font-lock-display-type' and `font-lock-background-mode'. |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1373 |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1374 Resources can be used to over-ride these face attributes. For example, the |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1375 resource `Emacs.font-lock-comment-face.attributeUnderline' can be used to |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1376 specify the UNDERLINE-P attribute for face `font-lock-comment-face'.") |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1377 |
12268
f22803cfdc5c
Change so font-lock-make-faces doesn't stomp all over user Font Lock faces.
Simon Marshall <simon@gnu.org>
parents:
12047
diff
changeset
|
1378 (defun font-lock-make-faces (&optional override) |
9487
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
1379 "Make faces from `font-lock-face-attributes'. |
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
1380 A default list is used if this is nil. |
12268
f22803cfdc5c
Change so font-lock-make-faces doesn't stomp all over user Font Lock faces.
Simon Marshall <simon@gnu.org>
parents:
12047
diff
changeset
|
1381 If optional OVERRIDE is non-nil, faces that already exist are reset. |
9487
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
1382 See `font-lock-make-face' and `list-faces-display'." |
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
1383 ;; We don't need to `setq' any of these variables, but the user can see what |
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
1384 ;; is being used if we do. |
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
|
1385 (unless font-lock-display-type |
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
|
1386 (setq font-lock-display-type |
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
|
1387 (let ((display-resource (x-get-resource ".displayType" "DisplayType"))) |
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
|
1388 (cond (display-resource (intern (downcase display-resource))) |
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
|
1389 ((x-display-color-p) 'color) |
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
|
1390 ((x-display-grayscale-p) 'grayscale) |
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
|
1391 (t 'mono))))) |
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
|
1392 (unless font-lock-background-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
|
1393 (setq font-lock-background-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
|
1394 (let ((bg-resource (x-get-resource ".backgroundMode" "BackgroundMode")) |
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
|
1395 (params (frame-parameters))) |
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
|
1396 (cond (bg-resource (intern (downcase bg-resource))) |
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
|
1397 ((eq system-type 'ms-dos) |
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
|
1398 (if (string-match "light" (cdr (assq 'background-color params))) |
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
|
1399 'light |
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
|
1400 'dark)) |
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
|
1401 ((< (apply '+ (x-color-values |
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
|
1402 (cdr (assq 'background-color params)))) |
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
|
1403 (* (apply '+ (x-color-values "white")) .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
|
1404 'dark) |
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
|
1405 (t 'light))))) |
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
|
1406 (let ((face-attributes |
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
|
1407 (let ((light-bg (eq font-lock-background-mode 'light))) |
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
|
1408 (cond ((memq font-lock-display-type '(mono monochrome)) |
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
|
1409 ;; Emacs 19.25's 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
|
1410 ;;'((font-lock-comment-face nil nil nil t 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
|
1411 ;; (font-lock-string-face nil nil nil nil 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
|
1412 ;; (font-lock-keyword-face nil nil t nil 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
|
1413 ;; (font-lock-function-name-face nil nil t t 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
|
1414 ;; (font-lock-type-face nil nil nil t 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
|
1415 (list '(font-lock-comment-face nil nil t t 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
|
1416 '(font-lock-string-face nil nil nil t 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
|
1417 '(font-lock-keyword-face nil nil t nil 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
|
1418 '(font-lock-builtin-face nil nil t nil 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
|
1419 (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
|
1420 '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
|
1421 (cdr (assq 'background-color (frame-parameters))) |
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
|
1422 (cdr (assq 'foreground-color (frame-parameters))) |
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
|
1423 t nil 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
|
1424 '(font-lock-variable-name-face nil nil t t 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
|
1425 '(font-lock-type-face nil nil t nil 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
|
1426 '(font-lock-reference-face nil nil t nil 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
|
1427 (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
|
1428 'font-lock-warning-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
|
1429 (cdr (assq 'background-color (frame-parameters))) |
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
|
1430 (cdr (assq 'foreground-color (frame-parameters))) |
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
|
1431 t nil 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
|
1432 ((memq font-lock-display-type '(grayscale greyscale |
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
|
1433 grayshade greyshade)) |
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
|
1434 (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
|
1435 (list 'font-lock-comment-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
|
1436 (if light-bg "DimGray" "LightGray") nil t t 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
|
1437 (list 'font-lock-string-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
|
1438 (if light-bg "DimGray" "LightGray") nil nil t 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
|
1439 (list '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
|
1440 nil (if light-bg "LightGray" "DimGray") t nil 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
|
1441 (list 'font-lock-builtin-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
|
1442 nil (if light-bg "LightGray" "DimGray") t nil 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
|
1443 (list '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
|
1444 (cdr (assq 'background-color (frame-parameters))) |
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
|
1445 (cdr (assq 'foreground-color (frame-parameters))) |
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
|
1446 t nil 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
|
1447 (list 'font-lock-variable-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
|
1448 nil (if light-bg "Gray90" "DimGray") t t 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
|
1449 (list '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
|
1450 nil (if light-bg "Gray80" "DimGray") t nil 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
|
1451 (list 'font-lock-reference-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
|
1452 nil (if light-bg "LightGray" "Gray50") t nil 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
|
1453 (list 'font-lock-warning-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
|
1454 (cdr (assq 'background-color (frame-parameters))) |
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
|
1455 (cdr (assq 'foreground-color (frame-parameters))) |
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
|
1456 t nil 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
|
1457 (light-bg ; light colour background |
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
|
1458 '((font-lock-comment-face "Firebrick") |
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
|
1459 (font-lock-string-face "RosyBrown") |
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
|
1460 (font-lock-keyword-face "Purple") |
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
|
1461 (font-lock-builtin-face "Orchid") |
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
|
1462 (font-lock-function-name-face "Blue") |
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
|
1463 (font-lock-variable-name-face "DarkGoldenrod") |
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
|
1464 (font-lock-type-face "DarkOliveGreen") |
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
|
1465 (font-lock-reference-face "CadetBlue") |
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
|
1466 (font-lock-warning-face "Red" nil t nil 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
|
1467 (t ; dark colour background |
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
|
1468 '((font-lock-comment-face "OrangeRed") |
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
|
1469 (font-lock-string-face "LightSalmon") |
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
|
1470 (font-lock-keyword-face "Cyan") |
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
|
1471 (font-lock-builtin-face "LightSteelBlue") |
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
|
1472 (font-lock-function-name-face "LightSkyBlue") |
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
|
1473 (font-lock-variable-name-face "LightGoldenrod") |
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
|
1474 (font-lock-type-face "PaleGreen") |
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
|
1475 (font-lock-reference-face "Aquamarine") |
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
|
1476 (font-lock-warning-face "Pink" nil t nil 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
|
1477 (while face-attributes |
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
|
1478 (unless (assq (car (car face-attributes)) font-lock-face-attributes) |
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
|
1479 (push (car face-attributes) font-lock-face-attributes)) |
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
|
1480 (setq face-attributes (cdr face-attributes)))) |
12268
f22803cfdc5c
Change so font-lock-make-faces doesn't stomp all over user Font Lock faces.
Simon Marshall <simon@gnu.org>
parents:
12047
diff
changeset
|
1481 ;; Now make the faces if we have to. |
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
|
1482 (mapcar (function |
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
|
1483 (lambda (face-attributes) |
12268
f22803cfdc5c
Change so font-lock-make-faces doesn't stomp all over user Font Lock faces.
Simon Marshall <simon@gnu.org>
parents:
12047
diff
changeset
|
1484 (let ((face (nth 0 face-attributes))) |
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
|
1485 (cond (override |
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
|
1486 ;; We can stomp all over it anyway. Get outta my face! |
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
|
1487 (font-lock-make-face face-attributes)) |
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
|
1488 ((and (boundp face) (facep (symbol-value face))) |
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
|
1489 ;; The variable exists and is already bound to a face. |
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
|
1490 nil) |
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
|
1491 ((facep face) |
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
|
1492 ;; We already have a face so we bind the variable to it. |
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
|
1493 (set face face)) |
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
|
1494 (t |
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
|
1495 ;; No variable or no face. |
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
|
1496 (font-lock-make-face face-attributes)))))) |
12268
f22803cfdc5c
Change so font-lock-make-faces doesn't stomp all over user Font Lock faces.
Simon Marshall <simon@gnu.org>
parents:
12047
diff
changeset
|
1497 font-lock-face-attributes)) |
9487
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
1498 |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1499 (defun font-lock-make-face (face-attributes) |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1500 "Make a face from FACE-ATTRIBUTES. |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1501 FACE-ATTRIBUTES should be like an element `font-lock-face-attributes', so that |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1502 the face name is the first item in the list. A variable with the same name as |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1503 the face is also set; its value is the face name." |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1504 (let* ((face (nth 0 face-attributes)) |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1505 (face-name (symbol-name face)) |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1506 (set-p (function (lambda (face-name resource) |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1507 (x-get-resource (concat face-name ".attribute" resource) |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1508 (concat "Face.Attribute" resource))))) |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1509 (on-p (function (lambda (face-name resource) |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1510 (let ((set (funcall set-p face-name resource))) |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1511 (and set (member (downcase set) '("on" "true")))))))) |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1512 (make-face face) |
13440
e8cd2c9309c8
1. Use local hooks, not local variables.
Simon Marshall <simon@gnu.org>
parents:
13337
diff
changeset
|
1513 (add-to-list 'facemenu-unlisted-faces face) |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1514 ;; Set attributes not set from X resources (and therefore `make-face'). |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1515 (or (funcall set-p face-name "Foreground") |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1516 (condition-case nil |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1517 (set-face-foreground face (nth 1 face-attributes)) |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1518 (error nil))) |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1519 (or (funcall set-p face-name "Background") |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1520 (condition-case nil |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1521 (set-face-background face (nth 2 face-attributes)) |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1522 (error nil))) |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1523 (if (funcall set-p face-name "Bold") |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1524 (and (funcall on-p face-name "Bold") (make-face-bold face nil t)) |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1525 (and (nth 3 face-attributes) (make-face-bold face nil t))) |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1526 (if (funcall set-p face-name "Italic") |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1527 (and (funcall on-p face-name "Italic") (make-face-italic face nil t)) |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1528 (and (nth 4 face-attributes) (make-face-italic face nil t))) |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1529 (or (funcall set-p face-name "Underline") |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1530 (set-face-underline-p face (nth 5 face-attributes))) |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1531 (set face face))) |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1532 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1533 ;;; Various regexp information shared by several modes. |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1534 ;;; Information specific to a single mode should go in its load library. |
4053 | 1535 |
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
|
1536 ;; The C/C++/Objective-C/Java support is in cc-font.el loaded by cc-mode.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
|
1537 ;; The below function should stay in font-lock.el, since it is used by many |
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
|
1538 ;; other libraries. |
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
|
1539 |
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
|
1540 (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
|
1541 "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
|
1542 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
|
1543 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
|
1544 |
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
|
1545 The expected syntax of a declaration/definition item is `word', possibly ending |
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
|
1546 with optional whitespace and a `('. Everything following the item (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
|
1547 belonging to it) is expected to by skip-able by `scan-sexps', and items are |
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
|
1548 expected to be 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
|
1549 |
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
|
1550 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
|
1551 ^^^^ ^ |
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
|
1552 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
|
1553 |
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
|
1554 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
|
1555 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
|
1556 |
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
|
1557 This function could be MATCHER in a MATCH-ANCHORED `font-lock-keywords' item." |
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
|
1558 (when (looking-at "[ \t*]*\\(\\sw+\\)[ \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
|
1559 (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
|
1560 (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
|
1561 (save-restriction |
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
|
1562 ;; Restrict to the end of line, currently guaranteed to be 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
|
1563 (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
|
1564 (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
|
1565 ;; Move over any item value, etc., to the next item. |
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
|
1566 (while (not (looking-at "[ \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
|
1567 (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
|
1568 (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
|
1569 (error 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
|
1570 |
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
|
1571 |
4053 | 1572 (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
|
1573 (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
|
1574 (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
|
1575 ;; Anything not a variable or type declaration is fontified as a 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
|
1576 ;; It would be cleaner to allow preceding whitespace, but it would also 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
|
1577 ;; about five times slower. |
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
|
1578 (list (concat "^(\\(def\\(" |
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
|
1579 ;; Variable declarations. |
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
|
1580 "\\(const\\|custom\\|var\\)\\|" |
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
|
1581 ;; Structure declarations. |
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
|
1582 "\\(class\\|struct\\|type\\)\\|" |
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
|
1583 ;; Everything else is a function declaration. |
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
|
1584 "\\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
|
1585 "\\)\\)\\>" |
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
|
1586 ;; Any whitespace and declared object. |
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
|
1587 "[ \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
|
1588 "\\(\\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
|
1589 '(1 font-lock-keyword-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
|
1590 '(5 (cond ((match-beginning 3) font-lock-variable-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
|
1591 ((match-beginning 4) font-lock-type-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
|
1592 (t 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
|
1593 nil 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
|
1594 )) |
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
|
1595 "Subdued level highlighting for Lisp modes.") |
4053 | 1596 |
1597 (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
|
1598 (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
|
1599 (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
|
1600 (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
|
1601 ;; |
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
|
1602 ;; Control structures. Common ELisp and CLisp forms combined. |
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
|
1603 ; (make-regexp |
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
|
1604 ; '("cond" "if" "while" "let\\*?" "prog[nv12*]?" "inline" "catch" "throw" |
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
|
1605 ; "save-restriction" "save-excursion" "save-window-excursion" |
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
|
1606 ; "save-selected-window" "save-match-data" "save-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
|
1607 ; "unwind-protect" "condition-case" "track-mouse" "dont-compile" |
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
|
1608 ; "eval-after-load" "eval-and-compile" "eval-when-compile" |
14468
e41a60d26291
Correct specialised fontification and associated stuff.
Simon Marshall <simon@gnu.org>
parents:
14374
diff
changeset
|
1609 ; "when" "unless" "do" "flet" "labels" "return" "return-from" |
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
|
1610 ; "with-output-to-temp-buffer" "with-timeout" "with-current-buffer" |
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
|
1611 ; "with-temp-buffer" "with-temp-file")) |
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
|
1612 (cons (concat "(\\(" |
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
|
1613 "c\\(atch\\|ond\\(\\|ition-case\\)\\)\\|" |
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
|
1614 "do\\(\\|nt-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
|
1615 "eval-\\(a\\(fter-load\\|nd-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
|
1616 "when-compile\\)\\|flet\\|i\\(f\\|nline\\)\\|" |
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
|
1617 "l\\(abels\\|et\\*?\\)\\|prog[nv12*]?\\|" |
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
|
1618 "return\\(\\|-from\\)\\|" |
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
|
1619 "save-\\(current-buffer\\|excursion\\|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
|
1620 "restriction\\|selected-window\\|window-excursion\\)\\|" |
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
|
1621 "t\\(hrow\\|rack-mouse\\)\\|un\\(less\\|wind-protect\\)\\|" |
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
|
1622 "w\\(h\\(en\\|ile\\)\\|ith-\\(current-buffer\\|" |
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
|
1623 "output-to-temp-buffer\\|" |
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
|
1624 "t\\(emp-\\(buffer\\|file\\)\\|imeout\\)\\)\\)" |
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
|
1625 "\\)\\>") |
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
|
1626 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
|
1627 ;; |
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
|
1628 ;; Feature symbols as references. |
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
|
1629 '("(\\(featurep\\|provide\\|require\\)\\>[ \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
|
1630 (1 font-lock-keyword-face) (2 font-lock-reference-face nil 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
|
1631 ;; |
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
|
1632 ;; Words inside \\[] tend to be for `substitute-command-keys'. |
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
|
1633 '("\\\\\\\\\\[\\(\\sw+\\)]" 1 font-lock-reference-face prepend) |
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
|
1634 ;; |
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
|
1635 ;; Words inside `' tend to be symbol 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
|
1636 '("`\\(\\sw\\sw+\\)'" 1 font-lock-reference-face prepend) |
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
|
1637 ;; |
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
|
1638 ;; CLisp `:' keywords as builtins. |
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
|
1639 '("\\<:\\sw\\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
|
1640 ;; |
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
|
1641 ;; ELisp and CLisp `&' keywords as 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
|
1642 '("\\<\\&\\sw+\\>" . font-lock-type-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
|
1643 ))) |
12385
c80966dc0b60
Specify in font-lock-defaults/font-lock-defaults-alist which keywords we can
Simon Marshall <simon@gnu.org>
parents:
12268
diff
changeset
|
1644 "Gaudy level highlighting for Lisp modes.") |
4053 | 1645 |
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
|
1646 |
12385
c80966dc0b60
Specify in font-lock-defaults/font-lock-defaults-alist which keywords we can
Simon Marshall <simon@gnu.org>
parents:
12268
diff
changeset
|
1647 (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
|
1648 "Default expressions to highlight in Lisp modes.") |
4053 | 1649 |
1650 | |
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
|
1651 (defvar scheme-font-lock-keywords |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1652 (eval-when-compile |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1653 (list |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1654 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1655 ;; Declarations. Hannes Haug <hannes.haug@student.uni-tuebingen.de> says |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1656 ;; this works for SOS, STklos, SCOOPS, Meroon and Tiny CLOS. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1657 (list (concat "(\\(define\\(" |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1658 ;; Function names. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1659 "\\(\\|-\\(generic\\(\\|-procedure\\)\\|method\\)\\)\\|" |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1660 ;; Macro names, as variable names. A bit dubious, this. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1661 "\\(-syntax\\)\\|" |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1662 ;; Class names. |
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
|
1663 "-class" |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1664 "\\)\\)\\>" |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1665 ;; Any whitespace and declared object. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1666 "[ \t]*(?" |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1667 "\\(\\sw+\\)?") |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1668 '(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
|
1669 '(7 (cond ((match-beginning 3) font-lock-function-name-face) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1670 ((match-beginning 6) font-lock-variable-name-face) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1671 (t font-lock-type-face)) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1672 nil t)) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1673 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1674 ;; Control structures. |
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
|
1675 ;(make-regexp '("begin" "call-with-current-continuation" "call/cc" |
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
|
1676 ; "call-with-input-file" "call-with-output-file" "case" "cond" |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1677 ; "do" "else" "for-each" "if" "lambda" |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1678 ; "let\\*?" "let-syntax" "letrec" "letrec-syntax" |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1679 ; ;; Hannes Haug <hannes.haug@student.uni-tuebingen.de> wants: |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1680 ; "and" "or" "delay" |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1681 ; ;; Stefan Monnier <stefan.monnier@epfl.ch> says don't bother: |
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
|
1682 ; ;;"quasiquote" "quote" "unquote" "unquote-splicing" |
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
|
1683 ; "map" "syntax" "syntax-rules")) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1684 (cons |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1685 (concat "(\\(" |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1686 "and\\|begin\\|c\\(a\\(ll\\(-with-\\(current-continuation\\|" |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1687 "input-file\\|output-file\\)\\|/cc\\)\\|se\\)\\|ond\\)\\|" |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1688 "d\\(elay\\|o\\)\\|else\\|for-each\\|if\\|" |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1689 "l\\(ambda\\|et\\(-syntax\\|\\*?\\|rec\\(\\|-syntax\\)\\)\\)\\|" |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1690 "map\\|or\\|syntax\\(\\|-rules\\)" |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1691 "\\)\\>") 1) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1692 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1693 ;; David Fox <fox@graphics.cs.nyu.edu> for SOS/STklos class specifiers. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1694 '("\\<<\\sw+>\\>" . font-lock-type-face) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1695 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1696 ;; Scheme `:' keywords as references. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1697 '("\\<:\\sw+\\>" . font-lock-reference-face) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1698 )) |
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
|
1699 "Default expressions to highlight in Scheme modes.") |
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
|
1700 |
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
|
1701 |
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
|
1702 (defvar tex-font-lock-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
|
1703 ; ;; Regexps updated with help from Ulrik Dickow <dickow@nbi.dk>. |
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
|
1704 ; '(("\\\\\\(begin\\|end\\|newcommand\\){\\([a-zA-Z0-9\\*]+\\)}" |
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
|
1705 ; 2 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
|
1706 ; ("\\\\\\(cite\\|label\\|pageref\\|ref\\){\\([^} \t\n]+\\)}" |
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
|
1707 ; 2 font-lock-reference-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
|
1708 ; ;; It seems a bit dubious to use `bold' and `italic' faces since we might |
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
|
1709 ; ;; not be able to display those fonts. |
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
|
1710 ; ("{\\\\bf\\([^}]+\\)}" 1 'bold keep) |
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
|
1711 ; ("{\\\\\\(em\\|it\\|sl\\)\\([^}]+\\)}" 2 'italic keep) |
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
|
1712 ; ("\\\\\\([a-zA-Z@]+\\|.\\)" . font-lock-keyword-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
|
1713 ; ("^[ \t\n]*\\\\def[\\\\@]\\(\\w+\\)" 1 font-lock-function-name-face keep)) |
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
|
1714 ;; Rewritten and extended for LaTeX2e by Ulrik Dickow <dickow@nbi.dk>. |
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
|
1715 '(("\\\\\\(begin\\|end\\|newcommand\\){\\([a-zA-Z0-9\\*]+\\)}" |
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
|
1716 2 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
|
1717 ("\\\\\\(cite\\|label\\|pageref\\|ref\\){\\([^} \t\n]+\\)}" |
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
|
1718 2 font-lock-reference-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
|
1719 ("^[ \t]*\\\\def\\\\\\(\\(\\w\\|@\\)+\\)" 1 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
|
1720 "\\\\\\([a-zA-Z@]+\\|.\\)" |
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 ;; It seems a bit dubious to use `bold' and `italic' faces since we might |
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 ;; not be able to display those fonts. |
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
|
1723 ;; LaTeX2e: \emph{This is emphasized}. |
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
|
1724 ("\\\\emph{\\([^}]+\\)}" 1 'italic keep) |
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
|
1725 ;; LaTeX2e: \textbf{This is bold}, \textit{...}, \textsl{...} |
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
|
1726 ("\\\\text\\(\\(bf\\)\\|it\\|sl\\){\\([^}]+\\)}" |
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
|
1727 3 (if (match-beginning 2) 'bold 'italic) keep) |
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 ;; Old-style bf/em/it/sl. Stop at `\\' and un-escaped `&', for good tables. |
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 ("\\\\\\(\\(bf\\)\\|em\\|it\\|sl\\)\\>\\(\\([^}&\\]\\|\\\\[^\\]\\)+\\)" |
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
|
1730 3 (if (match-beginning 2) 'bold 'italic) keep)) |
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
|
1731 "Default expressions to highlight in TeX modes.") |
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 |
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 ;;; 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
|
1734 |
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
|
1735 ;; 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
|
1736 ;; types might be the user's own or they might be generally accepted and used. |
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
|
1737 ;; Generally excepted types are used to provide default variable values. |
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
|
1738 |
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
|
1739 (defvar c-font-lock-extra-types '("FILE" "\\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
|
1740 "*List of extra types to fontify in C 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
|
1741 Each list item should be a regexp without word-delimiters or parentheses. |
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
|
1742 For example, a value of (\"FILE\" \"\\\\sw+_t\") means the word FILE and words |
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
|
1743 ending in _t are treated as type names.") |
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
|
1744 |
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 (defvar c++-font-lock-extra-types 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
|
1746 "*List of extra types to fontify in C++ 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
|
1747 Each list item should be a regexp without word-delimiters or parentheses. |
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
|
1748 For example, a value of (\"String\") means the word String is treated as a type |
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
|
1749 name.") |
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
|
1750 |
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
|
1751 (defvar objc-font-lock-extra-types '("Class" "BOOL" "IMP" "SEL") |
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
|
1752 "*List of extra types to fontify in Objective-C 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
|
1753 Each list item should be a regexp without word-delimiters or parentheses. |
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
|
1754 For example, a value of (\"Class\" \"BOOL\" \"IMP\" \"SEL\") means the words |
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
|
1755 Class, BOOL, IMP and SEL are treated as type names.") |
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
|
1756 |
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 (defvar java-font-lock-extra-types '("[A-Z\300-\326\330-\337]\\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
|
1758 "*List of extra types to fontify in Java 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
|
1759 Each list item should be a regexp without word-delimiters or parentheses. |
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
|
1760 For example, a value of (\"[A-Z\300-\326\330-\337]\\\\sw+\") means capitalised |
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
|
1761 words (and words conforming to the Java id spec) are treated as type names.") |
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
|
1762 |
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
|
1763 ;;; 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
|
1764 |
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
|
1765 ;; [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
|
1766 ;; 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
|
1767 ;; 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
|
1768 ;; 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
|
1769 ;; 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
|
1770 ;; 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
|
1771 ;; |
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
|
1772 ;; 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
|
1773 ;; 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
|
1774 ;; 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
|
1775 ;; 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
|
1776 ;; more is a plus! [Ha ha ha.] And more means plus! [Ho ho ho.] The future |
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
|
1777 ;; is C++! [Ohhh!] The Third Millennium Award will be ours! [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
|
1778 |
4053 | 1779 (defconst c-font-lock-keywords-1 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
|
1780 "Subdued level highlighting for C mode.") |
4053 | 1781 |
1782 (defconst c-font-lock-keywords-2 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
|
1783 "Medium level highlighting for 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
|
1784 See also `c-font-lock-extra-types'.") |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1785 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1786 (defconst c-font-lock-keywords-3 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
|
1787 "Gaudy level highlighting for 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
|
1788 See also `c-font-lock-extra-types'.") |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1789 |
9487
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
1790 (let ((c-keywords |
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
1791 ; ("break" "continue" "do" "else" "for" "if" "return" "switch" "while") |
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
1792 "break\\|continue\\|do\\|else\\|for\\|if\\|return\\|switch\\|while") |
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
1793 (c-type-types |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1794 ; ("auto" "extern" "register" "static" "typedef" "struct" "union" "enum" |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1795 ; "signed" "unsigned" "short" "long" "int" "char" "float" "double" |
9487
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
1796 ; "void" "volatile" "const") |
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
|
1797 `(mapconcat 'identity |
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
|
1798 (cons |
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
|
1799 (,@ (concat "auto\\|c\\(har\\|onst\\)\\|double\\|" ; 6 ()s deep. |
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
|
1800 "e\\(num\\|xtern\\)\\|float\\|int\\|long\\|register\\|" |
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
|
1801 "s\\(hort\\|igned\\|t\\(atic\\|ruct\\)\\)\\|typedef\\|" |
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
|
1802 "un\\(ion\\|signed\\)\\|vo\\(id\\|latile\\)")) |
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
|
1803 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
|
1804 "\\|")) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1805 ) |
6093
00cee8387866
Clean up c-font-lock-keywords; now slightly more consistent about highlighting
Karl Heuer <kwzh@gnu.org>
parents:
5878
diff
changeset
|
1806 (setq c-font-lock-keywords-1 |
00cee8387866
Clean up c-font-lock-keywords; now slightly more consistent about highlighting
Karl Heuer <kwzh@gnu.org>
parents:
5878
diff
changeset
|
1807 (list |
00cee8387866
Clean up c-font-lock-keywords; now slightly more consistent about highlighting
Karl Heuer <kwzh@gnu.org>
parents:
5878
diff
changeset
|
1808 ;; |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1809 ;; 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
|
1810 ;; 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
|
1811 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1812 ;; 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
|
1813 '("^\\(\\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
|
1814 ;; |
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
|
1815 ;; 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
|
1816 '("^#[ \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
|
1817 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1818 ;; Fontify filenames in #include <...> preprocessor directives as strings. |
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
|
1819 '("^#[ \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
|
1820 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
|
1821 ;; |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1822 ;; 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
|
1823 '("^#[ \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
|
1824 ;; |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
1825 ;; 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
|
1826 '("^#[ \t]*\\(elif\\|if\\)\\>" |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1827 ("\\<\\(defined\\)\\>[ \t]*(?\\(\\sw+\\)?" nil nil |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1828 (1 font-lock-reference-face) (2 font-lock-variable-name-face nil t))) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1829 ;; |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1830 ;; Fontify otherwise as symbol names, and the preprocessor directive 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
|
1831 '("^#[ \t]*\\(\\sw+\\)\\>[ \t]*\\(\\sw+\\)?" |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1832 (1 font-lock-reference-face) (2 font-lock-variable-name-face nil t)) |
6093
00cee8387866
Clean up c-font-lock-keywords; now slightly more consistent about highlighting
Karl Heuer <kwzh@gnu.org>
parents:
5878
diff
changeset
|
1833 )) |
00cee8387866
Clean up c-font-lock-keywords; now slightly more consistent about highlighting
Karl Heuer <kwzh@gnu.org>
parents:
5878
diff
changeset
|
1834 |
00cee8387866
Clean up c-font-lock-keywords; now slightly more consistent about highlighting
Karl Heuer <kwzh@gnu.org>
parents:
5878
diff
changeset
|
1835 (setq c-font-lock-keywords-2 |
00cee8387866
Clean up c-font-lock-keywords; now slightly more consistent about highlighting
Karl Heuer <kwzh@gnu.org>
parents:
5878
diff
changeset
|
1836 (append c-font-lock-keywords-1 |
4053 | 1837 (list |
1838 ;; | |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1839 ;; Simple regexps for speed. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1840 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1841 ;; 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
|
1842 `(eval . |
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
|
1843 (cons (concat "\\<\\(" (,@ c-type-types) "\\)\\>") 'font-lock-type-face)) |
4053 | 1844 ;; |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1845 ;; Fontify all builtin keywords (except case, default and goto; see below). |
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
|
1846 (concat "\\<\\(" c-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
|
1847 ;; |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1848 ;; Fontify case/goto keywords and targets, and case default/goto tags. |
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
|
1849 '("\\<\\(case\\|goto\\)\\>[ \t]*\\(\\sw+\\)?" |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
1850 (1 font-lock-keyword-face) (2 font-lock-reference-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
|
1851 ;; Anders Lindgren <andersl@csd.uu.se> points out that it is quicker to use |
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
|
1852 ;; MATCH-ANCHORED to effectively anchor the regexp on the left. |
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
|
1853 '(":" ("^[ \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
|
1854 (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
|
1855 (1 font-lock-reference-face))) |
6093
00cee8387866
Clean up c-font-lock-keywords; now slightly more consistent about highlighting
Karl Heuer <kwzh@gnu.org>
parents:
5878
diff
changeset
|
1856 ))) |
6219
d960f0463014
(c++-font-lock-keywords-1, c++-font-lock-keywords-2): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6093
diff
changeset
|
1857 |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1858 (setq c-font-lock-keywords-3 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1859 (append c-font-lock-keywords-2 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1860 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1861 ;; 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
|
1862 ;; 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
|
1863 (list |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1864 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1865 ;; 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
|
1866 `(eval . |
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
|
1867 (list (concat "\\<\\(" (,@ c-type-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
|
1868 "\\([ \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
|
1869 ;; Fontify each declaration item. |
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
|
1870 '(font-lock-match-c-style-declaration-item-and-skip-to-next |
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
|
1871 ;; Start with point after all type specifiers. |
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
|
1872 (goto-char (or (match-beginning 8) (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
|
1873 ;; Finish with point after first type specifier. |
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
|
1874 (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
|
1875 ;; Fontify as a variable or function name. |
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
|
1876 (1 (if (match-beginning 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
|
1877 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
|
1878 font-lock-variable-name-face))))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1879 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1880 ;; Fontify structures, or typedef names, plus their items. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1881 '("\\(}\\)[ \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
|
1882 (font-lock-match-c-style-declaration-item-and-skip-to-next |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1883 (goto-char (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
|
1884 (1 (if (match-beginning 2) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1885 font-lock-function-name-face |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1886 font-lock-variable-name-face)))) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1887 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1888 ;; 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
|
1889 '("^\\(\\sw+\\)\\>\\([ \t*]+\\sw+\\>\\)*" |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1890 (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
|
1891 (font-lock-match-c-style-declaration-item-and-skip-to-next |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1892 (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
|
1893 (1 (if (match-beginning 2) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1894 font-lock-function-name-face |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1895 font-lock-variable-name-face)))) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1896 ))) |
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
|
1897 ) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1898 |
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
|
1899 (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
|
1900 "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
|
1901 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
|
1902 |
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
|
1903 ;;; 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
|
1904 |
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
|
1905 (defconst c++-font-lock-keywords-1 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
|
1906 "Subdued level highlighting for 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
|
1907 |
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
|
1908 (defconst c++-font-lock-keywords-2 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
|
1909 "Medium level highlighting for 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
|
1910 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
|
1911 |
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
|
1912 (defconst c++-font-lock-keywords-3 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
|
1913 "Gaudy level highlighting for 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
|
1914 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
|
1915 |
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
|
1916 (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
|
1917 ;; 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
|
1918 ;; ^^^^ ^^^^ ^^^^ ^ |
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
|
1919 ;; 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
|
1920 ;; |
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
|
1921 ;; 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
|
1922 ;; 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
|
1923 ;; 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
|
1924 ;; 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
|
1925 (when (looking-at (eval-when-compile |
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
|
1926 (concat "[ \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
|
1927 "\\(<\\(\\sw+\\)[ \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
|
1928 "\\(::\\**\\(\\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
|
1929 "[ \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
|
1930 (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
|
1931 (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
|
1932 (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
|
1933 ;; 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
|
1934 (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
|
1935 (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
|
1936 ;; Move over any item value, etc., to the next item. |
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
|
1937 (while (not (looking-at "[ \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
|
1938 (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
|
1939 (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
|
1940 (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
|
1941 |
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
|
1942 (let* ((c++-keywords |
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
|
1943 ; ("break" "continue" "do" "else" "for" "if" "return" "switch" "while" |
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
|
1944 ; "asm" "catch" "delete" "new" "operator" "sizeof" "this" "throw" "try" |
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
|
1945 ; ;; Eric Hopper <hopper@omnifarious.mn.org> says these are new. |
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
|
1946 ; "static_cast" "dynamic_cast" "const_cast" "reinterpret_cast") |
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
|
1947 (concat "asm\\|break\\|c\\(atch\\|on\\(st_cast\\|tinue\\)\\)\\|" |
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
|
1948 "d\\(elete\\|o\\|ynamic_cast\\)\\|else\\|for\\|if\\|new\\|" |
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
|
1949 "operator\\|re\\(interpret_cast\\|turn\\)\\|" |
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
|
1950 "s\\(izeof\\|tatic_cast\\|" |
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
|
1951 "witch\\)\\|t\\(h\\(is\\|row\\)\\|ry\\)\\|while")) |
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
|
1952 (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
|
1953 (mapconcat 'identity |
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
|
1954 (mapcar 'regexp-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
|
1955 ;; Taken from Stroustrup, minus keywords otherwise fontified. |
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
|
1956 (sort '("+" "-" "*" "/" "%" "^" "&" "|" "~" "!" "=" "<" ">" |
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
|
1957 "+=" "-=" "*=" "/=" "%=" "^=" "&=" "|=" "<<" ">>" |
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
|
1958 ">>=" "<<=" "==" "!=" "<=" ">=" "&&" "||" "++" "--" |
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
|
1959 "->*" "," "->" "[]" "()") |
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
|
1960 (function (lambda (a b) (> (length a) (length b)))))) |
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
|
1961 "\\|")) |
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
|
1962 (c++-type-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
|
1963 ; ("auto" "extern" "register" "static" "typedef" "struct" "union" "enum" |
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
|
1964 ; "signed" "unsigned" "short" "long" "int" "char" "float" "double" |
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
|
1965 ; "void" "volatile" "const" "inline" "friend" "bool" |
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
|
1966 ; "virtual" "complex" "template" |
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
|
1967 ; ;; Eric Hopper <hopper@omnifarious.mn.org> says these are new. |
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
|
1968 ; "namespace" "using") |
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
|
1969 `(mapconcat 'identity |
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
|
1970 (cons |
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
|
1971 (,@ (concat "auto\\|bool\\|c\\(har\\|o\\(mplex\\|nst\\)\\)\\|" |
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
|
1972 "double\\|e\\(num\\|xtern\\)\\|f\\(loat\\|riend\\)\\|" |
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
|
1973 "in\\(line\\|t\\)\\|long\\|namespace\\|register\\|" |
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
|
1974 "s\\(hort\\|igned\\|t\\(atic\\|ruct\\)\\)\\|" |
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
|
1975 "t\\(emplate\\|ypedef\\)\\|" |
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
|
1976 "u\\(n\\(ion\\|signed\\)\\|sing\\)\\|" |
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
|
1977 "v\\(irtual\\|o\\(id\\|latile\\)\\)")) ; 12 ()s deep. |
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
|
1978 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
|
1979 "\\|")) |
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
|
1980 (c++-type-suffix "\\(<\\(\\sw+\\)[ \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
|
1981 (c++-type-spec (concat "\\(\\sw+\\)\\>" c++-type-suffix)) |
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
|
1982 ) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1983 (setq c++-font-lock-keywords-1 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1984 (append |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1985 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1986 ;; 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
|
1987 (cdr c-font-lock-keywords-1) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
1988 (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
|
1989 ;; |
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
|
1990 ;; Class names etc. |
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
|
1991 (list (concat "\\<\\(class\\|public\\|private\\|protected\\)\\>[ \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
|
1992 "\\(" c++-type-spec "\\)?") |
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
|
1993 '(1 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
|
1994 '(3 (if (match-beginning 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
|
1995 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
|
1996 font-lock-function-name-face) nil 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
|
1997 '(5 font-lock-function-name-face nil 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
|
1998 '(7 font-lock-function-name-face nil 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
|
1999 ;; |
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
|
2000 ;; 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
|
2001 (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
|
2002 '(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
|
2003 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
|
2004 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
|
2005 '(3 font-lock-function-name-face nil 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
|
2006 '(5 font-lock-function-name-face nil t)) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2007 ))) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2008 |
6219
d960f0463014
(c++-font-lock-keywords-1, c++-font-lock-keywords-2): New variables.
Richard M. Stallman <rms@gnu.org>
parents:
6093
diff
changeset
|
2009 (setq 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
|
2010 (append c++-font-lock-keywords-1 |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
2011 (list |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2012 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2013 ;; 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
|
2014 `(eval . |
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
|
2015 (cons (concat "\\<\\(" (,@ c++-type-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
|
2016 'font-lock-type-face)) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2017 ;; |
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
|
2018 ;; 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
|
2019 (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
|
2020 '(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
|
2021 '(2 font-lock-builtin-face nil t)) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2022 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2023 ;; Fontify case/goto keywords and targets, and case default/goto tags. |
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
|
2024 '("\\<\\(case\\|goto\\)\\>[ \t]*\\(\\sw+\\)?" |
9487
f80b2a33df03
* font-lock.el: To make font-lock.el dumpable: (font-lock-display-type,
Simon Marshall <simon@gnu.org>
parents:
9444
diff
changeset
|
2025 (1 font-lock-keyword-face) (2 font-lock-reference-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
|
2026 '(":" ("^[ \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
|
2027 (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
|
2028 (1 font-lock-reference-face))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2029 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2030 ;; Fontify other builtin keywords. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2031 (cons (concat "\\<\\(" c++-keywords "\\)\\>") '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
|
2032 ;; |
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 ;; Eric Hopper <hopper@omnifarious.mn.org> says `true' and `false' are new. |
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
|
2034 '("\\<\\(false\\|true\\)\\>" . font-lock-reference-face) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2035 ))) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2036 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2037 (setq c++-font-lock-keywords-3 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2038 (append c++-font-lock-keywords-2 |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2039 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2040 ;; 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
|
2041 (list |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2042 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2043 ;; 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
|
2044 `(eval . |
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
|
2045 (list (concat "\\<\\(" (,@ c++-type-types) "\\)\\>" (,@ c++-type-suffix) |
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
|
2046 "\\([ \t*&]+" (,@ c++-type-spec) "\\)*") |
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
|
2047 ;; Fontify each declaration item. |
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
|
2048 '(font-lock-match-c++-style-declaration-item-and-skip-to-next |
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
|
2049 ;; Start with point after all type specifiers. |
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
|
2050 (goto-char (or (match-beginning 18) (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
|
2051 ;; Finish with point after first type specifier. |
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
|
2052 (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
|
2053 ;; Fontify as a variable or function name. |
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
|
2054 (1 (cond ((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
|
2055 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
|
2056 ((match-beginning 6) 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
|
2057 (t font-lock-variable-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
|
2058 (3 font-lock-function-name-face nil 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
|
2059 (5 (if (match-beginning 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
|
2060 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
|
2061 font-lock-variable-name-face) nil t)))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2062 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2063 ;; Fontify structures, or typedef names, plus their items. |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2064 '("\\(}\\)[ \t*]*\\sw" |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2065 (font-lock-match-c++-style-declaration-item-and-skip-to-next |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2066 (goto-char (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
|
2067 (1 (if (match-beginning 6) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2068 font-lock-function-name-face |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2069 font-lock-variable-name-face)))) |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2070 ;; |
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2071 ;; Fontify anything at beginning of line as a declaration or definition. |
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
|
2072 (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
|
2073 '(font-lock-match-c++-style-declaration-item-and-skip-to-next |
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
|
2074 (goto-char (match-beginning 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
|
2075 (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
|
2076 (1 (cond ((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
|
2077 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
|
2078 ((match-beginning 6) 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
|
2079 (t font-lock-variable-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
|
2080 (3 font-lock-function-name-face nil 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
|
2081 (5 (if (match-beginning 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
|
2082 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
|
2083 font-lock-variable-name-face) nil t))) |
13299
d6bfe124472c
General reorganisation; moving and renaming etc.
Simon Marshall <simon@gnu.org>
parents:
12813
diff
changeset
|
2084 ))) |
6093
00cee8387866
Clean up c-font-lock-keywords; now slightly more consistent about highlighting
Karl Heuer <kwzh@gnu.org>
parents:
5878
diff
changeset
|
2085 ) |
4053 | 2086 |
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
|
2087 (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
|
2088 "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
|
2089 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
|
2090 |
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
|
2091 ;;; 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
|
2092 |
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 (defconst objc-font-lock-keywords-1 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
|
2094 "Subdued level highlighting for 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
|
2095 |
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
|
2096 (defconst objc-font-lock-keywords-2 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
|
2097 "Medium level highlighting for 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
|
2098 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
|
2099 |
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 (defconst objc-font-lock-keywords-3 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
|
2101 "Gaudy level highlighting for 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
|
2102 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
|
2103 |
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
|
2104 ;; 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
|
2105 ;; Jacques Duthen Prestataire <duthen@cegelec-red.fr>. |
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
|
2106 (let ((objc-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
|
2107 ; (make-regexp |
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
|
2108 ; '("break" "continue" "do" "else" "for" "if" "return" "switch" "while" |
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
|
2109 ; "sizeof" "self" "super")) |
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
|
2110 (concat "break\\|continue\\|do\\|else\\|for\\|if\\|return\\|" |
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
|
2111 "s\\(elf\\|izeof\\|uper\\|witch\\)\\|while")) |
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
|
2112 (objc-type-types |
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
|
2113 `(mapconcat 'identity |
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
|
2114 (cons |
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
|
2115 ; '("auto" "extern" "register" "static" "typedef" "struct" "union" |
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
|
2116 ; "enum" "signed" "unsigned" "short" "long" "int" "char" |
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 ; "float" "double" "void" "volatile" "const" |
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 ; "id" "oneway" "in" "out" "inout" "bycopy" "byref") |
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
|
2119 (,@ (concat "auto\\|by\\(copy\\|ref\\)\\|c\\(har\\|onst\\)\\|" |
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
|
2120 "double\\|e\\(num\\|xtern\\)\\|float\\|" |
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
|
2121 "i\\([dn]\\|n\\(out\\|t\\)\\)\\|long\\|" |
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
|
2122 "o\\(neway\\|ut\\)\\|register\\|s\\(hort\\|igned\\|" |
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
|
2123 "t\\(atic\\|ruct\\)\\)\\|typedef\\|" |
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
|
2124 "un\\(ion\\|signed\\)\\|vo\\(id\\|latile\\)")) |
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
|
2125 objc-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
|
2126 "\\|")) |
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
|
2127 ) |
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
|
2128 (setq 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
|
2129 (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
|
2130 ;; |
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
|
2131 ;; 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
|
2132 (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
|
2133 (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
|
2134 ;; |
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
|
2135 ;; 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
|
2136 '("@\\(\\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
|
2137 (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
|
2138 ("\\=[ \t:<(,]*\\(\\sw+\\)" nil 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
|
2139 (1 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
|
2140 ;; |
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
|
2141 ;; 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
|
2142 ;; First, on the same line as the function declaration. |
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 '("^[+-][ \t]*\\(PRIVATE\\)?[ \t]*\\((\\([^)\n]+\\))\\)?[ \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
|
2144 (1 font-lock-type-face nil 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
|
2145 (3 font-lock-type-face nil 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
|
2146 (4 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
|
2147 ("\\=[ \t]*\\(\\sw+\\)?:[ \t]*\\((\\([^)\n]+\\))\\)?[ \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
|
2148 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
|
2149 (1 font-lock-function-name-face nil 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
|
2150 (3 font-lock-type-face nil 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
|
2151 (4 font-lock-variable-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
|
2152 ;; Second, on lines following the function declaration. |
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
|
2153 '(":" ("^[ \t]*\\(\\sw+\\)?:[ \t]*\\((\\([^)\n]+\\))\\)?[ \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
|
2154 (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
|
2155 (1 font-lock-function-name-face nil 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
|
2156 (3 font-lock-type-face nil 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
|
2157 (4 font-lock-variable-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
|
2158 ))) |
4053 | 2159 |
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
|
2160 (setq 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
|
2161 (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
|
2162 (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
|
2163 ;; |
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 ;; 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
|
2165 ;; |
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
|
2166 ;; 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
|
2167 `(eval . |
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 (cons (concat "\\<\\(" (,@ objc-type-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
|
2169 '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
|
2170 ;; |
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
|
2171 ;; Fontify all builtin keywords (except case, default and goto; see below). |
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
|
2172 (concat "\\<\\(" objc-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
|
2173 ;; |
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
|
2174 ;; Fontify case/goto keywords and targets, and case default/goto tags. |
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
|
2175 '("\\<\\(case\\|goto\\)\\>[ \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
|
2176 (1 font-lock-keyword-face) (2 font-lock-reference-face nil 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
|
2177 ;; Fontify tags iff sole statement on line, otherwise we detect selectors. |
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
|
2178 '(":" ("^[ \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
|
2179 (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
|
2180 (1 font-lock-reference-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
|
2181 ;; |
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
|
2182 ;; Fontify null object pointers. |
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
|
2183 '("\\<\\(Nil\\|nil\\)\\>" 1 font-lock-reference-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
|
2184 ))) |
4053 | 2185 |
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
|
2186 (setq 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
|
2187 (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
|
2188 ;; |
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
|
2189 ;; 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
|
2190 ;; 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
|
2191 (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
|
2192 ;; |
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
|
2193 ;; 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
|
2194 `(eval . |
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
|
2195 (list (concat "\\<\\(" (,@ objc-type-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
|
2196 "\\([ \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
|
2197 ;; Fontify each declaration item. |
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
|
2198 '(font-lock-match-c-style-declaration-item-and-skip-to-next |
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
|
2199 ;; Start with point after all type specifiers. |
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
|
2200 (goto-char (or (match-beginning 2) (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
|
2201 ;; Finish with point after first type specifier. |
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
|
2202 (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
|
2203 ;; Fontify as a variable or function name. |
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
|
2204 (1 (if (match-beginning 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
|
2205 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
|
2206 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
|
2207 ;; |
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 ;; 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
|
2209 '("\\(}\\)[ \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
|
2210 (font-lock-match-c-style-declaration-item-and-skip-to-next |
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
|
2211 (goto-char (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
|
2212 (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
|
2213 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
|
2214 font-lock-variable-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
|
2215 ;; |
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 ;; 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
|
2217 '("^\\(\\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
|
2218 (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
|
2219 (font-lock-match-c-style-declaration-item-and-skip-to-next |
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
|
2220 (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
|
2221 (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
|
2222 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
|
2223 font-lock-variable-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
|
2224 ))) |
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
|
2225 ) |
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
|
2226 |
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
|
2227 (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
|
2228 "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
|
2229 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
|
2230 |
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
|
2231 ;;; 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
|
2232 |
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
|
2233 (defconst java-font-lock-keywords-1 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
|
2234 "Subdued level highlighting for 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
|
2235 |
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
|
2236 (defconst java-font-lock-keywords-2 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
|
2237 "Medium level highlighting for 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
|
2238 See also `java-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
|
2239 |
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
|
2240 (defconst java-font-lock-keywords-3 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
|
2241 "Gaudy level highlighting for 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
|
2242 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
|
2243 |
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
|
2244 ;; Regexps written with help from Fred White <fwhite@bbn.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
|
2245 ;; Anders Lindgren <andersl@csd.uu.se>. |
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
|
2246 (let ((java-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
|
2247 (concat "\\<\\(" |
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
|
2248 ; (make-regexp |
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
|
2249 ; '("catch" "do" "else" "super" "this" "finally" "for" "if" |
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
|
2250 ;; ;; Anders Lindgren <andersl@csd.uu.se> says these have gone. |
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
|
2251 ;; "cast" "byvalue" "future" "generic" "operator" "var" |
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
|
2252 ;; "inner" "outer" "rest" |
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
|
2253 ; "interface" "return" "switch" "throw" "try" "while") |
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
|
2254 "catch\\|do\\|else\\|f\\(inally\\|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
|
2255 "i\\(f\\|nterface\\)\\|return\\|s\\(uper\\|witch\\)\\|" |
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
|
2256 "t\\(h\\(is\\|row\\)\\|ry\\)\\|while" |
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
|
2257 "\\)\\>")) |
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
|
2258 ;; |
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
|
2259 ;; These are immediately followed by an object name. |
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
|
2260 (java-minor-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
|
2261 (mapconcat 'identity |
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
|
2262 '("boolean" "char" "byte" "short" "int" "long" "float" "double" "void") |
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
|
2263 "\\|")) |
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
|
2264 ;; |
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
|
2265 ;; These are eventually followed by an object name. |
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
|
2266 (java-major-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
|
2267 ; (make-regexp |
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
|
2268 ; '("abstract" "const" "final" "synchronized" "transient" "static" |
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
|
2269 ;; ;; Anders Lindgren <andersl@csd.uu.se> says this has gone. |
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
|
2270 ;; "threadsafe" |
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
|
2271 ; "volatile" "public" "private" "protected" "native") |
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
|
2272 (concat "abstract\\|const\\|final\\|native\\|" |
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
|
2273 "p\\(r\\(ivate\\|otected\\)\\|ublic\\)\\|" |
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
|
2274 "s\\(tatic\\|ynchronized\\)\\|transient\\|volatile")) |
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
|
2275 ;; |
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
|
2276 ;; Random types immediately followed by an object name. |
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
|
2277 (java-other-types |
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
|
2278 '(mapconcat 'identity (cons "\\sw+\\.\\sw+" java-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
|
2279 "\\|")) |
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
|
2280 ) |
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
|
2281 (setq 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
|
2282 (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
|
2283 ;; |
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
|
2284 ;; 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
|
2285 '("\\<\\(class\\)\\>[ \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
|
2286 (1 font-lock-type-face) (2 font-lock-function-name-face nil 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
|
2287 ;; |
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
|
2288 ;; 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
|
2289 '("\\<\\(import\\|package\\)\\>[ \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
|
2290 (1 font-lock-keyword-face) (2 font-lock-reference-face nil 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
|
2291 )) |
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
|
2292 |
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
|
2293 (setq 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
|
2294 (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
|
2295 (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
|
2296 ;; |
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
|
2297 ;; Fontify all builtin type specifiers. |
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
|
2298 (cons (concat "\\<\\(" java-minor-types "\\|" java-major-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
|
2299 'font-lock-type-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
|
2300 ;; |
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
|
2301 ;; Fontify all builtin keywords (except below). |
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
|
2302 (concat "\\<\\(" java-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
|
2303 ;; |
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
|
2304 ;; Fontify keywords and targets, and case default/goto tags. |
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
|
2305 (list "\\<\\(break\\|case\\|continue\\|goto\\)\\>[ \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
|
2306 '(1 font-lock-keyword-face) '(2 font-lock-reference-face nil 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
|
2307 '(":" ("^[ \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
|
2308 (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
|
2309 (1 font-lock-reference-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
|
2310 ;; |
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
|
2311 ;; Fontify keywords and types; the first can be followed by a type 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
|
2312 (list (concat "\\<\\(" |
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
|
2313 "implements\\|throws\\|" |
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
|
2314 "\\(extends\\|instanceof\\|new\\)" |
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
|
2315 "\\)\\>[ \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
|
2316 '(1 font-lock-keyword-face) '(3 font-lock-type-face nil 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
|
2317 '("\\=[ \t]*,[ \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
|
2318 (if (match-beginning 2) (goto-char (match-end 2))) 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
|
2319 (1 font-lock-type-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
|
2320 ;; |
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
|
2321 ;; Fontify all constants. |
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
|
2322 '("\\<\\(false\\|null\\|true\\)\\>" . font-lock-reference-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
|
2323 ;; |
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
|
2324 ;; Javadoc tags within comments. |
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
|
2325 '("@\\(author\\|exception\\|return\\|see\\|version\\)\\>" |
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
|
2326 (1 font-lock-reference-face prepend)) |
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
|
2327 '("@\\(param\\)\\>[ \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
|
2328 (1 font-lock-reference-face prepend) |
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
|
2329 (2 font-lock-variable-name-face prepend 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
|
2330 ))) |
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
|
2331 |
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
|
2332 (setq java-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
|
2333 (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
|
2334 ;; |
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
|
2335 ;; 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
|
2336 ;; 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
|
2337 (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
|
2338 ;; |
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
|
2339 ;; Fontify random types in casts. |
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
|
2340 `(eval . |
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
|
2341 (list (concat "(\\(" (,@ java-other-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
|
2342 "[ \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
|
2343 ;; Fontify the type name. |
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
|
2344 '(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
|
2345 ;; |
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
|
2346 ;; 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
|
2347 `(eval . |
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
|
2348 (list (concat "\\<\\(" (,@ java-other-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
|
2349 "\\([ \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
|
2350 "[ \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
|
2351 ;; Fontify the type name. |
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
|
2352 '(1 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
|
2353 `(eval . |
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
|
2354 (list (concat "\\<\\(" (,@ java-other-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
|
2355 "\\([ \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
|
2356 "\\([ \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
|
2357 ;; Fontify each declaration item. |
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 '(font-lock-match-c-style-declaration-item-and-skip-to-next |
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
|
2359 ;; Start and finish with point after the type specifier. |
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
|
2360 (goto-char (match-beginning 3)) (goto-char (match-beginning 3)) |
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
|
2361 ;; Fontify as a variable or function name. |
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
|
2362 (1 (if (match-beginning 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
|
2363 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
|
2364 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
|
2365 ;; |
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
|
2366 ;; Fontify those that are immediately followed by an item or 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
|
2367 (list (concat "\\<\\(" java-minor-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
|
2368 "\\([ \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
|
2369 ;; Fontify each declaration item. |
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
|
2370 '(font-lock-match-c-style-declaration-item-and-skip-to-next |
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
|
2371 ;; Start and finish with point after the type specifier. |
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
|
2372 nil (goto-char (match-end 0)) |
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
|
2373 ;; Fontify as a variable or function name. |
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
|
2374 (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
|
2375 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
|
2376 font-lock-variable-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
|
2377 ;; |
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
|
2378 ;; Fontify those that are eventually followed by an item or 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
|
2379 (list (concat "\\<\\(" java-major-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
|
2380 "\\([ \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
|
2381 "\\([ \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
|
2382 "\\)*") |
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
|
2383 ;; Fontify each declaration item. |
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
|
2384 '(font-lock-match-c-style-declaration-item-and-skip-to-next |
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
|
2385 ;; Start with point after all type specifiers. |
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
|
2386 (goto-char (or (match-beginning 2) (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
|
2387 ;; Finish with point after first type specifier. |
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
|
2388 (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
|
2389 ;; Fontify as a variable or function name. |
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
|
2390 (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
|
2391 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
|
2392 font-lock-variable-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
|
2393 ))) |
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
|
2394 ) |
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
|
2395 |
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
|
2396 (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
|
2397 "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
|
2398 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
|
2399 |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
2400 ;; Install ourselves: |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
2401 |
15492
348f0896b1e7
(font-lock-verbose): Default to 0. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15485
diff
changeset
|
2402 (unless (assq 'font-lock-mode minor-mode-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
|
2403 (push '(font-lock-mode " Font") minor-mode-alist)) |
9389
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
2404 |
fec6bd86e836
(compilation-mode-font-lock-keywords,
Richard M. Stallman <rms@gnu.org>
parents:
9350
diff
changeset
|
2405 ;; Provide ourselves: |
7491
621c162a80db
(font-lock-no-comments): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
7298
diff
changeset
|
2406 |
4053 | 2407 (provide 'font-lock) |
2408 | |
2409 ;;; font-lock.el ends here |