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