Mercurial > emacs
annotate lisp/jit-lock.el @ 70086:c12e24e779ab
Comment changes.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Tue, 18 Apr 2006 21:05:45 +0000 |
parents | 0b906e4eb64e |
children | 3ca9684795fe e6bf73e43cf4 |
rev | line source |
---|---|
38436
b174db545cfd
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
37781
diff
changeset
|
1 ;;; jit-lock.el --- just-in-time fontification |
25003 | 2 |
64762
41bb365f41c4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64091
diff
changeset
|
3 ;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004, |
68651
3bd95f4f2941
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
67923
diff
changeset
|
4 ;; 2005, 2006 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 | |
13 ;; the Free Software Foundation; either version 2, or (at your option) | |
14 ;; any later version. | |
15 | |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
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 | |
28501
030a9790d290
(with-buffer-unmodified): New macro.
Gerd Moellmann <gerd@gnu.org>
parents:
28208
diff
changeset
|
34 (defmacro with-buffer-unmodified (&rest body) |
030a9790d290
(with-buffer-unmodified): New macro.
Gerd Moellmann <gerd@gnu.org>
parents:
28208
diff
changeset
|
35 "Eval BODY, preserving the current buffer's modified state." |
53756
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53755
diff
changeset
|
36 (declare (debug t)) |
28501
030a9790d290
(with-buffer-unmodified): New macro.
Gerd Moellmann <gerd@gnu.org>
parents:
28208
diff
changeset
|
37 (let ((modified (make-symbol "modified"))) |
030a9790d290
(with-buffer-unmodified): New macro.
Gerd Moellmann <gerd@gnu.org>
parents:
28208
diff
changeset
|
38 `(let ((,modified (buffer-modified-p))) |
32152
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
39 (unwind-protect |
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
40 (progn ,@body) |
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
41 (unless ,modified |
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
42 (restore-buffer-modified-p nil)))))) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47725
diff
changeset
|
43 |
29799
baa52c9029f6
(with-buffer-prepared-for-jit-lock):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29708
diff
changeset
|
44 (defmacro with-buffer-prepared-for-jit-lock (&rest body) |
25003 | 45 "Execute BODY in current buffer, overriding several variables. |
46 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>
parents:
53755
diff
changeset
|
47 (declare (debug t)) |
28521
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
48 `(with-buffer-unmodified |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
49 (let ((buffer-undo-list t) |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
50 (inhibit-read-only t) |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
51 (inhibit-point-motion-hooks t) |
29799
baa52c9029f6
(with-buffer-prepared-for-jit-lock):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29708
diff
changeset
|
52 (inhibit-modification-hooks t) |
28521
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
53 deactivate-mark |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
54 buffer-file-name |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
55 buffer-file-truename) |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
56 ,@body)))) |
28501
030a9790d290
(with-buffer-unmodified): New macro.
Gerd Moellmann <gerd@gnu.org>
parents:
28208
diff
changeset
|
57 |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47725
diff
changeset
|
58 |
25003 | 59 |
60 ;;; Customization. | |
61 | |
53709
f790b749630e
(jit-lock): Move group declaration from font-lock.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
62 (defgroup jit-lock nil |
f790b749630e
(jit-lock): Move group declaration from font-lock.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
63 "Font Lock support mode to fontify just-in-time." |
f790b749630e
(jit-lock): Move group declaration from font-lock.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
64 :version "21.1" |
f790b749630e
(jit-lock): Move group declaration from font-lock.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
65 :group 'font-lock) |
f790b749630e
(jit-lock): Move group declaration from font-lock.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
66 |
25003 | 67 (defcustom jit-lock-chunk-size 500 |
67923
ea28d90f5964
(jit-lock-chunk-size): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
66579
diff
changeset
|
68 "*Jit-lock fontifies chunks of at most this many characters at a time. |
ea28d90f5964
(jit-lock-chunk-size): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
66579
diff
changeset
|
69 |
ea28d90f5964
(jit-lock-chunk-size): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
66579
diff
changeset
|
70 This variable controls both display-time and stealth fontification." |
25003 | 71 :type 'integer |
72 :group 'jit-lock) | |
73 | |
74 | |
61746
86d97731e558
(jit-lock-stealth-time): Change default value to 16.
Eli Zaretskii <eliz@gnu.org>
parents:
60461
diff
changeset
|
75 (defcustom jit-lock-stealth-time 16 |
25003 | 76 "*Time in seconds to wait before beginning stealth fontification. |
77 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
|
78 If nil, stealth fontification is never performed. |
25003 | 79 |
80 The value of this variable is used when JIT Lock mode is turned on." | |
81 :type '(choice (const :tag "never" nil) | |
82 (number :tag "seconds")) | |
83 :group 'jit-lock) | |
84 | |
85 | |
61746
86d97731e558
(jit-lock-stealth-time): Change default value to 16.
Eli Zaretskii <eliz@gnu.org>
parents:
60461
diff
changeset
|
86 (defcustom jit-lock-stealth-nice 0.5 |
25003 | 87 "*Time in seconds to pause between chunks of stealth fontification. |
88 Each iteration of stealth fontification is separated by this amount of time, | |
89 thus reducing the demand that stealth fontification makes on the system. | |
90 If nil, means stealth fontification is never paused. | |
91 To reduce machine load during stealth fontification, at the cost of stealth | |
92 taking longer to fontify, you could increase the value of this variable. | |
93 See also `jit-lock-stealth-load'." | |
94 :type '(choice (const :tag "never" nil) | |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47725
diff
changeset
|
95 (number :tag "seconds")) |
25003 | 96 :group 'jit-lock) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47725
diff
changeset
|
97 |
25003 | 98 |
99 (defcustom jit-lock-stealth-load | |
100 (if (condition-case nil (load-average) (error)) 200) | |
101 "*Load in percentage above which stealth fontification is suspended. | |
102 Stealth fontification pauses when the system short-term load average (as | |
103 returned by the function `load-average' if supported) goes above this level, | |
104 thus reducing the demand that stealth fontification makes on the system. | |
105 If nil, means stealth fontification is never suspended. | |
106 To reduce machine load during stealth fontification, at the cost of stealth | |
107 taking longer to fontify, you could reduce the value of this variable. | |
108 See also `jit-lock-stealth-nice'." | |
109 :type (if (condition-case nil (load-average) (error)) | |
110 '(choice (const :tag "never" nil) | |
111 (integer :tag "load")) | |
112 '(const :format "%t: unsupported\n" nil)) | |
113 :group 'jit-lock) | |
114 | |
115 | |
116 (defcustom jit-lock-stealth-verbose nil | |
117 "*If non-nil, means stealth fontification should show status messages." | |
118 :type 'boolean | |
119 :group 'jit-lock) | |
120 | |
121 | |
53755
9bd36e762e48
(jit-lock-stealth-fontify): Allow quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53709
diff
changeset
|
122 (defvaralias 'jit-lock-defer-contextually 'jit-lock-contextually) |
9bd36e762e48
(jit-lock-stealth-fontify): Allow quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53709
diff
changeset
|
123 (defcustom jit-lock-contextually 'syntax-driven |
9bd36e762e48
(jit-lock-stealth-fontify): Allow quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53709
diff
changeset
|
124 "*If non-nil, means fontification should be syntactically true. |
9bd36e762e48
(jit-lock-stealth-fontify): Allow quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53709
diff
changeset
|
125 If nil, means fontification occurs only on those lines modified. This |
25003 | 126 means where modification on a line causes syntactic change on subsequent lines, |
127 those subsequent lines are not refontified to reflect their new context. | |
53755
9bd36e762e48
(jit-lock-stealth-fontify): Allow quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53709
diff
changeset
|
128 If t, means fontification occurs on those lines modified and all |
25003 | 129 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>
parents:
53755
diff
changeset
|
130 their new syntactic context, after `jit-lock-context-time' seconds. |
53755
9bd36e762e48
(jit-lock-stealth-fontify): Allow quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53709
diff
changeset
|
131 If any other value, e.g., `syntax-driven', means syntactically true |
25003 | 132 fontification occurs only if syntactic fontification is performed using the |
133 buffer mode's syntax table, i.e., only if `font-lock-keywords-only' is nil. | |
134 | |
135 The value of this variable is used when JIT Lock mode is turned on." | |
136 :type '(choice (const :tag "never" nil) | |
137 (const :tag "always" t) | |
138 (other :tag "syntax-driven" syntax-driven)) | |
139 :group 'jit-lock) | |
140 | |
53756
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53755
diff
changeset
|
141 (defcustom jit-lock-context-time 0.5 |
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53755
diff
changeset
|
142 "Idle time after which text is contextually refontified, if applicable." |
62531
c905fcf5e3d9
Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents:
61746
diff
changeset
|
143 :type '(number :tag "seconds") |
c905fcf5e3d9
Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents:
61746
diff
changeset
|
144 :group 'jit-lock) |
c905fcf5e3d9
Specify missing group (and type, if simple) in defcustom.
Juanma Barranquero <lekktu@gmail.com>
parents:
61746
diff
changeset
|
145 |
41502
828432e1e1d4
Modify a commented-out non-nil value of jit-lock-defer-time, to
Eli Zaretskii <eliz@gnu.org>
parents:
41336
diff
changeset
|
146 (defcustom jit-lock-defer-time nil ;; 0.25 |
41336
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
147 "Idle time after which deferred fontification should take place. |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
148 If nil, fontification is not deferred." |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
149 :group 'jit-lock |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
150 :type '(choice (const :tag "never" nil) |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
151 (number :tag "seconds"))) |
25003 | 152 |
153 ;;; Variables that are not customizable. | |
154 | |
155 (defvar jit-lock-mode nil | |
156 "Non-nil means Just-in-time Lock mode is active.") | |
157 (make-variable-buffer-local 'jit-lock-mode) | |
158 | |
32152
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
159 (defvar jit-lock-functions nil |
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
160 "Functions to do the actual fontification. |
00f38571e2b1
(with-buffer-unmodified): Use unwind-protect.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29827
diff
changeset
|
161 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
|
162 (make-variable-buffer-local 'jit-lock-functions) |
25003 | 163 |
53709
f790b749630e
(jit-lock): Move group declaration from font-lock.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
164 (defvar jit-lock-context-unfontify-pos nil |
32305
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
165 "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
|
166 If nil, contextual fontification is disabled.") |
53709
f790b749630e
(jit-lock): Move group declaration from font-lock.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
167 (make-variable-buffer-local 'jit-lock-context-unfontify-pos) |
25003 | 168 |
169 | |
170 (defvar jit-lock-stealth-timer nil | |
171 "Timer for 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>
parents:
53755
diff
changeset
|
172 (defvar jit-lock-context-timer nil |
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53755
diff
changeset
|
173 "Timer for context fontification in Just-in-time Lock mode.") |
41336
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
174 (defvar jit-lock-defer-timer nil |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
175 "Timer for deferred fontification in Just-in-time Lock mode.") |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
176 |
53709
f790b749630e
(jit-lock): Move group declaration from font-lock.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
177 (defvar jit-lock-defer-buffers nil |
41336
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
178 "List of buffers with pending deferred fontification.") |
25003 | 179 |
180 ;;; JIT lock mode | |
181 | |
182 (defun jit-lock-mode (arg) | |
183 "Toggle Just-in-time Lock mode. | |
29799
baa52c9029f6
(with-buffer-prepared-for-jit-lock):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29708
diff
changeset
|
184 Turn Just-in-time Lock mode on if and only if ARG is non-nil. |
25003 | 185 Enable it automatically by customizing group `font-lock'. |
186 | |
187 When Just-in-time Lock mode is enabled, fontification is different in the | |
188 following ways: | |
189 | |
190 - Demand-driven buffer fontification triggered by Emacs C code. | |
191 This means initial fontification of the whole buffer does not occur. | |
192 Instead, fontification occurs when necessary, such as when scrolling | |
193 through the buffer would otherwise reveal unfontified areas. This is | |
194 useful if buffer fontification is too slow for large buffers. | |
195 | |
196 - Stealthy buffer fontification if `jit-lock-stealth-time' is non-nil. | |
197 This means remaining unfontified areas of buffers are fontified if Emacs has | |
198 been idle for `jit-lock-stealth-time' seconds, while Emacs remains idle. | |
199 This is useful if any buffer has any deferred fontification. | |
200 | |
53755
9bd36e762e48
(jit-lock-stealth-fontify): Allow quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53709
diff
changeset
|
201 - Deferred context fontification if `jit-lock-contextually' is |
25003 | 202 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>
parents:
53755
diff
changeset
|
203 true syntactic context, after `jit-lock-context-time' seconds of Emacs |
25003 | 204 idle time, while Emacs remains idle. Otherwise, fontification occurs |
205 on modified lines only, and subsequent lines can remain fontified | |
206 corresponding to previous syntactic contexts. This is useful where | |
207 strings or comments span lines. | |
208 | |
209 Stealth fontification only occurs while the system remains unloaded. | |
210 If the system load rises above `jit-lock-stealth-load' percent, stealth | |
211 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
|
212 the variable `jit-lock-stealth-nice'." |
29799
baa52c9029f6
(with-buffer-prepared-for-jit-lock):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29708
diff
changeset
|
213 (setq jit-lock-mode arg) |
baa52c9029f6
(with-buffer-prepared-for-jit-lock):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29708
diff
changeset
|
214 (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
|
215 jit-lock-mode |
25003 | 216 |
41336
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
217 ;; Mark the buffer for refontification. |
32305
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
218 (jit-lock-refontify) |
29413
ce16b083b459
(jit-lock-saved-fontify-buffer-function): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29288
diff
changeset
|
219 |
25003 | 220 ;; 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
|
221 (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
|
222 (setq jit-lock-stealth-timer |
41336
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
223 (run-with-idle-timer jit-lock-stealth-time t |
25003 | 224 'jit-lock-stealth-fontify))) |
225 | |
41336
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
226 ;; Init deferred fontification timer. |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
227 (when (and jit-lock-defer-time (null jit-lock-defer-timer)) |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
228 (setq jit-lock-defer-timer |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
229 (run-with-idle-timer jit-lock-defer-time t |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
230 'jit-lock-deferred-fontify))) |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
231 |
53709
f790b749630e
(jit-lock): Move group declaration from font-lock.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
232 ;; Initialize contextual fontification if requested. |
53755
9bd36e762e48
(jit-lock-stealth-fontify): Allow quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53709
diff
changeset
|
233 (when (eq jit-lock-contextually t) |
53756
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53755
diff
changeset
|
234 (unless jit-lock-context-timer |
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53755
diff
changeset
|
235 (setq jit-lock-context-timer |
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53755
diff
changeset
|
236 (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>
parents:
53755
diff
changeset
|
237 'jit-lock-context-fontify))) |
53709
f790b749630e
(jit-lock): Move group declaration from font-lock.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
238 (setq jit-lock-context-unfontify-pos |
f790b749630e
(jit-lock): Move group declaration from font-lock.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
239 (or jit-lock-context-unfontify-pos (point-max)))) |
29799
baa52c9029f6
(with-buffer-prepared-for-jit-lock):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29708
diff
changeset
|
240 |
32305
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
241 ;; Setup our hooks. |
29799
baa52c9029f6
(with-buffer-prepared-for-jit-lock):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29708
diff
changeset
|
242 (add-hook 'after-change-functions 'jit-lock-after-change nil t) |
25003 | 243 (add-hook 'fontification-functions 'jit-lock-function)) |
244 | |
245 ;; Turn Just-in-time Lock mode off. | |
246 (t | |
41336
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
247 ;; Cancel our idle timers. |
53756
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53755
diff
changeset
|
248 (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>
parents:
53755
diff
changeset
|
249 jit-lock-context-timer) |
41336
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
250 ;; Only if there's no other buffer using them. |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
251 (not (catch 'found |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
252 (dolist (buf (buffer-list)) |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
253 (with-current-buffer buf |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
254 (when jit-lock-mode (throw 'found t))))))) |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
255 (when jit-lock-stealth-timer |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
256 (cancel-timer jit-lock-stealth-timer) |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
257 (setq jit-lock-stealth-timer nil)) |
53756
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53755
diff
changeset
|
258 (when jit-lock-context-timer |
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53755
diff
changeset
|
259 (cancel-timer jit-lock-context-timer) |
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53755
diff
changeset
|
260 (setq jit-lock-context-timer nil)) |
41336
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
261 (when jit-lock-defer-timer |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
262 (cancel-timer jit-lock-defer-timer) |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
263 (setq jit-lock-defer-timer nil))) |
25003 | 264 |
32305
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
265 ;; Remove hooks. |
29413
ce16b083b459
(jit-lock-saved-fontify-buffer-function): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29288
diff
changeset
|
266 (remove-hook 'after-change-functions 'jit-lock-after-change t) |
25003 | 267 (remove-hook 'fontification-functions 'jit-lock-function)))) |
268 | |
32181
f3afd1ff75a8
(jit-lock-mode): Use jit-lock-defer-contextually
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32157
diff
changeset
|
269 (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
|
270 "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
|
271 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
|
272 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
|
273 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
|
274 (add-hook 'jit-lock-functions fun nil t) |
53755
9bd36e762e48
(jit-lock-stealth-fontify): Allow quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53709
diff
changeset
|
275 (when (and contextual jit-lock-contextually) |
9bd36e762e48
(jit-lock-stealth-fontify): Allow quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53709
diff
changeset
|
276 (set (make-local-variable 'jit-lock-contextually) t)) |
32156
b3596a2daf42
(jit-lock-register, jit-lock-unregister): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32152
diff
changeset
|
277 (jit-lock-mode t)) |
b3596a2daf42
(jit-lock-register, jit-lock-unregister): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32152
diff
changeset
|
278 |
b3596a2daf42
(jit-lock-register, jit-lock-unregister): New functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32152
diff
changeset
|
279 (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
|
280 "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
|
281 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
|
282 (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
|
283 (unless jit-lock-functions (jit-lock-mode nil))) |
25003 | 284 |
29413
ce16b083b459
(jit-lock-saved-fontify-buffer-function): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29288
diff
changeset
|
285 ;; 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
|
286 ;; 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
|
287 ;; 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
|
288 ;; 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
|
289 (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
|
290 "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
|
291 (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
|
292 (save-restriction |
f37b857741b1
(jit-lock-mode): Force jit-refontify when turned on.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29413
diff
changeset
|
293 (widen) |
41336
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
294 (put-text-property (or beg (point-min)) (or end (point-max)) |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
295 'fontified nil)))) |
25003 | 296 |
297 ;;; On demand fontification. | |
298 | |
299 (defun jit-lock-function (start) | |
300 "Fontify current buffer starting at position START. | |
301 This function is added to `fontification-functions' when `jit-lock-mode' | |
302 is active." | |
66534
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
303 (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>
parents:
69499
diff
changeset
|
304 (if (null jit-lock-defer-timer) |
41336
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
305 ;; No deferral. |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
306 (jit-lock-fontify-now start (+ start jit-lock-chunk-size)) |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
307 ;; Record the buffer for later fontification. |
53709
f790b749630e
(jit-lock): Move group declaration from font-lock.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
308 (unless (memq (current-buffer) jit-lock-defer-buffers) |
f790b749630e
(jit-lock): Move group declaration from font-lock.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
309 (push (current-buffer) jit-lock-defer-buffers)) |
41336
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
310 ;; Mark the area as defer-fontified so that the redisplay engine |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
311 ;; is happy and so that the idle timer can find the places to fontify. |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
312 (with-buffer-prepared-for-jit-lock |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
313 (put-text-property start |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
314 (next-single-property-change |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
315 start 'fontified nil |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
316 (min (point-max) (+ start jit-lock-chunk-size))) |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
317 'fontified 'defer))))) |
32305
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
318 |
ca771411a7fd
Don't require font-lock any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32181
diff
changeset
|
319 (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
|
320 "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
|
321 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
|
322 (with-buffer-prepared-for-jit-lock |
28501
030a9790d290
(with-buffer-unmodified): New macro.
Gerd Moellmann <gerd@gnu.org>
parents:
28208
diff
changeset
|
323 (save-excursion |
47725
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
324 (unless start (setq start (point-min))) |
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
325 (setq end (if end (min end (point-max)) (point-max))) |
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
326 ;; This did bind `font-lock-beginning-of-syntax-function' to |
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
327 ;; nil at some point, for an unknown reason. Don't do this; it |
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
328 ;; can make highlighting slow due to expensive calls to |
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
329 ;; `parse-partial-sexp' in function |
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
330 ;; `font-lock-fontify-syntactically-region'. Example: paging |
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
331 ;; from the end of a buffer to its start, can do repeated |
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
332 ;; `parse-partial-sexp' starting from `point-min', which can |
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
333 ;; take a long time in a large buffer. |
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
334 (let (next) |
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
335 (save-match-data |
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
336 ;; Fontify chunks beginning at START. The end of a |
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
337 ;; chunk is either `end', or the start of a region |
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
338 ;; before `end' that has already been fontified. |
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
339 (while start |
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
340 ;; Determine the end of this chunk. |
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
341 (setq next (or (text-property-any start end 'fontified t) |
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
342 end)) |
25395
9d8fff117316
(jit-lock-function): Extend the fontified range
Gerd Moellmann <gerd@gnu.org>
parents:
25341
diff
changeset
|
343 |
47725
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
344 ;; Decide which range of text should be fontified. |
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
345 ;; The problem is that START and NEXT may be in the |
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
346 ;; middle of something matched by a font-lock regexp. |
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
347 ;; Until someone has a better idea, let's start |
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
348 ;; at the start of the line containing START and |
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
349 ;; stop at the start of the line following NEXT. |
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
350 (goto-char next) (setq next (line-beginning-position 2)) |
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
351 (goto-char start) (setq start (line-beginning-position)) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47725
diff
changeset
|
352 |
66151
934d10a9685c
(jit-lock-fontify-now): Move jit-lock-context-unfontify-pos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
353 ;; 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>
parents:
64762
diff
changeset
|
354 ;; what's already been refontified. |
934d10a9685c
(jit-lock-fontify-now): Move jit-lock-context-unfontify-pos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
355 (when (and jit-lock-context-unfontify-pos |
934d10a9685c
(jit-lock-fontify-now): Move jit-lock-context-unfontify-pos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
356 (< jit-lock-context-unfontify-pos next) |
66439
52c79134b5d5
(jit-lock-fontify-now): Be careful not to skip multiline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66156
diff
changeset
|
357 (>= jit-lock-context-unfontify-pos start) |
52c79134b5d5
(jit-lock-fontify-now): Be careful not to skip multiline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66156
diff
changeset
|
358 ;; 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>
parents:
66156
diff
changeset
|
359 ;; refontify previous text. Otherwise, we risk moving |
52c79134b5d5
(jit-lock-fontify-now): Be careful not to skip multiline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66156
diff
changeset
|
360 ;; 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>
parents:
66156
diff
changeset
|
361 ;; forget about this multiline region altogether. |
52c79134b5d5
(jit-lock-fontify-now): Be careful not to skip multiline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66156
diff
changeset
|
362 (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>
parents:
64762
diff
changeset
|
363 (setq jit-lock-context-unfontify-pos next)) |
934d10a9685c
(jit-lock-fontify-now): Move jit-lock-context-unfontify-pos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
364 |
47725
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
365 ;; Fontify the chunk, and mark it as fontified. |
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
366 ;; We mark it first, to make sure that we don't indefinitely |
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
367 ;; re-execute this fontification if an error occurs. |
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
368 (put-text-property start next 'fontified t) |
53755
9bd36e762e48
(jit-lock-stealth-fontify): Allow quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53709
diff
changeset
|
369 (condition-case err |
9bd36e762e48
(jit-lock-stealth-fontify): Allow quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53709
diff
changeset
|
370 (run-hook-with-args 'jit-lock-functions start next) |
9bd36e762e48
(jit-lock-stealth-fontify): Allow quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53709
diff
changeset
|
371 ;; If the user quits (which shouldn't happen in normal on-the-fly |
9bd36e762e48
(jit-lock-stealth-fontify): Allow quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53709
diff
changeset
|
372 ;; jit-locking), make sure the fontification will be performed |
9bd36e762e48
(jit-lock-stealth-fontify): Allow quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53709
diff
changeset
|
373 ;; before displaying the block again. |
9bd36e762e48
(jit-lock-stealth-fontify): Allow quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53709
diff
changeset
|
374 (quit (put-text-property start next 'fontified nil) |
9bd36e762e48
(jit-lock-stealth-fontify): Allow quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53709
diff
changeset
|
375 (funcall 'signal (car err) (cdr err)))) |
41336
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
376 |
47725
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
377 ;; Find the start of the next chunk, if any. |
2cf6194833de
(jit-lock-fontify-now): Don't widen.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41502
diff
changeset
|
378 (setq start (text-property-any next end 'fontified nil)))))))) |
25003 | 379 |
380 | |
381 ;;; Stealth fontification. | |
382 | |
383 (defsubst jit-lock-stealth-chunk-start (around) | |
384 "Return the start of the next chunk to fontify around position AROUND.. | |
385 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
|
386 (if (zerop (buffer-size)) |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
387 nil |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
388 (save-restriction |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
389 (widen) |
41336
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
390 (let* ((next (text-property-not-all around (point-max) 'fontified t)) |
27537
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
391 (prev (previous-single-property-change around 'fontified)) |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
392 (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
|
393 'fontified)) |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
394 (start (cond |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
395 ((null prev) |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
396 ;; There is no property change between AROUND |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
397 ;; 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
|
398 ;; 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
|
399 ;; fontified, otherwise nothing is fontified. |
41336
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
400 (if (eq prop t) |
27537
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
401 nil |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
402 (max (point-min) |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
403 (- around (/ jit-lock-chunk-size 2))))) |
41336
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
404 ((eq prop t) |
27537
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
405 ;; 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
|
406 ;; text containing AROUND. Start fontifying a |
27537
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
407 ;; 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
|
408 ;; region in front of that. |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
409 (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
|
410 (point-min)) |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
411 (- prev jit-lock-chunk-size))) |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
412 (t |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
413 ;; 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
|
414 ;; text containing AROUND. Start at PREV or |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
415 ;; 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
|
416 ;; nearer. |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
417 (max prev (- around jit-lock-chunk-size))))) |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
418 (result (cond ((null start) next) |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
419 ((null next) start) |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
420 ((< (- around start) (- next around)) start) |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
421 (t next)))) |
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
422 result)))) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47725
diff
changeset
|
423 |
25003 | 424 |
425 (defun jit-lock-stealth-fontify () | |
426 "Fontify buffers stealthily. | |
427 This functions is called after Emacs has been idle for | |
428 `jit-lock-stealth-time' seconds." | |
41336
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
429 ;; I used to check `inhibit-read-only' here, but I can't remember why. -stef |
25003 | 430 (unless (or executing-kbd-macro |
66534
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
431 memory-full |
25003 | 432 (window-minibuffer-p (selected-window))) |
433 (let ((buffers (buffer-list)) | |
60461
f31205c87d5e
(jit-lock-stealth-fontify): When calling sit-for,
Richard M. Stallman <rms@gnu.org>
parents:
54551
diff
changeset
|
434 (outer-buffer (current-buffer)) |
25003 | 435 minibuffer-auto-raise |
436 message-log-max) | |
53755
9bd36e762e48
(jit-lock-stealth-fontify): Allow quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53709
diff
changeset
|
437 (with-local-quit |
9bd36e762e48
(jit-lock-stealth-fontify): Allow quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53709
diff
changeset
|
438 (while (and buffers (not (input-pending-p))) |
9bd36e762e48
(jit-lock-stealth-fontify): Allow quit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53709
diff
changeset
|
439 (with-current-buffer (pop buffers) |
25003 | 440 (when jit-lock-mode |
441 ;; This is funny. Calling sit-for with 3rd arg non-nil | |
442 ;; so that it doesn't redisplay, internally calls | |
443 ;; wait_reading_process_input also with a parameter | |
444 ;; saying "don't redisplay." Since this function here | |
445 ;; is called periodically, this effectively leads to | |
446 ;; process output not being redisplayed at all because | |
447 ;; redisplay_internal is never called. (That didn't | |
448 ;; work in the old redisplay either.) So, we learn that | |
449 ;; we mustn't call sit-for that way here. But then, we | |
450 ;; have to be cautious not to call sit-for in a widened | |
451 ;; buffer, since this could display hidden parts of that | |
452 ;; buffer. This explains the seemingly weird use of | |
453 ;; save-restriction/widen here. | |
454 | |
455 (with-temp-message (if jit-lock-stealth-verbose | |
456 (concat "JIT stealth lock " | |
457 (buffer-name))) | |
27537
d04b7ce72b4a
(jit-lock-function): Widen before calculating end
Gerd Moellmann <gerd@gnu.org>
parents:
25395
diff
changeset
|
458 |
28521
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
459 ;; In the following code, the `sit-for' calls cause a |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
460 ;; redisplay, so it's required that the |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
461 ;; buffer-modified flag of a buffer that is displayed |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
462 ;; has the right value---otherwise the mode line of |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
463 ;; an unmodified buffer would show a `*'. |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
464 (let (start |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
465 (nice (or jit-lock-stealth-nice 0)) |
41336
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
466 (point (point-min))) |
28521
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
467 (while (and (setq start |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
468 (jit-lock-stealth-chunk-start point)) |
60461
f31205c87d5e
(jit-lock-stealth-fontify): When calling sit-for,
Richard M. Stallman <rms@gnu.org>
parents:
54551
diff
changeset
|
469 ;; In case sit-for runs any timers, |
f31205c87d5e
(jit-lock-stealth-fontify): When calling sit-for,
Richard M. Stallman <rms@gnu.org>
parents:
54551
diff
changeset
|
470 ;; give them the expected current buffer. |
f31205c87d5e
(jit-lock-stealth-fontify): When calling sit-for,
Richard M. Stallman <rms@gnu.org>
parents:
54551
diff
changeset
|
471 (with-current-buffer outer-buffer |
f31205c87d5e
(jit-lock-stealth-fontify): When calling sit-for,
Richard M. Stallman <rms@gnu.org>
parents:
54551
diff
changeset
|
472 (sit-for nice))) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47725
diff
changeset
|
473 |
41336
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
474 ;; fontify a block. |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
475 (jit-lock-fontify-now start (+ start jit-lock-chunk-size)) |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
476 ;; If stealth jit-locking is done backwards, this leads to |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
477 ;; excessive O(n^2) refontification. -stef |
53709
f790b749630e
(jit-lock): Move group declaration from font-lock.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
478 ;; (when (>= jit-lock-context-unfontify-pos start) |
f790b749630e
(jit-lock): Move group declaration from font-lock.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
479 ;; (setq jit-lock-context-unfontify-pos end)) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47725
diff
changeset
|
480 |
28521
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
481 ;; Wait a little if load is too high. |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
482 (when (and jit-lock-stealth-load |
73d4caf44d53
(with-buffer-unmodified): Use
Gerd Moellmann <gerd@gnu.org>
parents:
28501
diff
changeset
|
483 (> (car (load-average)) jit-lock-stealth-load)) |
60461
f31205c87d5e
(jit-lock-stealth-fontify): When calling sit-for,
Richard M. Stallman <rms@gnu.org>
parents:
54551
diff
changeset
|
484 ;; In case sit-for runs any timers, |
f31205c87d5e
(jit-lock-stealth-fontify): When calling sit-for,
Richard M. Stallman <rms@gnu.org>
parents:
54551
diff
changeset
|
485 ;; give them the expected current buffer. |
f31205c87d5e
(jit-lock-stealth-fontify): When calling sit-for,
Richard M. Stallman <rms@gnu.org>
parents:
54551
diff
changeset
|
486 (with-current-buffer outer-buffer |
f31205c87d5e
(jit-lock-stealth-fontify): When calling sit-for,
Richard M. Stallman <rms@gnu.org>
parents:
54551
diff
changeset
|
487 (sit-for (or jit-lock-stealth-time 30)))))))))))))) |
25003 | 488 |
489 | |
490 | |
491 ;;; Deferred fontification. | |
492 | |
41336
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
493 (defun jit-lock-deferred-fontify () |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
494 "Fontify what was deferred." |
66534
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
495 (when (and jit-lock-defer-buffers (not memory-full)) |
41336
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
496 ;; Mark the deferred regions back to `fontified = nil' |
53709
f790b749630e
(jit-lock): Move group declaration from font-lock.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
497 (dolist (buffer jit-lock-defer-buffers) |
41336
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
498 (when (buffer-live-p buffer) |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
499 (with-current-buffer buffer |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
500 ;; (message "Jit-Defer %s" (buffer-name)) |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
501 (with-buffer-prepared-for-jit-lock |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
502 (let ((pos (point-min))) |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
503 (while |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
504 (progn |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
505 (when (eq (get-text-property pos 'fontified) 'defer) |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
506 (put-text-property |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
507 pos (setq pos (next-single-property-change |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
508 pos 'fontified nil (point-max))) |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
509 'fontified nil)) |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
510 (setq pos (next-single-property-change pos 'fontified))))))))) |
53709
f790b749630e
(jit-lock): Move group declaration from font-lock.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
511 (setq jit-lock-defer-buffers nil) |
41336
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
512 ;; 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>
parents:
69499
diff
changeset
|
513 (let ((jit-lock-defer-timer nil)) |
41336
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
514 ;; (message "Jit-Defer Now") |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
515 (sit-for 0) |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
516 ;; (message "Jit-Defer Done") |
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
517 ))) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47725
diff
changeset
|
518 |
41336
36e754afaf7a
(jit-lock-defer-time): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38436
diff
changeset
|
519 |
53756
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53755
diff
changeset
|
520 (defun jit-lock-context-fontify () |
bbadbe04fc3d
(jit-lock-context-time, jit-lock-context-timer): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
53755
diff
changeset
|
521 "Refresh fontification to take new context into account." |
66534
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
522 (unless memory-full |
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
523 (dolist (buffer (buffer-list)) |
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
524 (with-current-buffer buffer |
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
525 (when jit-lock-context-unfontify-pos |
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
526 ;; (message "Jit-Context %s" (buffer-name)) |
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
527 (save-restriction |
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
528 (widen) |
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
529 (when (and (>= jit-lock-context-unfontify-pos (point-min)) |
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
530 (< jit-lock-context-unfontify-pos (point-max))) |
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
531 ;; If we're in text that matches a complex multi-line |
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
532 ;; font-lock pattern, make sure the whole text will be |
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
533 ;; redisplayed eventually. |
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
534 ;; Despite its name, we treat jit-lock-defer-multiline here |
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
535 ;; rather than in jit-lock-defer since it has to do with multiple |
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
536 ;; lines, i.e. with context. |
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
537 (when (get-text-property jit-lock-context-unfontify-pos |
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
538 'jit-lock-defer-multiline) |
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
539 (setq jit-lock-context-unfontify-pos |
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
540 (or (previous-single-property-change |
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
541 jit-lock-context-unfontify-pos |
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
542 'jit-lock-defer-multiline) |
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
543 (point-min)))) |
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
544 (with-buffer-prepared-for-jit-lock |
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
545 ;; Force contextual refontification. |
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
546 (remove-text-properties |
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
547 jit-lock-context-unfontify-pos (point-max) |
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
548 '(fontified nil jit-lock-defer-multiline nil))) |
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
549 (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>
parents:
53755
diff
changeset
|
550 |
25003 | 551 (defun jit-lock-after-change (start end old-len) |
552 "Mark the rest of the buffer as not fontified after a change. | |
553 Installed on `after-change-functions'. | |
554 START and END are the start and end of the changed text. OLD-LEN | |
555 is the pre-change length. | |
556 This function ensures that lines following the change will be refontified | |
557 in case the syntax of those lines has changed. Refontification | |
558 will take place when text is fontified stealthily." | |
66534
364aad458607
(jit-lock-function, jit-lock-stealth-fontify)
Richard M. Stallman <rms@gnu.org>
parents:
66439
diff
changeset
|
559 (when (and jit-lock-mode (not memory-full)) |
69468
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
560 (let ((region (font-lock-extend-region start end old-len))) |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
561 (save-excursion |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
562 (with-buffer-prepared-for-jit-lock |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
563 ;; It's important that the `fontified' property be set from the |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
564 ;; beginning of the line, else font-lock will properly change the |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
565 ;; text's face, but the display will have been done already and will |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
566 ;; be inconsistent with the buffer's content. |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
567 ;; |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
568 ;; FIXME!!! (Alan Mackenzie, 2006-03-14): If start isn't at a BOL, |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
569 ;; expanding the region to BOL might mis-fontify, should the BOL not |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
570 ;; be at a "safe" position. |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
571 (setq start (if region |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
572 (car region) |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
573 (goto-char start) |
69499
caf8f09897bc
* font-lock.el (font-lock-lines-before): Delete variable, subsumed by
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69468
diff
changeset
|
574 (line-beginning-position))) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47725
diff
changeset
|
575 |
69468
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
576 ;; If we're in text that matches a multi-line font-lock pattern, |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
577 ;; make sure the whole text will be redisplayed. |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
578 ;; I'm not sure this is ever necessary and/or sufficient. -stef |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
579 (when (get-text-property start 'font-lock-multiline) |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
580 (setq start (or (previous-single-property-change |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
581 start 'font-lock-multiline) |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
582 (point-min)))) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47725
diff
changeset
|
583 |
69468
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
584 (if region (setq end (cdr region))) |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
585 ;; Make sure we change at least one char (in case of deletions). |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
586 (setq end (min (max end (1+ start)) (point-max))) |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
587 ;; Request refontification. |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
588 (put-text-property start end 'fontified nil)) |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
589 ;; Mark the change for deferred contextual refontification. |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
590 (when jit-lock-context-unfontify-pos |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
591 (setq jit-lock-context-unfontify-pos |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
592 ;; Here we use `start' because nothing guarantees that the |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
593 ;; text between start and end will be otherwise refontified: |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
594 ;; usually it will be refontified by virtue of being |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
595 ;; displayed, but if it's outside of any displayed area in the |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
596 ;; buffer, only jit-lock-context-* will re-fontify it. |
0c2790d73955
* font-core.el: New function/variable
Alan Mackenzie <acm@muc.de>
parents:
68651
diff
changeset
|
597 (min jit-lock-context-unfontify-pos start))))))) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47725
diff
changeset
|
598 |
25003 | 599 (provide 'jit-lock) |
600 | |
66151
934d10a9685c
(jit-lock-fontify-now): Move jit-lock-context-unfontify-pos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64762
diff
changeset
|
601 ;; arch-tag: 56b5de6e-f581-453b-bb97-49c39372ff9e |
38436
b174db545cfd
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
37781
diff
changeset
|
602 ;;; jit-lock.el ends here |