38436
|
1 ;;; jit-lock.el --- just-in-time fontification
|
25003
|
2
|
64762
|
3 ;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004,
|
75347
|
4 ;; 2005, 2006, 2007 Free Software Foundation, Inc.
|
25003
|
5
|
|
6 ;; Author: Gerd Moellmann <gerd@gnu.org>
|
|
7 ;; Keywords: faces files
|
|
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
|
78236
|
13 ;; the Free Software Foundation; either version 3, or (at your option)
|
25003
|
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
|
64091
|
23 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
24 ;; Boston, MA 02110-1301, USA.
|
25003
|
25
|
|
26 ;;; Commentary:
|
|
27
|
|
28 ;; Just-in-time fontification, triggered by C redisplay code.
|
|
29
|
|
30 ;;; Code:
|
|
31
|
|
32
|
|
33 (eval-when-compile
|
72248
|
34 (require 'cl)
|
|
35
|
28501
|
36 (defmacro with-buffer-unmodified (&rest body)
|
|
37 "Eval BODY, preserving the current buffer's modified state."
|
53756
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
38 (declare (debug t))
|
28501
|
39 (let ((modified (make-symbol "modified")))
|
|
40 `(let ((,modified (buffer-modified-p)))
|
32152
|
41 (unwind-protect
|
|
42 (progn ,@body)
|
|
43 (unless ,modified
|
|
44 (restore-buffer-modified-p nil))))))
|
49597
|
45
|
29799
|
46 (defmacro with-buffer-prepared-for-jit-lock (&rest body)
|
25003
|
47 "Execute BODY in current buffer, overriding several variables.
|
|
48 Preserves the `buffer-modified-p' state of the current buffer."
|
53756
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
49 (declare (debug t))
|
28521
|
50 `(with-buffer-unmodified
|
|
51 (let ((buffer-undo-list t)
|
|
52 (inhibit-read-only t)
|
|
53 (inhibit-point-motion-hooks t)
|
29799
|
54 (inhibit-modification-hooks t)
|
28521
|
55 deactivate-mark
|
|
56 buffer-file-name
|
|
57 buffer-file-truename)
|
|
58 ,@body))))
|
28501
|
59
|
49597
|
60
|
25003
|
61
|
|
62 ;;; Customization.
|
|
63
|
53709
|
64 (defgroup jit-lock nil
|
|
65 "Font Lock support mode to fontify just-in-time."
|
|
66 :version "21.1"
|
|
67 :group 'font-lock)
|
|
68
|
25003
|
69 (defcustom jit-lock-chunk-size 500
|
67923
|
70 "*Jit-lock fontifies chunks of at most this many characters at a time.
|
|
71
|
|
72 This variable controls both display-time and stealth fontification."
|
25003
|
73 :type 'integer
|
|
74 :group 'jit-lock)
|
|
75
|
|
76
|
76291
|
77 (defcustom jit-lock-stealth-time nil
|
25003
|
78 "*Time in seconds to wait before beginning stealth fontification.
|
|
79 Stealth fontification occurs if there is no input within this time.
|
32581
|
80 If nil, stealth fontification is never performed.
|
25003
|
81
|
|
82 The value of this variable is used when JIT Lock mode is turned on."
|
|
83 :type '(choice (const :tag "never" nil)
|
76291
|
84 (number :tag "seconds" :value 16))
|
25003
|
85 :group 'jit-lock)
|
|
86
|
|
87
|
61746
|
88 (defcustom jit-lock-stealth-nice 0.5
|
25003
|
89 "*Time in seconds to pause between chunks of stealth fontification.
|
|
90 Each iteration of stealth fontification is separated by this amount of time,
|
|
91 thus reducing the demand that stealth fontification makes on the system.
|
|
92 If nil, means stealth fontification is never paused.
|
|
93 To reduce machine load during stealth fontification, at the cost of stealth
|
|
94 taking longer to fontify, you could increase the value of this variable.
|
|
95 See also `jit-lock-stealth-load'."
|
|
96 :type '(choice (const :tag "never" nil)
|
49597
|
97 (number :tag "seconds"))
|
25003
|
98 :group 'jit-lock)
|
49597
|
99
|
25003
|
100
|
|
101 (defcustom jit-lock-stealth-load
|
|
102 (if (condition-case nil (load-average) (error)) 200)
|
|
103 "*Load in percentage above which stealth fontification is suspended.
|
|
104 Stealth fontification pauses when the system short-term load average (as
|
|
105 returned by the function `load-average' if supported) goes above this level,
|
|
106 thus reducing the demand that stealth fontification makes on the system.
|
|
107 If nil, means stealth fontification is never suspended.
|
|
108 To reduce machine load during stealth fontification, at the cost of stealth
|
|
109 taking longer to fontify, you could reduce the value of this variable.
|
|
110 See also `jit-lock-stealth-nice'."
|
|
111 :type (if (condition-case nil (load-average) (error))
|
|
112 '(choice (const :tag "never" nil)
|
|
113 (integer :tag "load"))
|
|
114 '(const :format "%t: unsupported\n" nil))
|
|
115 :group 'jit-lock)
|
|
116
|
|
117
|
|
118 (defcustom jit-lock-stealth-verbose nil
|
|
119 "*If non-nil, means stealth fontification should show status messages."
|
|
120 :type 'boolean
|
|
121 :group 'jit-lock)
|
|
122
|
|
123
|
53755
|
124 (defvaralias 'jit-lock-defer-contextually 'jit-lock-contextually)
|
|
125 (defcustom jit-lock-contextually 'syntax-driven
|
|
126 "*If non-nil, means fontification should be syntactically true.
|
|
127 If nil, means fontification occurs only on those lines modified. This
|
25003
|
128 means where modification on a line causes syntactic change on subsequent lines,
|
|
129 those subsequent lines are not refontified to reflect their new context.
|
53755
|
130 If t, means fontification occurs on those lines modified and all
|
25003
|
131 subsequent lines. This means those subsequent lines are refontified to reflect
|
53756
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
132 their new syntactic context, after `jit-lock-context-time' seconds.
|
53755
|
133 If any other value, e.g., `syntax-driven', means syntactically true
|
25003
|
134 fontification occurs only if syntactic fontification is performed using the
|
|
135 buffer mode's syntax table, i.e., only if `font-lock-keywords-only' is nil.
|
|
136
|
|
137 The value of this variable is used when JIT Lock mode is turned on."
|
|
138 :type '(choice (const :tag "never" nil)
|
|
139 (const :tag "always" t)
|
|
140 (other :tag "syntax-driven" syntax-driven))
|
|
141 :group 'jit-lock)
|
|
142
|
53756
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
143 (defcustom jit-lock-context-time 0.5
|
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
144 "Idle time after which text is contextually refontified, if applicable."
|
62531
|
145 :type '(number :tag "seconds")
|
|
146 :group 'jit-lock)
|
|
147
|
41502
|
148 (defcustom jit-lock-defer-time nil ;; 0.25
|
41336
|
149 "Idle time after which deferred fontification should take place.
|
|
150 If nil, fontification is not deferred."
|
|
151 :group 'jit-lock
|
|
152 :type '(choice (const :tag "never" nil)
|
|
153 (number :tag "seconds")))
|
25003
|
154
|
|
155 ;;; Variables that are not customizable.
|
|
156
|
|
157 (defvar jit-lock-mode nil
|
|
158 "Non-nil means Just-in-time Lock mode is active.")
|
|
159 (make-variable-buffer-local 'jit-lock-mode)
|
|
160
|
32152
|
161 (defvar jit-lock-functions nil
|
|
162 "Functions to do the actual fontification.
|
|
163 They are called with two arguments: the START and END of the region to fontify.")
|
32305
|
164 (make-variable-buffer-local 'jit-lock-functions)
|
25003
|
165
|
53709
|
166 (defvar jit-lock-context-unfontify-pos nil
|
32305
|
167 "Consider text after this position as contextually unfontified.
|
29799
|
168 If nil, contextual fontification is disabled.")
|
53709
|
169 (make-variable-buffer-local 'jit-lock-context-unfontify-pos)
|
25003
|
170
|
|
171
|
|
172 (defvar jit-lock-stealth-timer nil
|
|
173 "Timer for stealth fontification in Just-in-time Lock mode.")
|
72508
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
174 (defvar jit-lock-stealth-repeat-timer nil
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
175 "Timer for repeated stealth fontification in Just-in-time Lock mode.")
|
53756
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
176 (defvar jit-lock-context-timer nil
|
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
177 "Timer for context fontification in Just-in-time Lock mode.")
|
41336
|
178 (defvar jit-lock-defer-timer nil
|
|
179 "Timer for deferred fontification in Just-in-time Lock mode.")
|
|
180
|
53709
|
181 (defvar jit-lock-defer-buffers nil
|
41336
|
182 "List of buffers with pending deferred fontification.")
|
72508
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
183 (defvar jit-lock-stealth-buffers nil
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
184 "List of buffers that are being fontified stealthily.")
|
25003
|
185
|
|
186 ;;; JIT lock mode
|
|
187
|
|
188 (defun jit-lock-mode (arg)
|
|
189 "Toggle Just-in-time Lock mode.
|
29799
|
190 Turn Just-in-time Lock mode on if and only if ARG is non-nil.
|
25003
|
191 Enable it automatically by customizing group `font-lock'.
|
|
192
|
|
193 When Just-in-time Lock mode is enabled, fontification is different in the
|
|
194 following ways:
|
|
195
|
|
196 - Demand-driven buffer fontification triggered by Emacs C code.
|
|
197 This means initial fontification of the whole buffer does not occur.
|
|
198 Instead, fontification occurs when necessary, such as when scrolling
|
|
199 through the buffer would otherwise reveal unfontified areas. This is
|
|
200 useful if buffer fontification is too slow for large buffers.
|
|
201
|
|
202 - Stealthy buffer fontification if `jit-lock-stealth-time' is non-nil.
|
|
203 This means remaining unfontified areas of buffers are fontified if Emacs has
|
|
204 been idle for `jit-lock-stealth-time' seconds, while Emacs remains idle.
|
|
205 This is useful if any buffer has any deferred fontification.
|
|
206
|
53755
|
207 - Deferred context fontification if `jit-lock-contextually' is
|
25003
|
208 non-nil. This means fontification updates the buffer corresponding to
|
53756
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
209 true syntactic context, after `jit-lock-context-time' seconds of Emacs
|
25003
|
210 idle time, while Emacs remains idle. Otherwise, fontification occurs
|
|
211 on modified lines only, and subsequent lines can remain fontified
|
|
212 corresponding to previous syntactic contexts. This is useful where
|
|
213 strings or comments span lines.
|
|
214
|
|
215 Stealth fontification only occurs while the system remains unloaded.
|
|
216 If the system load rises above `jit-lock-stealth-load' percent, stealth
|
|
217 fontification is suspended. Stealth fontification intensity is controlled via
|
29413
|
218 the variable `jit-lock-stealth-nice'."
|
29799
|
219 (setq jit-lock-mode arg)
|
|
220 (cond (;; Turn Just-in-time Lock mode on.
|
|
221 jit-lock-mode
|
25003
|
222
|
41336
|
223 ;; Mark the buffer for refontification.
|
32305
|
224 (jit-lock-refontify)
|
29413
|
225
|
25003
|
226 ;; Install an idle timer for stealth fontification.
|
32181
|
227 (when (and jit-lock-stealth-time (null jit-lock-stealth-timer))
|
29413
|
228 (setq jit-lock-stealth-timer
|
41336
|
229 (run-with-idle-timer jit-lock-stealth-time t
|
25003
|
230 'jit-lock-stealth-fontify)))
|
|
231
|
72508
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
232 ;; Create, but do not activate, the idle timer for repeated
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
233 ;; stealth fontification.
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
234 (when (and jit-lock-stealth-time (null jit-lock-stealth-repeat-timer))
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
235 (setq jit-lock-stealth-repeat-timer (timer-create))
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
236 (timer-set-function jit-lock-stealth-repeat-timer
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
237 'jit-lock-stealth-fontify '(t)))
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
238
|
41336
|
239 ;; Init deferred fontification timer.
|
|
240 (when (and jit-lock-defer-time (null jit-lock-defer-timer))
|
|
241 (setq jit-lock-defer-timer
|
|
242 (run-with-idle-timer jit-lock-defer-time t
|
|
243 'jit-lock-deferred-fontify)))
|
|
244
|
53709
|
245 ;; Initialize contextual fontification if requested.
|
53755
|
246 (when (eq jit-lock-contextually t)
|
53756
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
247 (unless jit-lock-context-timer
|
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
248 (setq jit-lock-context-timer
|
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
249 (run-with-idle-timer jit-lock-context-time t
|
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
250 'jit-lock-context-fontify)))
|
53709
|
251 (setq jit-lock-context-unfontify-pos
|
|
252 (or jit-lock-context-unfontify-pos (point-max))))
|
29799
|
253
|
32305
|
254 ;; Setup our hooks.
|
29799
|
255 (add-hook 'after-change-functions 'jit-lock-after-change nil t)
|
25003
|
256 (add-hook 'fontification-functions 'jit-lock-function))
|
|
257
|
|
258 ;; Turn Just-in-time Lock mode off.
|
|
259 (t
|
41336
|
260 ;; Cancel our idle timers.
|
53756
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
261 (when (and (or jit-lock-stealth-timer jit-lock-defer-timer
|
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
262 jit-lock-context-timer)
|
41336
|
263 ;; Only if there's no other buffer using them.
|
|
264 (not (catch 'found
|
|
265 (dolist (buf (buffer-list))
|
|
266 (with-current-buffer buf
|
|
267 (when jit-lock-mode (throw 'found t)))))))
|
|
268 (when jit-lock-stealth-timer
|
|
269 (cancel-timer jit-lock-stealth-timer)
|
|
270 (setq jit-lock-stealth-timer nil))
|
53756
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
271 (when jit-lock-context-timer
|
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
272 (cancel-timer jit-lock-context-timer)
|
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
273 (setq jit-lock-context-timer nil))
|
41336
|
274 (when jit-lock-defer-timer
|
|
275 (cancel-timer jit-lock-defer-timer)
|
|
276 (setq jit-lock-defer-timer nil)))
|
25003
|
277
|
32305
|
278 ;; Remove hooks.
|
29413
|
279 (remove-hook 'after-change-functions 'jit-lock-after-change t)
|
25003
|
280 (remove-hook 'fontification-functions 'jit-lock-function))))
|
|
281
|
32181
|
282 (defun jit-lock-register (fun &optional contextual)
|
32157
c3d137c056d1
(jit-lock-register, jit-lock-unregister): Docstring fix.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
283 "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>
diff
changeset
|
284 FUN will be called with two arguments START and END indicating the region
|
32181
|
285 that needs to be (re)fontified.
|
|
286 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>
diff
changeset
|
287 (add-hook 'jit-lock-functions fun nil t)
|
53755
|
288 (when (and contextual jit-lock-contextually)
|
|
289 (set (make-local-variable 'jit-lock-contextually) t))
|
32156
b3596a2daf42
(jit-lock-register, jit-lock-unregister): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
290 (jit-lock-mode t))
|
b3596a2daf42
(jit-lock-register, jit-lock-unregister): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
291
|
b3596a2daf42
(jit-lock-register, jit-lock-unregister): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
292 (defun jit-lock-unregister (fun)
|
32157
c3d137c056d1
(jit-lock-register, jit-lock-unregister): Docstring fix.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
293 "Unregister FUN as a fontification function.
|
32156
b3596a2daf42
(jit-lock-register, jit-lock-unregister): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
294 Only applies to the current buffer."
|
b3596a2daf42
(jit-lock-register, jit-lock-unregister): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
295 (remove-hook 'jit-lock-functions fun t)
|
32305
|
296 (unless jit-lock-functions (jit-lock-mode nil)))
|
25003
|
297
|
29413
|
298 ;; This function is used to prevent font-lock-fontify-buffer from
|
|
299 ;; fontifying eagerly the whole buffer. This is important for
|
|
300 ;; things like CWarn mode which adds/removes a few keywords and
|
|
301 ;; does a refontify (which takes ages on large files).
|
32305
|
302 (defun jit-lock-refontify (&optional beg end)
|
|
303 "Force refontification of the region BEG..END (default whole buffer)."
|
29799
|
304 (with-buffer-prepared-for-jit-lock
|
29708
|
305 (save-restriction
|
|
306 (widen)
|
41336
|
307 (put-text-property (or beg (point-min)) (or end (point-max))
|
|
308 'fontified nil))))
|
25003
|
309
|
|
310 ;;; On demand fontification.
|
|
311
|
|
312 (defun jit-lock-function (start)
|
|
313 "Fontify current buffer starting at position START.
|
|
314 This function is added to `fontification-functions' when `jit-lock-mode'
|
|
315 is active."
|
66534
|
316 (when (and jit-lock-mode (not memory-full))
|
69599
0b906e4eb64e
(jit-lock-function): Check for the actual defer-timer rather than just
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
317 (if (null jit-lock-defer-timer)
|
41336
|
318 ;; No deferral.
|
|
319 (jit-lock-fontify-now start (+ start jit-lock-chunk-size))
|
|
320 ;; Record the buffer for later fontification.
|
53709
|
321 (unless (memq (current-buffer) jit-lock-defer-buffers)
|
|
322 (push (current-buffer) jit-lock-defer-buffers))
|
41336
|
323 ;; Mark the area as defer-fontified so that the redisplay engine
|
|
324 ;; is happy and so that the idle timer can find the places to fontify.
|
|
325 (with-buffer-prepared-for-jit-lock
|
|
326 (put-text-property start
|
|
327 (next-single-property-change
|
|
328 start 'fontified nil
|
|
329 (min (point-max) (+ start jit-lock-chunk-size)))
|
|
330 'fontified 'defer)))))
|
32305
|
331
|
|
332 (defun jit-lock-fontify-now (&optional start end)
|
|
333 "Fontify current buffer from START to END.
|
|
334 Defaults to the whole buffer. END can be out of bounds."
|
29799
|
335 (with-buffer-prepared-for-jit-lock
|
28501
|
336 (save-excursion
|
47725
|
337 (unless start (setq start (point-min)))
|
|
338 (setq end (if end (min end (point-max)) (point-max)))
|
|
339 ;; This did bind `font-lock-beginning-of-syntax-function' to
|
|
340 ;; nil at some point, for an unknown reason. Don't do this; it
|
|
341 ;; can make highlighting slow due to expensive calls to
|
|
342 ;; `parse-partial-sexp' in function
|
|
343 ;; `font-lock-fontify-syntactically-region'. Example: paging
|
|
344 ;; from the end of a buffer to its start, can do repeated
|
|
345 ;; `parse-partial-sexp' starting from `point-min', which can
|
|
346 ;; take a long time in a large buffer.
|
72231
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
347 (let ((orig-start start) next)
|
47725
|
348 (save-match-data
|
|
349 ;; Fontify chunks beginning at START. The end of a
|
|
350 ;; chunk is either `end', or the start of a region
|
|
351 ;; before `end' that has already been fontified.
|
73135
|
352 (while (and start (< start end))
|
47725
|
353 ;; Determine the end of this chunk.
|
|
354 (setq next (or (text-property-any start end 'fontified t)
|
|
355 end))
|
25395
|
356
|
47725
|
357 ;; Decide which range of text should be fontified.
|
|
358 ;; The problem is that START and NEXT may be in the
|
|
359 ;; middle of something matched by a font-lock regexp.
|
|
360 ;; Until someone has a better idea, let's start
|
|
361 ;; at the start of the line containing START and
|
|
362 ;; stop at the start of the line following NEXT.
|
|
363 (goto-char next) (setq next (line-beginning-position 2))
|
|
364 (goto-char start) (setq start (line-beginning-position))
|
49597
|
365
|
66151
934d10a9685c
(jit-lock-fontify-now): Move jit-lock-context-unfontify-pos.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
366 ;; Make sure the contextual refontification doesn't re-refontify
|
934d10a9685c
(jit-lock-fontify-now): Move jit-lock-context-unfontify-pos.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
367 ;; what's already been refontified.
|
934d10a9685c
(jit-lock-fontify-now): Move jit-lock-context-unfontify-pos.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
368 (when (and jit-lock-context-unfontify-pos
|
934d10a9685c
(jit-lock-fontify-now): Move jit-lock-context-unfontify-pos.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
369 (< jit-lock-context-unfontify-pos next)
|
66439
52c79134b5d5
(jit-lock-fontify-now): Be careful not to skip multiline
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
370 (>= jit-lock-context-unfontify-pos start)
|
52c79134b5d5
(jit-lock-fontify-now): Be careful not to skip multiline
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
371 ;; Don't move boundary forward if we have to
|
52c79134b5d5
(jit-lock-fontify-now): Be careful not to skip multiline
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
372 ;; refontify previous text. Otherwise, we risk moving
|
52c79134b5d5
(jit-lock-fontify-now): Be careful not to skip multiline
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
373 ;; it past the end of the multiline property and thus
|
52c79134b5d5
(jit-lock-fontify-now): Be careful not to skip multiline
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
374 ;; forget about this multiline region altogether.
|
52c79134b5d5
(jit-lock-fontify-now): Be careful not to skip multiline
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
375 (not (get-text-property start 'jit-lock-defer-multiline)))
|
66151
934d10a9685c
(jit-lock-fontify-now): Move jit-lock-context-unfontify-pos.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
376 (setq jit-lock-context-unfontify-pos next))
|
934d10a9685c
(jit-lock-fontify-now): Move jit-lock-context-unfontify-pos.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
377
|
47725
|
378 ;; Fontify the chunk, and mark it as fontified.
|
|
379 ;; We mark it first, to make sure that we don't indefinitely
|
|
380 ;; re-execute this fontification if an error occurs.
|
|
381 (put-text-property start next 'fontified t)
|
53755
|
382 (condition-case err
|
|
383 (run-hook-with-args 'jit-lock-functions start next)
|
|
384 ;; If the user quits (which shouldn't happen in normal on-the-fly
|
|
385 ;; jit-locking), make sure the fontification will be performed
|
|
386 ;; before displaying the block again.
|
|
387 (quit (put-text-property start next 'fontified nil)
|
|
388 (funcall 'signal (car err) (cdr err))))
|
41336
|
389
|
72231
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
390 ;; The redisplay engine has already rendered the buffer up-to
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
391 ;; `orig-start' and won't notice if the above jit-lock-functions
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
392 ;; changed the appearance of any part of the buffer prior
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
393 ;; to that. So if `start' is before `orig-start', we need to
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
394 ;; cause a new redisplay cycle after this one so that any changes
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
395 ;; are properly reflected on screen.
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
396 ;; To make such repeated redisplay happen less often, we can
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
397 ;; eagerly extend the refontified region with
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
398 ;; jit-lock-after-change-extend-region-functions.
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
399 (when (< start orig-start)
|
73136
db20c4c0a56f
(jit-lock-force-redisplay): Rename from jit-lock-fontify-again.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
400 (run-with-timer 0 nil 'jit-lock-force-redisplay
|
72865
|
401 (current-buffer) start orig-start))
|
72231
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
402
|
47725
|
403 ;; Find the start of the next chunk, if any.
|
|
404 (setq start (text-property-any next end 'fontified nil))))))))
|
25003
|
405
|
73136
db20c4c0a56f
(jit-lock-force-redisplay): Rename from jit-lock-fontify-again.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
406 (defun jit-lock-force-redisplay (buf start end)
|
db20c4c0a56f
(jit-lock-force-redisplay): Rename from jit-lock-fontify-again.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
407 "Force the display engine to re-render buffer BUF from START to END."
|
db20c4c0a56f
(jit-lock-force-redisplay): Rename from jit-lock-fontify-again.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
408 (with-current-buffer buf
|
db20c4c0a56f
(jit-lock-force-redisplay): Rename from jit-lock-fontify-again.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
409 (with-buffer-prepared-for-jit-lock
|
db20c4c0a56f
(jit-lock-force-redisplay): Rename from jit-lock-fontify-again.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
410 ;; Don't cause refontification (it's already been done), but just do
|
db20c4c0a56f
(jit-lock-force-redisplay): Rename from jit-lock-fontify-again.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
411 ;; some random buffer change, so as to force redisplay.
|
73137
|
412 (put-text-property start end 'fontified t))))
|
72865
|
413
|
|
414
|
25003
|
415
|
|
416 ;;; Stealth fontification.
|
|
417
|
|
418 (defsubst jit-lock-stealth-chunk-start (around)
|
|
419 "Return the start of the next chunk to fontify around position AROUND..
|
|
420 Value is nil if there is nothing more to fontify."
|
27537
|
421 (if (zerop (buffer-size))
|
|
422 nil
|
|
423 (save-restriction
|
|
424 (widen)
|
41336
|
425 (let* ((next (text-property-not-all around (point-max) 'fontified t))
|
27537
|
426 (prev (previous-single-property-change around 'fontified))
|
|
427 (prop (get-text-property (max (point-min) (1- around))
|
|
428 'fontified))
|
|
429 (start (cond
|
|
430 ((null prev)
|
|
431 ;; There is no property change between AROUND
|
|
432 ;; and the start of the buffer. If PROP is
|
|
433 ;; non-nil, everything in front of AROUND is
|
|
434 ;; fontified, otherwise nothing is fontified.
|
41336
|
435 (if (eq prop t)
|
27537
|
436 nil
|
|
437 (max (point-min)
|
|
438 (- around (/ jit-lock-chunk-size 2)))))
|
41336
|
439 ((eq prop t)
|
27537
|
440 ;; PREV is the start of a region of fontified
|
29799
|
441 ;; text containing AROUND. Start fontifying a
|
27537
|
442 ;; chunk size before the end of the unfontified
|
|
443 ;; region in front of that.
|
|
444 (max (or (previous-single-property-change prev 'fontified)
|
|
445 (point-min))
|
|
446 (- prev jit-lock-chunk-size)))
|
|
447 (t
|
|
448 ;; PREV is the start of a region of unfontified
|
|
449 ;; text containing AROUND. Start at PREV or
|
|
450 ;; chunk size in front of AROUND, whichever is
|
|
451 ;; nearer.
|
|
452 (max prev (- around jit-lock-chunk-size)))))
|
|
453 (result (cond ((null start) next)
|
|
454 ((null next) start)
|
|
455 ((< (- around start) (- next around)) start)
|
|
456 (t next))))
|
|
457 result))))
|
49597
|
458
|
72508
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
459 (defun jit-lock-stealth-fontify (&optional repeat)
|
25003
|
460 "Fontify buffers stealthily.
|
72508
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
461 This function is called repeatedly after Emacs has become idle for
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
462 `jit-lock-stealth-time' seconds. Optional argument REPEAT is expected
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
463 non-nil in a repeated invocation of this function."
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
464 ;; Cancel timer for repeated invocations.
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
465 (unless repeat
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
466 (cancel-timer jit-lock-stealth-repeat-timer))
|
25003
|
467 (unless (or executing-kbd-macro
|
66534
|
468 memory-full
|
72508
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
469 (window-minibuffer-p (selected-window))
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
470 ;; For first invocation set up `jit-lock-stealth-buffers'.
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
471 ;; In repeated invocations it's already been set up.
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
472 (null (if repeat
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
473 jit-lock-stealth-buffers
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
474 (setq jit-lock-stealth-buffers (buffer-list)))))
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
475 (let ((buffer (car jit-lock-stealth-buffers))
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
476 (delay 0)
|
25003
|
477 minibuffer-auto-raise
|
72508
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
478 message-log-max
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
479 start)
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
480 (if (and jit-lock-stealth-load
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
481 (> (car (load-average)) jit-lock-stealth-load))
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
482 ;; Wait a little if load is too high.
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
483 (setq delay jit-lock-stealth-time)
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
484 (if (buffer-live-p buffer)
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
485 (with-current-buffer buffer
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
486 (if (and jit-lock-mode
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
487 (setq start (jit-lock-stealth-chunk-start (point))))
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
488 ;; Fontify one block of at most `jit-lock-chunk-size'
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
489 ;; characters.
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
490 (with-temp-message (if jit-lock-stealth-verbose
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
491 (concat "JIT stealth lock "
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
492 (buffer-name)))
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
493 (jit-lock-fontify-now start
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
494 (+ start jit-lock-chunk-size))
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
495 ;; Run again after `jit-lock-stealth-nice' seconds.
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
496 (setq delay (or jit-lock-stealth-nice 0)))
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
497 ;; Nothing to fontify here. Remove this buffer from
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
498 ;; `jit-lock-stealth-buffers' and run again immediately.
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
499 (setq jit-lock-stealth-buffers (cdr jit-lock-stealth-buffers))))
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
500 ;; Buffer is no longer live. Remove it from
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
501 ;; `jit-lock-stealth-buffers' and run again immediately.
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
502 (setq jit-lock-stealth-buffers (cdr jit-lock-stealth-buffers))))
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
503 ;; Call us again.
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
504 (when jit-lock-stealth-buffers
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
505 (timer-set-idle-time jit-lock-stealth-repeat-timer (current-idle-time))
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
506 (timer-inc-time jit-lock-stealth-repeat-timer delay)
|
5d642f9eff22
* emacs-lisp/timer.el (timer-set-idle-time, run-with-idle-timer):
Chong Yidong <cyd@stupidchicken.com>
diff
changeset
|
507 (timer-activate-when-idle jit-lock-stealth-repeat-timer t)))))
|
25003
|
508
|
|
509
|
|
510 ;;; Deferred fontification.
|
|
511
|
41336
|
512 (defun jit-lock-deferred-fontify ()
|
|
513 "Fontify what was deferred."
|
66534
|
514 (when (and jit-lock-defer-buffers (not memory-full))
|
41336
|
515 ;; Mark the deferred regions back to `fontified = nil'
|
53709
|
516 (dolist (buffer jit-lock-defer-buffers)
|
41336
|
517 (when (buffer-live-p buffer)
|
|
518 (with-current-buffer buffer
|
|
519 ;; (message "Jit-Defer %s" (buffer-name))
|
|
520 (with-buffer-prepared-for-jit-lock
|
|
521 (let ((pos (point-min)))
|
|
522 (while
|
|
523 (progn
|
|
524 (when (eq (get-text-property pos 'fontified) 'defer)
|
|
525 (put-text-property
|
|
526 pos (setq pos (next-single-property-change
|
|
527 pos 'fontified nil (point-max)))
|
|
528 'fontified nil))
|
|
529 (setq pos (next-single-property-change pos 'fontified)))))))))
|
53709
|
530 (setq jit-lock-defer-buffers nil)
|
41336
|
531 ;; Force fontification of the visible parts.
|
69599
0b906e4eb64e
(jit-lock-function): Check for the actual defer-timer rather than just
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
532 (let ((jit-lock-defer-timer nil))
|
41336
|
533 ;; (message "Jit-Defer Now")
|
|
534 (sit-for 0)
|
|
535 ;; (message "Jit-Defer Done")
|
|
536 )))
|
49597
|
537
|
41336
|
538
|
53756
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
539 (defun jit-lock-context-fontify ()
|
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
540 "Refresh fontification to take new context into account."
|
66534
|
541 (unless memory-full
|
|
542 (dolist (buffer (buffer-list))
|
|
543 (with-current-buffer buffer
|
|
544 (when jit-lock-context-unfontify-pos
|
|
545 ;; (message "Jit-Context %s" (buffer-name))
|
|
546 (save-restriction
|
|
547 (widen)
|
|
548 (when (and (>= jit-lock-context-unfontify-pos (point-min))
|
|
549 (< jit-lock-context-unfontify-pos (point-max)))
|
|
550 ;; If we're in text that matches a complex multi-line
|
|
551 ;; font-lock pattern, make sure the whole text will be
|
|
552 ;; redisplayed eventually.
|
|
553 ;; Despite its name, we treat jit-lock-defer-multiline here
|
|
554 ;; rather than in jit-lock-defer since it has to do with multiple
|
|
555 ;; lines, i.e. with context.
|
|
556 (when (get-text-property jit-lock-context-unfontify-pos
|
|
557 'jit-lock-defer-multiline)
|
|
558 (setq jit-lock-context-unfontify-pos
|
|
559 (or (previous-single-property-change
|
|
560 jit-lock-context-unfontify-pos
|
|
561 'jit-lock-defer-multiline)
|
|
562 (point-min))))
|
|
563 (with-buffer-prepared-for-jit-lock
|
|
564 ;; Force contextual refontification.
|
|
565 (remove-text-properties
|
|
566 jit-lock-context-unfontify-pos (point-max)
|
|
567 '(fontified nil jit-lock-defer-multiline nil)))
|
|
568 (setq jit-lock-context-unfontify-pos (point-max)))))))))
|
53756
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
569
|
72231
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
570 (defvar jit-lock-start) (defvar jit-lock-end) ; Dynamically scoped variables.
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
571 (defvar jit-lock-after-change-extend-region-functions nil
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
572 "Hook that can extend the text to refontify after a change.
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
573 This is run after every buffer change. The functions are called with
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
574 the three arguments of `after-change-functions': START END OLD-LEN.
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
575 The extended region to refontify is returned indirectly by modifying
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
576 the variables `jit-lock-start' and `jit-lock-end'.
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
577
|
72431
f13889b47192
(jit-lock-fontify-now): Protect the modified status of the right buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
578 Note that extending the region this way is not strictly necessary, except
|
f13889b47192
(jit-lock-fontify-now): Protect the modified status of the right buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
579 that the nature of the redisplay code tends to otherwise leave some of
|
f13889b47192
(jit-lock-fontify-now): Protect the modified status of the right buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
580 the rehighlighted text displayed with the old highlight until the next
|
f13889b47192
(jit-lock-fontify-now): Protect the modified status of the right buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
581 redisplay (see comment about repeated redisplay in `jit-lock-fontify-now').")
|
72231
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
582
|
25003
|
583 (defun jit-lock-after-change (start end old-len)
|
|
584 "Mark the rest of the buffer as not fontified after a change.
|
|
585 Installed on `after-change-functions'.
|
|
586 START and END are the start and end of the changed text. OLD-LEN
|
|
587 is the pre-change length.
|
|
588 This function ensures that lines following the change will be refontified
|
|
589 in case the syntax of those lines has changed. Refontification
|
|
590 will take place when text is fontified stealthily."
|
66534
|
591 (when (and jit-lock-mode (not memory-full))
|
72231
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
592 (let ((jit-lock-start start)
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
593 (jit-lock-end end))
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
594 (with-buffer-prepared-for-jit-lock
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
595 (run-hook-with-args 'jit-lock-after-change-extend-region-functions
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
596 start end old-len)
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
597 ;; Make sure we change at least one char (in case of deletions).
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
598 (setq jit-lock-end (min (max jit-lock-end (1+ start)) (point-max)))
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
599 ;; Request refontification.
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
600 (put-text-property jit-lock-start jit-lock-end 'fontified nil))
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
601 ;; Mark the change for deferred contextual refontification.
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
602 (when jit-lock-context-unfontify-pos
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
603 (setq jit-lock-context-unfontify-pos
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
604 ;; Here we use `start' because nothing guarantees that the
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
605 ;; text between start and end will be otherwise refontified:
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
606 ;; usually it will be refontified by virtue of being
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
607 ;; displayed, but if it's outside of any displayed area in the
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
608 ;; buffer, only jit-lock-context-* will re-fontify it.
|
3ca9684795fe
(jit-lock-fontify-now): Cause a second redisplay if needed.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
609 (min jit-lock-context-unfontify-pos jit-lock-start))))))
|
49597
|
610
|
25003
|
611 (provide 'jit-lock)
|
|
612
|
66151
934d10a9685c
(jit-lock-fontify-now): Move jit-lock-context-unfontify-pos.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
613 ;; arch-tag: 56b5de6e-f581-453b-bb97-49c39372ff9e
|
38436
|
614 ;;; jit-lock.el ends here
|