Mercurial > emacs
annotate lisp/jit-lock.el @ 32911:67ee3f53d728
Copy across changelog entries for regex.c.
author | Andrew Innes <andrewi@gnu.org> |
---|---|
date | Thu, 26 Oct 2000 12:43:47 +0000 |
parents | 38b7e156a71f |
children | 81a73d432436 |
rev | line source |
---|---|
25003 | 1 ;;; jit-lock.el --- just-in-time fontification. |
2 | |
3 ;; Copyright (C) 1998 Free Software Foundation, Inc. | |
4 | |
5 ;; Author: Gerd Moellmann <gerd@gnu.org> | |
6 ;; Keywords: faces files | |
7 ;; Version: 1.0 | |
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 | |
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. | |
25 | |
26 ;;; Commentary: | |
27 | |
28 ;; Just-in-time fontification, triggered by C redisplay code. | |
29 | |
30 ;;; Code: | |
31 | |
32 | |
33 (eval-when-compile | |
28501
030a9790d290
(with-buffer-unmodified): New macro.
Gerd Moellmann <gerd@gnu.org>
parents:
28208
diff
changeset
|
34 (defmacro with-buffer-unmodified (&rest body) |
030a9790d290
(with-buffer-unmodified): New macro.
Gerd Moellmann <gerd@gnu.org>
parents:
28208
diff
changeset
|
35 "Eval BODY, preserving the current buffer's modified state." |
030a9790d290
(with-buffer-unmodified): New macro.
Gerd Moellmann <gerd@gnu.org>
parents:
28208
diff
changeset
|
36 (let ((modified (make-symbol "modified"))) |
030a9790d290
(with-buffer-unmodified): New macro.
Gerd Moellmann <gerd@gnu.org>
parents:
28208
diff
changeset
|
37 `(let ((,modified (buffer-modified-p))) |
32152
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
38 (unwind-protect |
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
39 (progn ,@body) |
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
40 (unless ,modified |
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
41 (restore-buffer-modified-p nil)))))) |
28501
030a9790d290
(with-buffer-unmodified): New macro.
Gerd Moellmann <gerd@gnu.org>
parents:
28208
diff
changeset
|
42 |
29799
baa52c9029f6
(with-buffer-prepared-for-jit-lock):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29708
diff
changeset
|
43 (defmacro with-buffer-prepared-for-jit-lock (&rest body) |
25003 | 44 "Execute BODY in current buffer, overriding several variables. |
45 Preserves the `buffer-modified-p' state of the current buffer." | |
28521
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
46 `(with-buffer-unmodified |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
47 (let ((buffer-undo-list t) |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
48 (inhibit-read-only t) |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
49 (inhibit-point-motion-hooks t) |
29799
baa52c9029f6
(with-buffer-prepared-for-jit-lock):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29708
diff
changeset
|
50 (inhibit-modification-hooks t) |
28521
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
51 deactivate-mark |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
52 buffer-file-name |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
53 buffer-file-truename) |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
54 ,@body)))) |
28501
030a9790d290
(with-buffer-unmodified): New macro.
Gerd Moellmann <gerd@gnu.org>
parents:
28208
diff
changeset
|
55 |
25003 | 56 |
57 | |
58 ;;; Customization. | |
59 | |
60 (defcustom jit-lock-chunk-size 500 | |
29799
baa52c9029f6
(with-buffer-prepared-for-jit-lock):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29708
diff
changeset
|
61 "*Jit-lock chunks of this many characters, or smaller." |
25003 | 62 :type 'integer |
63 :group 'jit-lock) | |
64 | |
65 | |
66 (defcustom jit-lock-stealth-time 3 | |
67 "*Time in seconds to wait before beginning stealth fontification. | |
68 Stealth fontification occurs if there is no input within this time. | |
32581
38b7e156a71f
(jit-lock-stealth-time): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
32531
diff
changeset
|
69 If nil, stealth fontification is never performed. |
25003 | 70 |
71 The value of this variable is used when JIT Lock mode is turned on." | |
72 :type '(choice (const :tag "never" nil) | |
73 (number :tag "seconds")) | |
74 :group 'jit-lock) | |
75 | |
76 | |
77 (defcustom jit-lock-stealth-nice 0.125 | |
78 "*Time in seconds to pause between chunks of stealth fontification. | |
79 Each iteration of stealth fontification is separated by this amount of time, | |
80 thus reducing the demand that stealth fontification makes on the system. | |
81 If nil, means stealth fontification is never paused. | |
82 To reduce machine load during stealth fontification, at the cost of stealth | |
83 taking longer to fontify, you could increase the value of this variable. | |
84 See also `jit-lock-stealth-load'." | |
85 :type '(choice (const :tag "never" nil) | |
86 (number :tag "seconds")) | |
87 :group 'jit-lock) | |
88 | |
89 | |
90 (defcustom jit-lock-stealth-load | |
91 (if (condition-case nil (load-average) (error)) 200) | |
92 "*Load in percentage above which stealth fontification is suspended. | |
93 Stealth fontification pauses when the system short-term load average (as | |
94 returned by the function `load-average' if supported) goes above this level, | |
95 thus reducing the demand that stealth fontification makes on the system. | |
96 If nil, means stealth fontification is never suspended. | |
97 To reduce machine load during stealth fontification, at the cost of stealth | |
98 taking longer to fontify, you could reduce the value of this variable. | |
99 See also `jit-lock-stealth-nice'." | |
100 :type (if (condition-case nil (load-average) (error)) | |
101 '(choice (const :tag "never" nil) | |
102 (integer :tag "load")) | |
103 '(const :format "%t: unsupported\n" nil)) | |
104 :group 'jit-lock) | |
105 | |
106 | |
107 (defcustom jit-lock-stealth-verbose nil | |
108 "*If non-nil, means stealth fontification should show status messages." | |
109 :type 'boolean | |
110 :group 'jit-lock) | |
111 | |
112 | |
113 (defcustom jit-lock-defer-contextually 'syntax-driven | |
114 "*If non-nil, means deferred fontification should be syntactically true. | |
115 If nil, means deferred fontification occurs only on those lines modified. This | |
116 means where modification on a line causes syntactic change on subsequent lines, | |
117 those subsequent lines are not refontified to reflect their new context. | |
118 If t, means deferred fontification occurs on those lines modified and all | |
119 subsequent lines. This means those subsequent lines are refontified to reflect | |
120 their new syntactic context, either immediately or when scrolling into them. | |
121 If any other value, e.g., `syntax-driven', means deferred syntactically true | |
122 fontification occurs only if syntactic fontification is performed using the | |
123 buffer mode's syntax table, i.e., only if `font-lock-keywords-only' is nil. | |
124 | |
125 The value of this variable is used when JIT Lock mode is turned on." | |
126 :type '(choice (const :tag "never" nil) | |
127 (const :tag "always" t) | |
128 (other :tag "syntax-driven" syntax-driven)) | |
129 :group 'jit-lock) | |
130 | |
131 | |
132 | |
133 ;;; Variables that are not customizable. | |
134 | |
135 (defvar jit-lock-mode nil | |
136 "Non-nil means Just-in-time Lock mode is active.") | |
137 (make-variable-buffer-local 'jit-lock-mode) | |
138 | |
32152
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
139 (defvar jit-lock-functions nil |
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
140 "Functions to do the actual fontification. |
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
141 They are called with two arguments: the START and END of the region to fontify.") |
32305
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
142 (make-variable-buffer-local 'jit-lock-functions) |
25003 | 143 |
144 (defvar jit-lock-first-unfontify-pos nil | |
32305
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
145 "Consider text after this position as contextually unfontified. |
29799
baa52c9029f6
(with-buffer-prepared-for-jit-lock):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29708
diff
changeset
|
146 If nil, contextual fontification is disabled.") |
25003 | 147 (make-variable-buffer-local 'jit-lock-first-unfontify-pos) |
148 | |
149 | |
150 (defvar jit-lock-stealth-timer nil | |
151 "Timer for stealth fontification in Just-in-time Lock mode.") | |
152 | |
153 ;;; JIT lock mode | |
154 | |
155 (defun jit-lock-mode (arg) | |
156 "Toggle Just-in-time Lock mode. | |
29799
baa52c9029f6
(with-buffer-prepared-for-jit-lock):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29708
diff
changeset
|
157 Turn Just-in-time Lock mode on if and only if ARG is non-nil. |
25003 | 158 Enable it automatically by customizing group `font-lock'. |
159 | |
160 When Just-in-time Lock mode is enabled, fontification is different in the | |
161 following ways: | |
162 | |
163 - Demand-driven buffer fontification triggered by Emacs C code. | |
164 This means initial fontification of the whole buffer does not occur. | |
165 Instead, fontification occurs when necessary, such as when scrolling | |
166 through the buffer would otherwise reveal unfontified areas. This is | |
167 useful if buffer fontification is too slow for large buffers. | |
168 | |
169 - Stealthy buffer fontification if `jit-lock-stealth-time' is non-nil. | |
170 This means remaining unfontified areas of buffers are fontified if Emacs has | |
171 been idle for `jit-lock-stealth-time' seconds, while Emacs remains idle. | |
172 This is useful if any buffer has any deferred fontification. | |
173 | |
174 - Deferred context fontification if `jit-lock-defer-contextually' is | |
175 non-nil. This means fontification updates the buffer corresponding to | |
176 true syntactic context, after `jit-lock-stealth-time' seconds of Emacs | |
177 idle time, while Emacs remains idle. Otherwise, fontification occurs | |
178 on modified lines only, and subsequent lines can remain fontified | |
179 corresponding to previous syntactic contexts. This is useful where | |
180 strings or comments span lines. | |
181 | |
182 Stealth fontification only occurs while the system remains unloaded. | |
183 If the system load rises above `jit-lock-stealth-load' percent, stealth | |
184 fontification is suspended. Stealth fontification intensity is controlled via | |
29413
ce16b083b459
(jit-lock-saved-fontify-buffer-function): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29288
diff
changeset
|
185 the variable `jit-lock-stealth-nice'." |
29799
baa52c9029f6
(with-buffer-prepared-for-jit-lock):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29708
diff
changeset
|
186 (setq jit-lock-mode arg) |
baa52c9029f6
(with-buffer-prepared-for-jit-lock):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29708
diff
changeset
|
187 (cond (;; Turn Just-in-time Lock mode on. |
baa52c9029f6
(with-buffer-prepared-for-jit-lock):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29708
diff
changeset
|
188 jit-lock-mode |
25003 | 189 |
32305
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
190 ;; Mark the buffer for refontification |
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
191 (jit-lock-refontify) |
29413
ce16b083b459
(jit-lock-saved-fontify-buffer-function): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29288
diff
changeset
|
192 |
25003 | 193 ;; Install an idle timer for stealth fontification. |
32181
f3afd1ff75a8
(jit-lock-mode): Use jit-lock-defer-contextually
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32157
diff
changeset
|
194 (when (and jit-lock-stealth-time (null jit-lock-stealth-timer)) |
29413
ce16b083b459
(jit-lock-saved-fontify-buffer-function): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29288
diff
changeset
|
195 (setq jit-lock-stealth-timer |
25003 | 196 (run-with-idle-timer jit-lock-stealth-time |
197 jit-lock-stealth-time | |
198 'jit-lock-stealth-fontify))) | |
199 | |
29799
baa52c9029f6
(with-buffer-prepared-for-jit-lock):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29708
diff
changeset
|
200 ;; Initialize deferred contextual fontification if requested. |
32305
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
201 (when (eq jit-lock-defer-contextually t) |
32181
f3afd1ff75a8
(jit-lock-mode): Use jit-lock-defer-contextually
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32157
diff
changeset
|
202 (setq jit-lock-first-unfontify-pos |
f3afd1ff75a8
(jit-lock-mode): Use jit-lock-defer-contextually
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32157
diff
changeset
|
203 (or jit-lock-first-unfontify-pos (point-max)))) |
29799
baa52c9029f6
(with-buffer-prepared-for-jit-lock):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29708
diff
changeset
|
204 |
32305
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
205 ;; Setup our hooks. |
29799
baa52c9029f6
(with-buffer-prepared-for-jit-lock):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29708
diff
changeset
|
206 (add-hook 'after-change-functions 'jit-lock-after-change nil t) |
25003 | 207 (add-hook 'fontification-functions 'jit-lock-function)) |
208 | |
209 ;; Turn Just-in-time Lock mode off. | |
210 (t | |
211 ;; Cancel our idle timer. | |
212 (when jit-lock-stealth-timer | |
213 (cancel-timer jit-lock-stealth-timer) | |
214 (setq jit-lock-stealth-timer nil)) | |
215 | |
32305
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
216 ;; Remove hooks. |
29413
ce16b083b459
(jit-lock-saved-fontify-buffer-function): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29288
diff
changeset
|
217 (remove-hook 'after-change-functions 'jit-lock-after-change t) |
25003 | 218 (remove-hook 'fontification-functions 'jit-lock-function)))) |
219 | |
32181
f3afd1ff75a8
(jit-lock-mode): Use jit-lock-defer-contextually
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32157
diff
changeset
|
220 ;;;###autoload |
f3afd1ff75a8
(jit-lock-mode): Use jit-lock-defer-contextually
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32157
diff
changeset
|
221 (defun jit-lock-register (fun &optional contextual) |
32157
c3d137c056d1
(jit-lock-register, jit-lock-unregister): Docstring fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32156
diff
changeset
|
222 "Register FUN as a fontification function to be called in this buffer. |
c3d137c056d1
(jit-lock-register, jit-lock-unregister): Docstring fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32156
diff
changeset
|
223 FUN will be called with two arguments START and END indicating the region |
32181
f3afd1ff75a8
(jit-lock-mode): Use jit-lock-defer-contextually
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32157
diff
changeset
|
224 that needs to be (re)fontified. |
f3afd1ff75a8
(jit-lock-mode): Use jit-lock-defer-contextually
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32157
diff
changeset
|
225 If non-nil, CONTEXTUAL means that a contextual fontification would be useful." |
32156
b3596a2daf42
(jit-lock-register, jit-lock-unregister): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32152
diff
changeset
|
226 (add-hook 'jit-lock-functions fun nil t) |
32181
f3afd1ff75a8
(jit-lock-mode): Use jit-lock-defer-contextually
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32157
diff
changeset
|
227 (when (and contextual jit-lock-defer-contextually) |
f3afd1ff75a8
(jit-lock-mode): Use jit-lock-defer-contextually
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32157
diff
changeset
|
228 (set (make-local-variable 'jit-lock-defer-contextually) t)) |
32156
b3596a2daf42
(jit-lock-register, jit-lock-unregister): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32152
diff
changeset
|
229 (jit-lock-mode t)) |
b3596a2daf42
(jit-lock-register, jit-lock-unregister): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32152
diff
changeset
|
230 |
b3596a2daf42
(jit-lock-register, jit-lock-unregister): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32152
diff
changeset
|
231 (defun jit-lock-unregister (fun) |
32157
c3d137c056d1
(jit-lock-register, jit-lock-unregister): Docstring fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32156
diff
changeset
|
232 "Unregister FUN as a fontification function. |
32156
b3596a2daf42
(jit-lock-register, jit-lock-unregister): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32152
diff
changeset
|
233 Only applies to the current buffer." |
b3596a2daf42
(jit-lock-register, jit-lock-unregister): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32152
diff
changeset
|
234 (remove-hook 'jit-lock-functions fun t) |
32305
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
235 (unless jit-lock-functions (jit-lock-mode nil))) |
25003 | 236 |
29413
ce16b083b459
(jit-lock-saved-fontify-buffer-function): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29288
diff
changeset
|
237 ;; This function is used to prevent font-lock-fontify-buffer from |
ce16b083b459
(jit-lock-saved-fontify-buffer-function): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29288
diff
changeset
|
238 ;; fontifying eagerly the whole buffer. This is important for |
ce16b083b459
(jit-lock-saved-fontify-buffer-function): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29288
diff
changeset
|
239 ;; things like CWarn mode which adds/removes a few keywords and |
ce16b083b459
(jit-lock-saved-fontify-buffer-function): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29288
diff
changeset
|
240 ;; does a refontify (which takes ages on large files). |
32305
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
241 (defun jit-lock-refontify (&optional beg end) |
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
242 "Force refontification of the region BEG..END (default whole buffer)." |
29799
baa52c9029f6
(with-buffer-prepared-for-jit-lock):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29708
diff
changeset
|
243 (with-buffer-prepared-for-jit-lock |
29708
f37b857741b1
(jit-lock-mode): Force jit-refontify when turned on.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29413
diff
changeset
|
244 (save-restriction |
f37b857741b1
(jit-lock-mode): Force jit-refontify when turned on.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29413
diff
changeset
|
245 (widen) |
32305
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
246 (add-text-properties (or beg (point-min)) (or end (point-max)) |
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
247 '(fontified nil))))) |
25003 | 248 |
249 ;;; On demand fontification. | |
250 | |
251 (defun jit-lock-function (start) | |
252 "Fontify current buffer starting at position START. | |
253 This function is added to `fontification-functions' when `jit-lock-mode' | |
254 is active." | |
255 (when jit-lock-mode | |
32305
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
256 (jit-lock-fontify-now start (+ start jit-lock-chunk-size)))) |
28501
030a9790d290
(with-buffer-unmodified): New macro.
Gerd Moellmann <gerd@gnu.org>
parents:
28208
diff
changeset
|
257 |
32305
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
258 |
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
259 (defun jit-lock-fontify-now (&optional start end) |
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
260 "Fontify current buffer from START to END. |
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
261 Defaults to the whole buffer. END can be out of bounds." |
29799
baa52c9029f6
(with-buffer-prepared-for-jit-lock):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29708
diff
changeset
|
262 (with-buffer-prepared-for-jit-lock |
28501
030a9790d290
(with-buffer-unmodified): New macro.
Gerd Moellmann <gerd@gnu.org>
parents:
28208
diff
changeset
|
263 (save-excursion |
030a9790d290
(with-buffer-unmodified): New macro.
Gerd Moellmann <gerd@gnu.org>
parents:
28208
diff
changeset
|
264 (save-restriction |
030a9790d290
(with-buffer-unmodified): New macro.
Gerd Moellmann <gerd@gnu.org>
parents:
28208
diff
changeset
|
265 (widen) |
32305
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
266 (unless start (setq start (point-min))) |
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
267 (setq end (if end (min end (point-max)) (point-max))) |
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
268 (let ((font-lock-beginning-of-syntax-function nil) |
32152
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
269 next) |
28501
030a9790d290
(with-buffer-unmodified): New macro.
Gerd Moellmann <gerd@gnu.org>
parents:
28208
diff
changeset
|
270 (save-match-data |
32152
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
271 ;; Fontify chunks beginning at START. The end of a |
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
272 ;; chunk is either `end', or the start of a region |
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
273 ;; before `end' that has already been fontified. |
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
274 (while start |
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
275 ;; Determine the end of this chunk. |
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
276 (setq next (or (text-property-any start end 'fontified t) |
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
277 end)) |
25395
9d8fff117316
(jit-lock-function): Extend the fontified range
Gerd Moellmann <gerd@gnu.org>
parents:
25341
diff
changeset
|
278 |
32152
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
279 ;; Decide which range of text should be fontified. |
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
280 ;; The problem is that START and NEXT may be in the |
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
281 ;; middle of something matched by a font-lock regexp. |
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
282 ;; Until someone has a better idea, let's start |
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
283 ;; at the start of the line containing START and |
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
284 ;; stop at the start of the line following NEXT. |
32305
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
285 (goto-char next) (setq next (line-beginning-position 2)) |
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
286 (goto-char start) (setq start (line-beginning-position)) |
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
287 |
32152
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
288 ;; Fontify the chunk, and mark it as fontified. |
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
289 ;; We mark it first, to make sure that we don't indefinitely |
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
290 ;; re-execute this fontification if an error occurs. |
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
291 (add-text-properties start next '(fontified t)) |
32305
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
292 (run-hook-with-args 'jit-lock-functions start next) |
25003 | 293 |
32152
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
294 ;; Find the start of the next chunk, if any. |
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
295 (setq start (text-property-any next end 'fontified nil))))))))) |
25003 | 296 |
297 | |
298 ;;; Stealth fontification. | |
299 | |
300 (defsubst jit-lock-stealth-chunk-start (around) | |
301 "Return the start of the next chunk to fontify around position AROUND.. | |
302 Value is nil if there is nothing more to fontify." | |
27537
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
303 (if (zerop (buffer-size)) |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
304 nil |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
305 (save-restriction |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
306 (widen) |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
307 (let* ((next (text-property-any around (point-max) 'fontified nil)) |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
308 (prev (previous-single-property-change around 'fontified)) |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
309 (prop (get-text-property (max (point-min) (1- around)) |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
310 'fontified)) |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
311 (start (cond |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
312 ((null prev) |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
313 ;; There is no property change between AROUND |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
314 ;; and the start of the buffer. If PROP is |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
315 ;; non-nil, everything in front of AROUND is |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
316 ;; fontified, otherwise nothing is fontified. |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
317 (if prop |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
318 nil |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
319 (max (point-min) |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
320 (- around (/ jit-lock-chunk-size 2))))) |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
321 (prop |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
322 ;; PREV is the start of a region of fontified |
29799
baa52c9029f6
(with-buffer-prepared-for-jit-lock):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29708
diff
changeset
|
323 ;; text containing AROUND. Start fontifying a |
27537
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
324 ;; chunk size before the end of the unfontified |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
325 ;; region in front of that. |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
326 (max (or (previous-single-property-change prev 'fontified) |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
327 (point-min)) |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
328 (- prev jit-lock-chunk-size))) |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
329 (t |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
330 ;; PREV is the start of a region of unfontified |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
331 ;; text containing AROUND. Start at PREV or |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
332 ;; chunk size in front of AROUND, whichever is |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
333 ;; nearer. |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
334 (max prev (- around jit-lock-chunk-size))))) |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
335 (result (cond ((null start) next) |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
336 ((null next) start) |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
337 ((< (- around start) (- next around)) start) |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
338 (t next)))) |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
339 result)))) |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
340 |
25003 | 341 |
342 (defun jit-lock-stealth-fontify () | |
343 "Fontify buffers stealthily. | |
344 This functions is called after Emacs has been idle for | |
345 `jit-lock-stealth-time' seconds." | |
346 (unless (or executing-kbd-macro | |
347 (window-minibuffer-p (selected-window))) | |
348 (let ((buffers (buffer-list)) | |
349 minibuffer-auto-raise | |
350 message-log-max) | |
27537
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
351 (while (and buffers (not (input-pending-p))) |
25003 | 352 (let ((buffer (car buffers))) |
353 (setq buffers (cdr buffers)) | |
27537
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
354 |
25003 | 355 (with-current-buffer buffer |
356 (when jit-lock-mode | |
357 ;; This is funny. Calling sit-for with 3rd arg non-nil | |
358 ;; so that it doesn't redisplay, internally calls | |
359 ;; wait_reading_process_input also with a parameter | |
360 ;; saying "don't redisplay." Since this function here | |
361 ;; is called periodically, this effectively leads to | |
362 ;; process output not being redisplayed at all because | |
363 ;; redisplay_internal is never called. (That didn't | |
364 ;; work in the old redisplay either.) So, we learn that | |
365 ;; we mustn't call sit-for that way here. But then, we | |
366 ;; have to be cautious not to call sit-for in a widened | |
367 ;; buffer, since this could display hidden parts of that | |
368 ;; buffer. This explains the seemingly weird use of | |
369 ;; save-restriction/widen here. | |
370 | |
371 (with-temp-message (if jit-lock-stealth-verbose | |
372 (concat "JIT stealth lock " | |
373 (buffer-name))) | |
27537
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
374 |
28521
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
375 ;; Perform deferred unfontification, if any. |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
376 (when jit-lock-first-unfontify-pos |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
377 (save-restriction |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
378 (widen) |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
379 (when (and (>= jit-lock-first-unfontify-pos (point-min)) |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
380 (< jit-lock-first-unfontify-pos (point-max))) |
29799
baa52c9029f6
(with-buffer-prepared-for-jit-lock):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29708
diff
changeset
|
381 (with-buffer-prepared-for-jit-lock |
28521
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
382 (put-text-property jit-lock-first-unfontify-pos |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
383 (point-max) 'fontified nil)) |
29799
baa52c9029f6
(with-buffer-prepared-for-jit-lock):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29708
diff
changeset
|
384 (setq jit-lock-first-unfontify-pos (point-max))))) |
28501
030a9790d290
(with-buffer-unmodified): New macro.
Gerd Moellmann <gerd@gnu.org>
parents:
28208
diff
changeset
|
385 |
28521
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
386 ;; In the following code, the `sit-for' calls cause a |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
387 ;; redisplay, so it's required that the |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
388 ;; buffer-modified flag of a buffer that is displayed |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
389 ;; has the right value---otherwise the mode line of |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
390 ;; an unmodified buffer would show a `*'. |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
391 (let (start |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
392 (nice (or jit-lock-stealth-nice 0)) |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
393 (point (point))) |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
394 (while (and (setq start |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
395 (jit-lock-stealth-chunk-start point)) |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
396 (sit-for nice)) |
25003 | 397 |
28521
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
398 ;; Wait a little if load is too high. |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
399 (when (and jit-lock-stealth-load |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
400 (> (car (load-average)) jit-lock-stealth-load)) |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
401 (sit-for (or jit-lock-stealth-time 30))) |
25003 | 402 |
28521
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
403 ;; Unless there's input pending now, fontify. |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
404 (unless (input-pending-p) |
32305
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
405 (jit-lock-fontify-now |
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
406 start (+ start jit-lock-chunk-size))))))))))))) |
25003 | 407 |
408 | |
409 | |
410 ;;; Deferred fontification. | |
411 | |
412 (defun jit-lock-after-change (start end old-len) | |
413 "Mark the rest of the buffer as not fontified after a change. | |
414 Installed on `after-change-functions'. | |
415 START and END are the start and end of the changed text. OLD-LEN | |
416 is the pre-change length. | |
417 This function ensures that lines following the change will be refontified | |
418 in case the syntax of those lines has changed. Refontification | |
419 will take place when text is fontified stealthily." | |
420 (when jit-lock-mode | |
29827
dd9436a06050
(jit-lock-after-change): Don't assume point is at START.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29799
diff
changeset
|
421 (save-excursion |
dd9436a06050
(jit-lock-after-change): Don't assume point is at START.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29799
diff
changeset
|
422 (with-buffer-prepared-for-jit-lock |
32531
2555cdee2fed
(jit-lock-after-change): If we're in text that
Gerd Moellmann <gerd@gnu.org>
parents:
32485
diff
changeset
|
423 ;; If we're in text that matches a multi-line font-lock pattern, |
2555cdee2fed
(jit-lock-after-change): If we're in text that
Gerd Moellmann <gerd@gnu.org>
parents:
32485
diff
changeset
|
424 ;; make sure the whole text will be redisplayed. |
2555cdee2fed
(jit-lock-after-change): If we're in text that
Gerd Moellmann <gerd@gnu.org>
parents:
32485
diff
changeset
|
425 (when (get-text-property start 'font-lock-multiline) |
2555cdee2fed
(jit-lock-after-change): If we're in text that
Gerd Moellmann <gerd@gnu.org>
parents:
32485
diff
changeset
|
426 (setq start (or (previous-single-property-change |
2555cdee2fed
(jit-lock-after-change): If we're in text that
Gerd Moellmann <gerd@gnu.org>
parents:
32485
diff
changeset
|
427 start 'font-lock-multiline) |
2555cdee2fed
(jit-lock-after-change): If we're in text that
Gerd Moellmann <gerd@gnu.org>
parents:
32485
diff
changeset
|
428 (point-min)))) |
2555cdee2fed
(jit-lock-after-change): If we're in text that
Gerd Moellmann <gerd@gnu.org>
parents:
32485
diff
changeset
|
429 |
29827
dd9436a06050
(jit-lock-after-change): Don't assume point is at START.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29799
diff
changeset
|
430 ;; It's important that the `fontified' property be set from the |
dd9436a06050
(jit-lock-after-change): Don't assume point is at START.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29799
diff
changeset
|
431 ;; beginning of the line, else font-lock will properly change the |
dd9436a06050
(jit-lock-after-change): Don't assume point is at START.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29799
diff
changeset
|
432 ;; text's face, but the display will have been done already and will |
dd9436a06050
(jit-lock-after-change): Don't assume point is at START.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29799
diff
changeset
|
433 ;; be inconsistent with the buffer's content. |
dd9436a06050
(jit-lock-after-change): Don't assume point is at START.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29799
diff
changeset
|
434 (goto-char start) |
dd9436a06050
(jit-lock-after-change): Don't assume point is at START.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29799
diff
changeset
|
435 (setq start (line-beginning-position)) |
32531
2555cdee2fed
(jit-lock-after-change): If we're in text that
Gerd Moellmann <gerd@gnu.org>
parents:
32485
diff
changeset
|
436 |
29827
dd9436a06050
(jit-lock-after-change): Don't assume point is at START.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29799
diff
changeset
|
437 ;; Make sure we change at least one char (in case of deletions). |
dd9436a06050
(jit-lock-after-change): Don't assume point is at START.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29799
diff
changeset
|
438 (setq end (min (max end (1+ start)) (point-max))) |
dd9436a06050
(jit-lock-after-change): Don't assume point is at START.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29799
diff
changeset
|
439 ;; Request refontification. |
dd9436a06050
(jit-lock-after-change): Don't assume point is at START.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29799
diff
changeset
|
440 (put-text-property start end 'fontified nil)) |
dd9436a06050
(jit-lock-after-change): Don't assume point is at START.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29799
diff
changeset
|
441 ;; Mark the change for deferred contextual refontification. |
dd9436a06050
(jit-lock-after-change): Don't assume point is at START.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29799
diff
changeset
|
442 (when jit-lock-first-unfontify-pos |
dd9436a06050
(jit-lock-after-change): Don't assume point is at START.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29799
diff
changeset
|
443 (setq jit-lock-first-unfontify-pos |
dd9436a06050
(jit-lock-after-change): Don't assume point is at START.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29799
diff
changeset
|
444 (min jit-lock-first-unfontify-pos start)))))) |
25003 | 445 |
446 (provide 'jit-lock) | |
447 | |
448 ;; jit-lock.el ends here |