22957
|
1 ;;; hilit-chg.el --- minor mode displaying buffer changes with special face
|
|
2
|
64762
|
3 ;; Copyright (C) 1998, 2000, 2002, 2003, 2004,
|
68651
|
4 ;; 2005, 2006 Free Software Foundation, Inc.
|
22957
|
5
|
23614
|
6 ;; Author: Richard Sharman <rsharman@pobox.com>
|
22957
|
7 ;; Keywords: faces
|
|
8
|
23101
|
9 ;; This file is part of GNU Emacs.
|
|
10
|
38401
|
11 ;; GNU Emacs is free software; you can redistribute it and/or modify
|
22957
|
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
|
38401
|
16 ;; GNU Emacs is distributed in the hope that it will be useful,
|
22957
|
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.
|
22957
|
25
|
|
26 ;;; Commentary:
|
|
27
|
|
28 ;; A minor mode: "Highlight Changes mode".
|
|
29 ;;
|
|
30
|
|
31 ;; Highlight Changes mode has 2 submodes: active and passive.
|
|
32 ;; When active, changes to the buffer are displayed in a different face.
|
|
33 ;; When passive, any existing displayed changes are saved and new ones
|
|
34 ;; recorded but are not displayed differently.
|
|
35 ;; Why active and passive? Having the changes visible can be handy when you
|
|
36 ;; want the information but very distracting otherwise. So, you can keep
|
|
37 ;; Highlight Changes mode in passive state while you make your changes, toggle
|
|
38 ;; it on to active mode to see them, then toggle it back off to avoid
|
|
39 ;; distraction.
|
49588
|
40 ;;
|
63207
|
41 ;; When active, changes are displayed in the `highlight-changes' face.
|
|
42 ;; When text is deleted, the following character is displayed in the
|
|
43 ;; `highlight-changes-delete' face.
|
22957
|
44 ;;
|
|
45 ;;
|
|
46 ;; You can "age" different sets of changes by using
|
30962
|
47 ;; `highlight-changes-rotate-faces'. This rotates through a series
|
22957
|
48 ;; of different faces, so you can distinguish "new" changes from "older"
|
23046
|
49 ;; changes. You can customize these "rotated" faces in two ways. You can
|
22957
|
50 ;; either explicitly define each face by customizing
|
|
51 ;; `highlight-changes-face-list'. If, however, the faces differ from
|
63207
|
52 ;; the `highlight-changes' face only in the foreground color, you can simply set
|
63351
071d62682d14
(highlight-changes-colors): Rename from `highlight-changes-colours'.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
53 ;; `highlight-changes-colors'. If `highlight-changes-face-list' is nil when
|
22957
|
54 ;; the faces are required they will be constructed from
|
63351
071d62682d14
(highlight-changes-colors): Rename from `highlight-changes-colours'.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
55 ;; `highlight-changes-colors'.
|
22957
|
56 ;;
|
|
57 ;;
|
|
58 ;; When a Highlight Changes mode is on (either active or passive) you can go
|
|
59 ;; to the next or previous change with `highlight-changes-next-change' and
|
|
60 ;; `highlight-changes-previous-change'.
|
|
61 ;;
|
|
62 ;;
|
23289
|
63 ;; You can also use the command highlight-compare-with-file to show changes
|
|
64 ;; in this file compared with another file (typically the previous version
|
54009
|
65 ;; of the file). The command highlight-compare-buffers can be used to
|
|
66 ;; compare two buffers.
|
22957
|
67 ;;
|
|
68 ;;
|
|
69 ;; There are currently three hooks run by `highlight-changes-mode':
|
|
70 ;; `highlight-changes-enable-hook' - is run when Highlight Changes mode
|
|
71 ;; is initially enabled for a buffer.
|
|
72 ;; `highlight-changes-disable-hook' - is run when Highlight Changes mode
|
|
73 ;; is turned off.
|
|
74 ;; `highlight-changes-toggle-hook' - is run each time `highlight-changes-mode'
|
|
75 ;; is called. Typically this is when
|
|
76 ;; toggling between active and passive
|
|
77 ;; modes. The variable
|
|
78 ;; `highlight-changes-mode' contains the new
|
|
79 ;; state (`active' or `passive'.)
|
49588
|
80 ;;
|
22957
|
81 ;;
|
49588
|
82 ;;
|
22957
|
83 ;; Example usage:
|
|
84 ;; (defun my-highlight-changes-enable-hook ()
|
64587
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
85 ;; (add-hook 'write-file-functions 'highlight-changes-rotate-faces nil t)
|
22957
|
86 ;; )
|
49588
|
87 ;;
|
22957
|
88 ;; (defun my-highlight-changes-disable-hook ()
|
64587
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
89 ;; (remove-hook 'write-file-functions 'highlight-changes-rotate-faces t)
|
22957
|
90 ;; )
|
49588
|
91 ;;
|
22957
|
92 ;; (add-hook 'highlight-changes-enable-hook 'my-highlight-changes-enable-hook)
|
|
93 ;; (add-hook 'highlight-changes-disable-hook
|
|
94 ;; 'my-highlight-changes-disable-hook)
|
|
95
|
|
96
|
30962
|
97 ;; Explicit vs. Implicit
|
22957
|
98 ;;
|
|
99
|
|
100 ;; Normally, Highlight Changes mode is turned on explicitly in a buffer.
|
|
101 ;;
|
|
102 ;; If you prefer to have it automatically invoked you can do it as
|
|
103 ;; follows.
|
49588
|
104 ;;
|
22957
|
105 ;; 1. Most modes have a major-hook, typically called MODE-hook. You
|
49588
|
106 ;; can use `add-hook' to call `highlight-changes-mode'.
|
22957
|
107 ;;
|
|
108 ;; Example:
|
|
109 ;; (add-hook 'c-mode-hook 'highlight-changes-mode)
|
|
110 ;;
|
|
111 ;; If you want to make it start up in passive mode (regardless of the
|
|
112 ;; setting of highlight-changes-initial-state):
|
49588
|
113 ;; (add-hook 'emacs-lisp-mode-hook
|
22957
|
114 ;; (lambda ()
|
|
115 ;; (highlight-changes-mode 'passive)))
|
|
116 ;;
|
|
117 ;; However, this cannot be done for Fundamental mode for there is no
|
|
118 ;; such hook.
|
|
119 ;;
|
49588
|
120 ;; 2. You can use the function `global-highlight-changes'
|
22957
|
121 ;;
|
|
122 ;; This function, which is fashioned after the way `global-font-lock' works,
|
|
123 ;; toggles on or off global Highlight Changes mode. When activated, it turns
|
30962
|
124 ;; on Highlight Changes mode in all "suitable" existing buffers and will turn
|
22957
|
125 ;; it on in new "suitable" buffers to be created.
|
49588
|
126 ;;
|
22957
|
127 ;; A buffer's "suitability" is determined by variable
|
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
128 ;; `highlight-changes-global-modes', as follows. If the variable is
|
22957
|
129 ;; * nil -- then no buffers are suitable;
|
|
130 ;; * a function -- this function is called and the result is used. As
|
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
131 ;; an example, if the value is `buffer-file-name' then all buffers
|
22957
|
132 ;; who are visiting files are suitable, but others (like dired
|
|
133 ;; buffers) are not;
|
30924
|
134 ;; * a list -- then the buffer is suitable iff its mode is in the
|
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
135 ;; list, except if the first element is `not', in which case the test
|
22957
|
136 ;; is reversed (i.e. it is a list of unsuitable modes).
|
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
137 ;; * Otherwise, the buffer is suitable if its name does not begin with
|
22957
|
138 ;; ` ' or `*' and if `buffer-file-name' returns true.
|
|
139 ;;
|
|
140
|
|
141
|
|
142
|
|
143 ;; Possible bindings:
|
|
144 ;; (global-set-key '[C-right] 'highlight-changes-next-change)
|
|
145 ;; (global-set-key '[C-left] 'highlight-changes-previous-change)
|
|
146 ;;
|
|
147 ;; Other interactive functions (which could be bound if desired):
|
|
148 ;; highlight-changes-mode
|
|
149 ;; highlight-changes-remove-highlight
|
|
150 ;; highlight-changes-rotate-faces
|
23289
|
151 ;; highlight-compare-with-file
|
54009
|
152 ;; highlight-compare-buffers
|
22957
|
153
|
49588
|
154 ;;
|
22957
|
155 ;; You can automatically rotate faces when the buffer is saved;
|
|
156 ;; see function `highlight-changes-rotate-faces' for how to do this.
|
|
157 ;;
|
|
158
|
|
159
|
|
160 ;;; Bugs:
|
|
161
|
|
162 ;; - the next-change and previous-change functions are too literal;
|
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
163 ;; they should find the next "real" change, in other words treat
|
22957
|
164 ;; consecutive changes as one.
|
|
165
|
|
166
|
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
167 ;;; To do (maybe), notes, ...
|
22957
|
168
|
|
169 ;; - having different faces for deletion and non-deletion: is it
|
|
170 ;; really worth the hassle?
|
|
171 ;; - should have better hooks: when should they be run?
|
23289
|
172 ;; - highlight-compare-with-file should allow RCS files - e.g. nice to be
|
|
173 ;; able to say show changes compared with version 2.1.
|
22957
|
174 ;; - Maybe we should have compare-with-buffer as well. (When I tried
|
|
175 ;; a while back I ran into a problem with ediff-buffers-internal.)
|
|
176
|
|
177
|
|
178 ;;; History:
|
|
179
|
54009
|
180 ;; R Sharman (rsharman@pobox.com) Feb 1998:
|
22957
|
181 ;; - initial release as change-mode.
|
|
182 ;; Jari Aalto <jari.aalto@ntc.nokia.com> Mar 1998
|
49588
|
183 ;; - fixes for byte compile errors
|
22957
|
184 ;; - use eval-and-compile for autoload
|
|
185 ;; Marijn Ros <J.M.Ros@fys.ruu.nl> Mar 98
|
|
186 ;; - suggested turning it on by default
|
|
187 ;; Eric Ludlam <zappo@gnu.org> Suggested using overlays.
|
|
188 ;; July 98
|
|
189 ;; - global mode and various stuff added
|
|
190 ;; - Changed to use overlays
|
|
191 ;; August 98
|
30962
|
192 ;; - renamed to Highlight Changes mode.
|
54009
|
193 ;; Dec 2003
|
|
194 ;; - Use require for ediff stuff
|
|
195 ;; - Added highlight-compare-buffers
|
22957
|
196
|
|
197 ;;; Code:
|
|
198
|
|
199 (require 'wid-edit)
|
|
200
|
|
201 ;; ====================== Customization =======================
|
|
202 (defgroup highlight-changes nil
|
|
203 "Highlight Changes mode."
|
24554
|
204 :version "20.4"
|
22957
|
205 :group 'faces)
|
|
206
|
|
207
|
|
208 ;; Face information: How the changes appear.
|
|
209
|
|
210 ;; Defaults for face: red foreground, no change to background,
|
|
211 ;; and underlined if a change is because of a deletion.
|
30962
|
212 ;; Note: underlining is helpful in that it shows up changes in white space.
|
22957
|
213 ;; However, having it set for non-delete changes can be annoying because all
|
|
214 ;; indentation on inserts gets underlined (which can look pretty ugly!).
|
|
215
|
63207
|
216 (defface highlight-changes
|
64587
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
217 '((((min-colors 88) (class color)) (:foreground "red1"))
|
61394
31aa9a390538
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
diff
changeset
|
218 (((class color)) (:foreground "red" ))
|
22957
|
219 (t (:inverse-video t)))
|
|
220 "Face used for highlighting changes."
|
30962
|
221 :group 'highlight-changes)
|
63207
|
222 ;; backward-compatibility alias
|
|
223 (put 'highlight-changes-face 'face-alias 'highlight-changes)
|
22957
|
224
|
|
225 ;; This looks pretty ugly, actually. Maybe the underline should be removed.
|
63207
|
226 (defface highlight-changes-delete
|
61394
31aa9a390538
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
diff
changeset
|
227 '((((min-colors 88) (class color)) (:foreground "red1" :underline t))
|
31aa9a390538
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
diff
changeset
|
228 (((class color)) (:foreground "red" :underline t))
|
22957
|
229 (t (:inverse-video t)))
|
|
230 "Face used for highlighting deletions."
|
30962
|
231 :group 'highlight-changes)
|
63207
|
232 ;; backward-compatibility alias
|
|
233 (put 'highlight-changes-delete-face 'face-alias 'highlight-changes-delete)
|
22957
|
234
|
|
235
|
|
236
|
63351
071d62682d14
(highlight-changes-colors): Rename from `highlight-changes-colours'.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
237 ;; A (not very good) default list of colors to rotate through.
|
22957
|
238 ;;
|
63351
071d62682d14
(highlight-changes-colors): Rename from `highlight-changes-colours'.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
239 (defcustom highlight-changes-colors
|
22957
|
240 (if (eq (frame-parameter nil 'background-mode) 'light)
|
|
241 ;; defaults for light background:
|
|
242 '( "magenta" "blue" "darkgreen" "chocolate" "sienna4" "NavyBlue")
|
|
243 ;; defaults for dark background:
|
|
244 '("yellow" "magenta" "blue" "maroon" "firebrick" "green4" "DarkOrchid"))
|
63252
|
245 "*Colors used by `highlight-changes-rotate-faces'.
|
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
246 The newest rotated change will be displayed in the first element of this list,
|
22957
|
247 the next older will be in the second element etc.
|
|
248
|
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
249 This list is used if `highlight-changes-face-list' is nil, otherwise that
|
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
250 variable overrides this list. If you only care about foreground
|
63252
|
251 colors then use this, if you want fancier faces then set
|
22957
|
252 `highlight-changes-face-list'."
|
30962
|
253 :type '(repeat color)
|
|
254 :group 'highlight-changes)
|
49588
|
255
|
63351
071d62682d14
(highlight-changes-colors): Rename from `highlight-changes-colours'.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
256 (define-obsolete-variable-alias 'highlight-changes-colours
|
071d62682d14
(highlight-changes-colors): Rename from `highlight-changes-colours'.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
257 'highlight-changes-colors "22.1")
|
071d62682d14
(highlight-changes-colors): Rename from `highlight-changes-colours'.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
258
|
22957
|
259
|
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
260 ;; If you invoke highlight-changes-mode with no argument, should it start in
|
22957
|
261 ;; active or passive mode?
|
|
262 ;;
|
|
263 (defcustom highlight-changes-initial-state 'active
|
68524
2f9b0e4b3a95
(highlight-changes-initial-state, highlight-changes-global-initial-state):
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
264 "*What state (active or passive) Highlight Changes mode should start in.
|
2f9b0e4b3a95
(highlight-changes-initial-state, highlight-changes-global-initial-state):
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
265 This is used when `highlight-changes-mode' is called with no argument.
|
22957
|
266 This variable must be set to one of the symbols `active' or `passive'."
|
|
267 :type '(choice (const :tag "Active" active)
|
|
268 (const :tag "Passive" passive))
|
30962
|
269 :group 'highlight-changes)
|
22957
|
270
|
|
271 (defcustom highlight-changes-global-initial-state 'passive
|
68524
2f9b0e4b3a95
(highlight-changes-initial-state, highlight-changes-global-initial-state):
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
272 "*What state global Highlight Changes mode should start in.
|
22957
|
273 This is used if `global-highlight-changes' is called with no argument.
|
64587
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
274 This variable must be set to either `active' or `passive'."
|
22957
|
275 :type '(choice (const :tag "Active" active)
|
|
276 (const :tag "Passive" passive))
|
30962
|
277 :group 'highlight-changes)
|
22957
|
278
|
|
279 ;; The strings displayed in the mode-line for the minor mode:
|
43132
|
280 (defcustom highlight-changes-active-string " +Chg"
|
22957
|
281 "*The string used when Highlight Changes mode is in the active state.
|
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
282 This should be set to nil if no indication is desired, or to
|
22957
|
283 a string with a leading space."
|
|
284 :type '(choice string
|
|
285 (const :tag "None" nil))
|
30962
|
286 :group 'highlight-changes)
|
22957
|
287
|
43132
|
288 (defcustom highlight-changes-passive-string " -Chg"
|
22957
|
289 "*The string used when Highlight Changes mode is in the passive state.
|
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
290 This should be set to nil if no indication is desired, or to
|
22957
|
291 a string with a leading space."
|
|
292 :type '(choice string
|
|
293 (const :tag "None" nil))
|
30962
|
294 :group 'highlight-changes)
|
22957
|
295
|
|
296 (defcustom highlight-changes-global-modes t
|
|
297 "*Determine whether a buffer is suitable for global Highlight Changes mode.
|
|
298
|
43132
|
299 A function means call that function to decide: if it returns non-nil,
|
|
300 the buffer is suitable.
|
22957
|
301
|
43132
|
302 A list means the elements are major modes suitable for Highlight
|
|
303 Changes mode, or a list whose first element is `not' followed by major
|
|
304 modes which are not suitable.
|
22957
|
305
|
64587
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
306 A value of t means the buffer is suitable if it is visiting a file and
|
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
307 its name does not begin with ` ' or `*'.
|
22957
|
308
|
30962
|
309 A value of nil means no buffers are suitable for `global-highlight-changes'
|
41701
|
310 \(effectively disabling the mode).
|
22957
|
311
|
68524
2f9b0e4b3a95
(highlight-changes-initial-state, highlight-changes-global-initial-state):
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
312 Example:
|
22957
|
313 (c-mode c++-mode)
|
|
314 means that Highlight Changes mode is turned on for buffers in C and C++
|
|
315 modes only."
|
49588
|
316 :type '(choice
|
22957
|
317 (const :tag "all non-special buffers visiting files" t)
|
|
318 (set :menu-tag "specific modes" :tag "modes"
|
|
319 :value (not)
|
|
320 (const :tag "All except these" not)
|
|
321 (repeat :tag "Modes" :inline t (symbol :tag "mode")))
|
|
322 (function :menu-tag "determined by function"
|
|
323 :value buffer-file-name)
|
|
324 (const :tag "none" nil)
|
|
325 )
|
30962
|
326 :group 'highlight-changes)
|
22957
|
327
|
|
328 (defvar global-highlight-changes nil)
|
|
329
|
|
330 (defcustom highlight-changes-global-changes-existing-buffers nil
|
30962
|
331 "*If non-nil, toggling global Highlight Changes mode affects existing buffers.
|
|
332 Normally, `global-highlight-changes' affects only new buffers (to be
|
|
333 created). However, if `highlight-changes-global-changes-existing-buffers'
|
|
334 is non-nil, then turning on `global-highlight-changes' will turn on
|
|
335 Highlight Changes mode in suitable buffers, and turning the mode off will
|
22957
|
336 remove it from existing buffers."
|
|
337 :type 'boolean
|
|
338 :group 'highlight-changes)
|
|
339
|
|
340 (defun hilit-chg-cust-fix-changes-face-list (w wc &optional event)
|
|
341 ;; When customization function `highlight-changes-face-list' inserts a new
|
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
342 ;; face it uses the default face. We don't want the user to modify this
|
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
343 ;; face, so we rename the faces in the list on an insert. The rename is
|
22957
|
344 ;; actually done by copying the faces so user-defined faces still remain
|
|
345 ;; in the same order.
|
|
346 ;; The notifying the parent is needed because without it changes to the
|
|
347 ;; faces are saved but not to the actual list itself.
|
|
348 (let ((old-list (widget-value w)))
|
|
349 (if (member 'default old-list)
|
|
350 (let
|
|
351 ((p (reverse old-list))
|
|
352 (n (length old-list))
|
|
353 new-name old-name
|
|
354 (new-list nil)
|
|
355 )
|
|
356 (while p
|
|
357 (setq old-name (car p))
|
63207
|
358 (setq new-name (intern (format "highlight-changes-%d" n)))
|
22957
|
359 (if (eq old-name new-name)
|
|
360 nil
|
|
361 ;; A new face has been inserted: we don't want to modify the
|
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
362 ;; default face so copy it. Better, though, (I think) is to
|
22957
|
363 ;; make a new face have the same attributes as
|
63207
|
364 ;; the `highlight-changes' face.
|
22957
|
365 (if (eq old-name 'default)
|
63207
|
366 (copy-face 'highlight-changes new-name)
|
22957
|
367 (copy-face old-name new-name)
|
|
368 ))
|
68524
2f9b0e4b3a95
(highlight-changes-initial-state, highlight-changes-global-initial-state):
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
369 (setq new-list (append (list new-name) new-list))
|
22957
|
370 (setq n (1- n))
|
|
371 (setq p (cdr p)))
|
|
372 (if (equal new-list (widget-value w))
|
|
373 nil ;; (message "notify: no change!")
|
|
374 (widget-value-set w new-list)
|
|
375 (widget-setup)
|
|
376 )
|
|
377 )
|
|
378 ;; (message "notify: no default here!")
|
|
379 ))
|
|
380 (let ((parent (widget-get w :parent)))
|
|
381 (when parent
|
30962
|
382 (widget-apply parent :notify w event))))
|
22957
|
383
|
|
384
|
|
385 (defcustom highlight-changes-face-list nil
|
30962
|
386 "*A list of faces used when rotating changes.
|
22957
|
387 Normally the variable is initialized to nil and the list is created from
|
63351
071d62682d14
(highlight-changes-colors): Rename from `highlight-changes-colours'.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
388 `highlight-changes-colors' when needed. However, you can set this variable
|
22957
|
389 to any list of faces. You will have to do this if you want faces which
|
63252
|
390 don't just differ from the `highlight-changes' face by the foreground color.
|
22957
|
391 Otherwise, this list will be constructed when needed from
|
63351
071d62682d14
(highlight-changes-colors): Rename from `highlight-changes-colours'.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
392 `highlight-changes-colors'."
|
22957
|
393 :type '(choice
|
49588
|
394 (repeat
|
22957
|
395 :notify hilit-chg-cust-fix-changes-face-list
|
|
396 face )
|
63351
071d62682d14
(highlight-changes-colors): Rename from `highlight-changes-colours'.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
397 (const :tag "Derive from highlight-changes-colors" nil)
|
22957
|
398 )
|
30962
|
399 :group 'highlight-changes)
|
22957
|
400
|
|
401 ;; ========================================================================
|
|
402
|
|
403 ;; These shouldn't be changed!
|
|
404
|
|
405 (defvar highlight-changes-mode nil)
|
|
406 (defvar hilit-chg-list nil)
|
|
407 (defvar hilit-chg-string " ??")
|
|
408 (or (assq 'highlight-changes-mode minor-mode-alist)
|
|
409 (setq minor-mode-alist
|
|
410 (cons '(highlight-changes-mode hilit-chg-string) minor-mode-alist)
|
|
411 ))
|
|
412 (make-variable-buffer-local 'highlight-changes-mode)
|
|
413 (make-variable-buffer-local 'hilit-chg-string)
|
|
414
|
|
415
|
54009
|
416 (require 'ediff-init)
|
|
417 (require 'ediff-util)
|
22957
|
418
|
|
419
|
|
420 ;;; Functions...
|
|
421
|
68524
2f9b0e4b3a95
(highlight-changes-initial-state, highlight-changes-global-initial-state):
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
422 (defun hilit-chg-map-changes (func &optional start-position end-position)
|
22957
|
423 "Call function FUNC for each region used by Highlight Changes mode."
|
|
424 ;; if start-position is nil, (point-min) is used
|
|
425 ;; if end-position is nil, (point-max) is used
|
|
426 ;; FUNC is called with 3 params: property start stop
|
|
427 (let ((start (or start-position (point-min)))
|
|
428 (limit (or end-position (point-max)))
|
|
429 prop end)
|
|
430 (while (and start (< start limit))
|
|
431 (setq prop (get-text-property start 'hilit-chg))
|
|
432 (setq end (text-property-not-all start limit 'hilit-chg prop))
|
|
433 (if prop
|
|
434 (funcall func prop start (or end limit)))
|
30962
|
435 (setq start end))))
|
22957
|
436
|
|
437
|
|
438 (defun hilit-chg-display-changes (&optional beg end)
|
|
439 "Display face information for Highlight Changes mode.
|
|
440
|
30962
|
441 An overlay containing a change face is added from the information
|
|
442 in the text property of type `hilit-chg'.
|
22957
|
443
|
30962
|
444 This is the opposite of `hilit-chg-hide-changes'."
|
22957
|
445 (hilit-chg-map-changes 'hilit-chg-make-ov beg end))
|
|
446
|
|
447
|
|
448 (defun hilit-chg-make-ov (prop start end)
|
43030
|
449 (or prop
|
|
450 (error "hilit-chg-make-ov: prop is nil"))
|
22957
|
451 ;; for the region make change overlays corresponding to
|
|
452 ;; the text property 'hilit-chg
|
|
453 (let ((ov (make-overlay start end))
|
|
454 face)
|
|
455 (if (eq prop 'hilit-chg-delete)
|
63207
|
456 (setq face 'highlight-changes-delete)
|
22957
|
457 (setq face (nth 1 (member prop hilit-chg-list))))
|
|
458 (if face
|
|
459 (progn
|
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
460 ;; We must mark the face, that is the purpose of the overlay
|
22957
|
461 (overlay-put ov 'face face)
|
|
462 ;; I don't think we need to set evaporate since we should
|
|
463 ;; be controlling them!
|
|
464 (overlay-put ov 'evaporate t)
|
|
465 ;; We set the change property so we can tell this is one
|
|
466 ;; of our overlays (so we don't delete someone else's).
|
|
467 (overlay-put ov 'hilit-chg t)
|
|
468 )
|
30962
|
469 (error "hilit-chg-make-ov: no face for prop: %s" prop))))
|
22957
|
470
|
|
471 (defun hilit-chg-hide-changes (&optional beg end)
|
|
472 "Remove face information for Highlight Changes mode.
|
|
473
|
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
474 The overlay containing the face is removed, but the text property
|
22957
|
475 containing the change information is retained.
|
|
476
|
30962
|
477 This is the opposite of `hilit-chg-display-changes'."
|
22957
|
478 (let ((start (or beg (point-min)))
|
|
479 (limit (or end (point-max)))
|
|
480 p ov)
|
|
481 (setq p (overlays-in start limit))
|
|
482 (while p
|
|
483 ;; don't delete the overlay if it isn't ours!
|
|
484 (if (overlay-get (car p) 'hilit-chg)
|
|
485 (delete-overlay (car p)))
|
30962
|
486 (setq p (cdr p)))))
|
22957
|
487
|
|
488 (defun hilit-chg-fixup (beg end)
|
30962
|
489 "Fix change overlays in region between BEG and END.
|
22957
|
490
|
|
491 Ensure the overlays agree with the changes as determined from
|
64587
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
492 the text properties of type `hilit-chg'."
|
22957
|
493 ;; Remove or alter overlays in region beg..end
|
43030
|
494 (let (ov-start ov-end props q)
|
22957
|
495 ;; temp for debugging:
|
|
496 ;; (or (eq highlight-changes-mode 'active)
|
|
497 ;; (error "hilit-chg-fixup called but Highlight Changes mode not active"))
|
43030
|
498 (dolist (ov (overlays-in beg end))
|
|
499 ;; Don't alter overlays that are not ours.
|
|
500 (when (overlay-get ov 'hilit-chg)
|
|
501 (let ((ov-start (overlay-start ov))
|
|
502 (ov-end (overlay-end ov)))
|
|
503 (if (< ov-start beg)
|
|
504 (progn
|
|
505 (move-overlay ov ov-start beg)
|
|
506 (if (> ov-end end)
|
|
507 (progn
|
|
508 (setq props (overlay-properties ov))
|
|
509 (setq ov (make-overlay end ov-end))
|
|
510 (while props
|
|
511 (overlay-put ov (car props)(car (cdr props)))
|
|
512 (setq props (cdr (cdr props)))))))
|
22957
|
513 (if (> ov-end end)
|
43030
|
514 (move-overlay ov end ov-end)
|
|
515 (delete-overlay ov))))))
|
30962
|
516 (hilit-chg-display-changes beg end)))
|
22957
|
517
|
|
518 ;;;###autoload
|
49588
|
519 (defun highlight-changes-remove-highlight (beg end)
|
|
520 "Remove the change face from the region between BEG and END.
|
22957
|
521 This allows you to manually remove highlighting from uninteresting changes."
|
|
522 (interactive "r")
|
|
523 (let ((after-change-functions nil))
|
68738
974d9b214cd3
(hilit-chg-update-all-buffers): Use `mapc' instead of `mapcar'; return nil.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
524 (remove-text-properties beg end '(hilit-chg nil))
|
22957
|
525 (hilit-chg-fixup beg end)))
|
|
526
|
49588
|
527 (defun hilit-chg-set-face-on-change (beg end leng-before
|
43030
|
528 &optional no-property-change)
|
22957
|
529 "Record changes and optionally display them in a distinctive face.
|
|
530 `hilit-chg-set' adds this function to the `after-change-functions' hook."
|
|
531 ;;
|
|
532 ;; This function is called by the `after-change-functions' hook, which
|
|
533 ;; is how we are notified when text is changed.
|
23289
|
534 ;; It is also called from `highlight-compare-with-file'.
|
22957
|
535 ;;
|
|
536 ;; We do NOT want to simply do this if this is an undo command, because
|
|
537 ;; otherwise an undone change shows up as changed. While the properties
|
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
538 ;; are automatically restored by undo, we must fix up the overlay.
|
22957
|
539 (save-match-data
|
|
540 (let ((beg-decr 1) (end-incr 1)
|
|
541 (type 'hilit-chg)
|
|
542 old)
|
|
543 (if undo-in-progress
|
|
544 (if (eq highlight-changes-mode 'active)
|
|
545 (hilit-chg-fixup beg end))
|
|
546 (if (and (= beg end) (> leng-before 0))
|
|
547 ;; deletion
|
|
548 (progn
|
|
549 ;; The eolp and bolp tests are a kludge! But they prevent
|
49588
|
550 ;; rather nasty looking displays when deleting text at the end
|
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
551 ;; of line, such as normal corrections as one is typing and
|
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
552 ;; immediately makes a correction, and when deleting first
|
22957
|
553 ;; character of a line.
|
|
554 ;;; (if (= leng-before 1)
|
|
555 ;;; (if (eolp)
|
|
556 ;;; (setq beg-decr 0 end-incr 0)
|
|
557 ;;; (if (bolp)
|
|
558 ;;; (setq beg-decr 0))))
|
|
559 ;;; (setq beg (max (- beg beg-decr) (point-min)))
|
|
560 (setq end (min (+ end end-incr) (point-max)))
|
|
561 (setq type 'hilit-chg-delete))
|
|
562 ;; Not a deletion.
|
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
563 ;; Most of the time the following is not necessary, but
|
22957
|
564 ;; if the current text was marked as a deletion then
|
|
565 ;; the old overlay is still in effect, so if we add some
|
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
566 ;; text then remove the deletion marking, but set it to
|
22957
|
567 ;; changed otherwise its highlighting disappears.
|
|
568 (if (eq (get-text-property end 'hilit-chg) 'hilit-chg-delete)
|
|
569 (progn
|
|
570 (remove-text-properties end (+ end 1) '(hilit-chg nil))
|
|
571 (put-text-property end (+ end 1) 'hilit-chg 'hilit-chg)
|
|
572 (if (eq highlight-changes-mode 'active)
|
|
573 (hilit-chg-fixup beg (+ end 1))))))
|
43030
|
574 (unless no-property-change
|
22957
|
575 (put-text-property beg end 'hilit-chg type))
|
43030
|
576 (if (or (eq highlight-changes-mode 'active) no-property-change)
|
30962
|
577 (hilit-chg-make-ov type beg end))))))
|
22957
|
578
|
|
579 (defun hilit-chg-set (value)
|
|
580 "Turn on Highlight Changes mode for this buffer."
|
|
581 (setq highlight-changes-mode value)
|
|
582 (remove-hook 'after-change-functions 'hilit-chg-set-face-on-change t)
|
|
583 (hilit-chg-make-list)
|
|
584 (if (eq highlight-changes-mode 'active)
|
|
585 (progn
|
|
586 (setq hilit-chg-string highlight-changes-active-string)
|
|
587 (or buffer-read-only
|
|
588 (hilit-chg-display-changes)))
|
|
589 ;; mode is passive
|
|
590 (setq hilit-chg-string highlight-changes-passive-string)
|
|
591 (or buffer-read-only
|
30962
|
592 (hilit-chg-hide-changes)))
|
22957
|
593 (force-mode-line-update)
|
30962
|
594 (add-hook 'after-change-functions 'hilit-chg-set-face-on-change nil t))
|
22957
|
595
|
|
596 (defun hilit-chg-clear ()
|
|
597 "Remove Highlight Changes mode for this buffer.
|
|
598 This removes all saved change information."
|
|
599 (if buffer-read-only
|
|
600 ;; We print the buffer name because this function could be called
|
|
601 ;; on many buffers from `global-highlight-changes'.
|
|
602 (message "Cannot remove highlighting from read-only mode buffer %s"
|
|
603 (buffer-name))
|
|
604 (remove-hook 'after-change-functions 'hilit-chg-set-face-on-change t)
|
|
605 (let ((after-change-functions nil))
|
|
606 (hilit-chg-hide-changes)
|
49588
|
607 (hilit-chg-map-changes
|
22957
|
608 '(lambda (prop start stop)
|
|
609 (remove-text-properties start stop '(hilit-chg nil))))
|
|
610 )
|
|
611 (setq highlight-changes-mode nil)
|
|
612 (force-mode-line-update)
|
|
613 ;; If we type: C-u -1 M-x highlight-changes-mode
|
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
614 ;; we want to turn it off, but hilit-chg-post-command-hook
|
22957
|
615 ;; runs and that turns it back on!
|
30962
|
616 (remove-hook 'post-command-hook 'hilit-chg-post-command-hook)))
|
22957
|
617
|
|
618 ;;;###autoload
|
|
619 (defun highlight-changes-mode (&optional arg)
|
|
620 "Toggle (or initially set) Highlight Changes mode.
|
|
621
|
49588
|
622 Without an argument:
|
30962
|
623 If Highlight Changes mode is not enabled, then enable it (in either active
|
|
624 or passive state as determined by the variable
|
|
625 `highlight-changes-initial-state'); otherwise, toggle between active
|
|
626 and passive state.
|
22957
|
627
|
30962
|
628 With an argument ARG:
|
|
629 If ARG is positive, set state to active;
|
|
630 If ARG is zero, set state to passive;
|
|
631 If ARG is negative, disable Highlight Changes mode completely.
|
22957
|
632
|
30962
|
633 Active state - means changes are shown in a distinctive face.
|
22957
|
634 Passive state - means changes are kept and new ones recorded but are
|
|
635 not displayed in a different face.
|
|
636
|
|
637 Functions:
|
|
638 \\[highlight-changes-next-change] - move point to beginning of next change
|
49588
|
639 \\[highlight-changes-previous-change] - move to beginning of previous change
|
23289
|
640 \\[highlight-compare-with-file] - mark text as changed by comparing this
|
|
641 buffer with the contents of a file
|
22957
|
642 \\[highlight-changes-remove-highlight] - remove the change face from the region
|
|
643 \\[highlight-changes-rotate-faces] - rotate different \"ages\" of changes \
|
49588
|
644 through
|
64587
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
645 various faces
|
22957
|
646
|
|
647 Hook variables:
|
64587
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
648 `highlight-changes-enable-hook' - when enabling Highlight Changes mode
|
30962
|
649 `highlight-changes-toggle-hook' - when entering active or passive state
|
64587
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
650 `highlight-changes-disable-hook' - when turning off Highlight Changes mode"
|
22957
|
651 (interactive "P")
|
29204
|
652 (if (or (display-color-p)
|
|
653 (and (fboundp 'x-display-grayscale-p) (x-display-grayscale-p)))
|
22957
|
654 (let ((was-on highlight-changes-mode)
|
|
655 (new-highlight-changes-mode
|
|
656 (cond
|
|
657 ((null arg)
|
|
658 ;; no arg => toggle (or set to active initially)
|
|
659 (if highlight-changes-mode
|
|
660 (if (eq highlight-changes-mode 'active) 'passive 'active)
|
|
661 highlight-changes-initial-state))
|
|
662 ;; an argument is given
|
|
663 ((eq arg 'active)
|
|
664 'active)
|
68738
974d9b214cd3
(hilit-chg-update-all-buffers): Use `mapc' instead of `mapcar'; return nil.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
665 ((eq arg 'passive)
|
22957
|
666 'passive)
|
|
667 ((> (prefix-numeric-value arg) 0)
|
|
668 'active)
|
|
669 ((< (prefix-numeric-value arg) 0)
|
|
670 nil)
|
|
671 (t
|
30962
|
672 'passive))))
|
22957
|
673 (if new-highlight-changes-mode
|
|
674 ;; mode is turned on -- but may be passive
|
|
675 (progn
|
|
676 (hilit-chg-set new-highlight-changes-mode)
|
|
677 (or was-on
|
|
678 ;; run highlight-changes-enable-hook once
|
|
679 (run-hooks 'highlight-changes-enable-hook))
|
|
680 (run-hooks 'highlight-changes-toggle-hook))
|
|
681 ;; mode is turned off
|
|
682 (run-hooks 'highlight-changes-disable-hook)
|
30962
|
683 (hilit-chg-clear)))
|
|
684 (message "Highlight Changes mode requires color or grayscale display")))
|
22957
|
685
|
|
686 ;;;###autoload
|
|
687 (defun highlight-changes-next-change ()
|
|
688 "Move to the beginning of the next change, if in Highlight Changes mode."
|
|
689 (interactive)
|
|
690 (if highlight-changes-mode
|
|
691 (let ((start (point))
|
|
692 prop)
|
|
693 (setq prop (get-text-property (point) 'hilit-chg))
|
|
694 (if prop
|
|
695 ;; we are in a change
|
|
696 (setq start (next-single-property-change (point) 'hilit-chg)))
|
|
697 (if start
|
|
698 (setq start (next-single-property-change start 'hilit-chg)))
|
|
699 (if start
|
|
700 (goto-char start)
|
|
701 (message "no next change")))
|
|
702 (message "This buffer is not in Highlight Changes mode.")))
|
|
703
|
|
704
|
|
705 ;;;###autoload
|
|
706 (defun highlight-changes-previous-change ()
|
|
707 "Move to the beginning of the previous change, if in Highlight Changes mode."
|
|
708 (interactive)
|
|
709 (if highlight-changes-mode
|
|
710 (let ( (start (point)) (prop nil) )
|
|
711 (or (bobp)
|
|
712 (setq prop (get-text-property (1- (point)) 'hilit-chg)))
|
|
713 (if prop
|
|
714 ;; we are in a change
|
|
715 (setq start (previous-single-property-change (point) 'hilit-chg)))
|
|
716 (if start
|
|
717 (setq start (previous-single-property-change start 'hilit-chg)))
|
|
718 ;; special handling for the case where (point-min) is a change
|
|
719 (if start
|
|
720 (setq start (or (previous-single-property-change start 'hilit-chg)
|
|
721 (if (get-text-property (point-min) 'hilit-chg)
|
|
722 (point-min)))))
|
|
723 (if start
|
|
724 (goto-char start)
|
|
725 (message "no previous change")))
|
|
726 (message "This buffer is not in Highlight Changes mode.")))
|
|
727
|
|
728 ;; ========================================================================
|
|
729
|
|
730 (defun hilit-chg-make-list (&optional force)
|
30962
|
731 "Construct `hilit-chg-list' and `highlight-changes-face-list'."
|
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
732 ;; Constructs highlight-changes-face-list if necessary,
|
22957
|
733 ;; and hilit-chg-list always:
|
|
734 ;; Maybe this should always be called when rotating a face
|
|
735 ;; so we pick up any changes?
|
|
736 (if (or (null highlight-changes-face-list) ; Don't do it if it
|
|
737 force) ; already exists unless FORCE non-nil.
|
63351
071d62682d14
(highlight-changes-colors): Rename from `highlight-changes-colours'.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
738 (let ((p highlight-changes-colors)
|
22957
|
739 (n 1) name)
|
|
740 (setq highlight-changes-face-list nil)
|
|
741 (while p
|
63207
|
742 (setq name (intern (format "highlight-changes-%d" n)))
|
|
743 (copy-face 'highlight-changes name)
|
22957
|
744 (set-face-foreground name (car p))
|
49588
|
745 (setq highlight-changes-face-list
|
22957
|
746 (append highlight-changes-face-list (list name)))
|
|
747 (setq p (cdr p))
|
|
748 (setq n (1+ n)))))
|
63207
|
749 (setq hilit-chg-list (list 'hilit-chg 'highlight-changes))
|
22957
|
750 (let ((p highlight-changes-face-list)
|
49588
|
751 (n 1)
|
22957
|
752 last-category last-face)
|
|
753 (while p
|
|
754 (setq last-category (intern (format "change-%d" n)))
|
63207
|
755 ;; (setq last-face (intern (format "highlight-changes-%d" n)))
|
22957
|
756 (setq last-face (car p))
|
|
757 (setq hilit-chg-list
|
|
758 (append hilit-chg-list
|
|
759 (list last-category last-face)))
|
|
760 (setq p (cdr p))
|
|
761 (setq n (1+ n)))
|
|
762 (setq hilit-chg-list
|
|
763 (append hilit-chg-list
|
30962
|
764 (list last-category last-face)))))
|
22957
|
765
|
|
766 (defun hilit-chg-bump-change (prop start end)
|
30962
|
767 "Increment (age) the Highlight Changes mode text property."
|
22957
|
768 (let ( new-prop )
|
|
769 (if (eq prop 'hilit-chg-delete)
|
|
770 (setq new-prop (nth 2 hilit-chg-list))
|
30962
|
771 (setq new-prop (nth 2 (member prop hilit-chg-list))))
|
22957
|
772 (if prop
|
|
773 (put-text-property start end 'hilit-chg new-prop)
|
30962
|
774 (message "%d-%d unknown property %s not changed" start end prop))))
|
22957
|
775
|
|
776 ;;;###autoload
|
|
777 (defun highlight-changes-rotate-faces ()
|
|
778 "Rotate the faces used by Highlight Changes mode.
|
|
779
|
30962
|
780 Current changes are displayed in the face described by the first element
|
|
781 of `highlight-changes-face-list', one level older changes are shown in
|
22957
|
782 face described by the second element, and so on. Very old changes remain
|
|
783 shown in the last face in the list.
|
|
784
|
64587
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
785 You can automatically rotate colors when the buffer is saved by adding
|
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
786 this function to `write-file-functions' as a buffer-local value. To do
|
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
787 this, eval the following in the buffer to be saved:
|
30962
|
788
|
64587
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
789 \(add-hook 'write-file-functions 'highlight-changes-rotate-faces nil t)"
|
22957
|
790 (interactive)
|
|
791 ;; If not in active mode do nothing but don't complain because this
|
|
792 ;; may be bound to a hook.
|
|
793 (if (eq highlight-changes-mode 'active)
|
|
794 (let ((after-change-functions nil))
|
|
795 ;; ensure hilit-chg-list is made and up to date
|
|
796 (hilit-chg-make-list)
|
|
797 ;; remove our existing overlays
|
|
798 (hilit-chg-hide-changes)
|
|
799 ;; for each change text property, increment it
|
|
800 (hilit-chg-map-changes 'hilit-chg-bump-change)
|
|
801 ;; and display them all if active
|
|
802 (if (eq highlight-changes-mode 'active)
|
30962
|
803 (hilit-chg-display-changes))))
|
64587
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
804 ;; This always returns nil so it is safe to use in write-file-functions
|
22957
|
805 nil)
|
|
806
|
|
807 ;; ========================================================================
|
54009
|
808 ;; Comparing buffers/files
|
|
809 ;; These use ediff to find the differences.
|
|
810
|
|
811 (defun highlight-markup-buffers
|
|
812 (buf-a file-a buf-b file-b &optional markup-a-only)
|
|
813 "Get differences between two buffers and set highlight changes.
|
|
814 Both buffers are done unless optional parameter MARKUP-A-ONLY
|
|
815 is non-nil."
|
|
816 (save-window-excursion
|
|
817 (let* (change-info
|
|
818 change-a change-b
|
|
819 a-start a-end len-a
|
|
820 b-start b-end len-b
|
|
821 (bufa-modified (buffer-modified-p buf-a))
|
|
822 (bufb-modified (buffer-modified-p buf-b))
|
|
823 (buf-a-read-only (with-current-buffer buf-a buffer-read-only))
|
|
824 (buf-b-read-only (with-current-buffer buf-b buffer-read-only))
|
|
825 temp-a temp-b)
|
|
826 (if (and file-a bufa-modified)
|
|
827 (if (y-or-n-p (format "Save buffer %s? " buf-a))
|
|
828 (with-current-buffer buf-a
|
|
829 (save-buffer)
|
|
830 (setq bufa-modified (buffer-modified-p buf-a)))
|
|
831 (setq file-a nil)))
|
|
832 (or file-a
|
|
833 (setq temp-a (setq file-a (ediff-make-temp-file buf-a nil))))
|
|
834
|
|
835 (if (and file-b bufb-modified)
|
|
836 (if (y-or-n-p (format "Save buffer %s? " buf-b))
|
|
837 (with-current-buffer buf-b
|
|
838 (save-buffer)
|
|
839 (setq bufb-modified (buffer-modified-p buf-b)))
|
|
840 (setq file-b nil)))
|
|
841 (or file-b
|
|
842 (setq temp-b (setq file-b (ediff-make-temp-file buf-b nil))))
|
|
843 (set-buffer buf-a)
|
|
844 (highlight-changes-mode 'active)
|
|
845 (or markup-a-only (with-current-buffer buf-b
|
|
846 (highlight-changes-mode 'active)))
|
|
847 (setq change-info (hilit-chg-get-diff-info buf-a file-a buf-b file-b))
|
|
848
|
|
849
|
|
850 (setq change-a (car change-info))
|
|
851 (setq change-b (car (cdr change-info)))
|
63252
|
852
|
54009
|
853 (hilit-chg-make-list)
|
|
854 (while change-a
|
|
855 (setq a-start (nth 0 (car change-a)))
|
|
856 (setq a-end (nth 1 (car change-a)))
|
|
857 (setq b-start (nth 0 (car change-b)))
|
|
858 (setq b-end (nth 1 (car change-b)))
|
|
859 (setq len-a (- a-end a-start))
|
|
860 (setq len-b (- b-end b-start))
|
|
861 (set-buffer buf-a)
|
|
862 (hilit-chg-set-face-on-change a-start a-end len-b buf-a-read-only)
|
|
863 (or markup-a-only
|
|
864 (with-current-buffer buf-b
|
|
865 (hilit-chg-set-face-on-change b-start b-end len-a
|
|
866 buf-b-read-only)
|
|
867 ))
|
|
868 (setq change-a (cdr change-a))
|
|
869 (setq change-b (cdr change-b)))
|
|
870 (or bufa-modified
|
|
871 (with-current-buffer buf-a (set-buffer-modified-p nil)))
|
|
872 (or bufb-modified
|
|
873 (with-current-buffer buf-b (set-buffer-modified-p nil)))
|
|
874 (if temp-a
|
|
875 (delete-file temp-a))
|
|
876 (if temp-b
|
|
877 (delete-file temp-b)))
|
|
878 ))
|
|
879
|
|
880 ;;;###autoload
|
|
881 (defun highlight-compare-buffers (buf-a buf-b)
|
|
882 "Compare two buffers and highlight the differences.
|
|
883
|
|
884 The default is the current buffer and the one in the next window.
|
|
885
|
|
886 If either buffer is modified and is visiting a file, you are prompted
|
|
887 to save the file.
|
|
888
|
64587
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
889 Unless the buffer is unmodified and visiting a file, the buffer is
|
54009
|
890 written to a temporary file for comparison.
|
|
891
|
|
892 If a buffer is read-only, differences will be highlighted but no property
|
|
893 changes are made, so \\[highlight-changes-next-change] and
|
|
894 \\[highlight-changes-previous-change] will not work."
|
|
895 (interactive
|
63252
|
896 (list
|
54009
|
897 (get-buffer (read-buffer "buffer-a " (current-buffer) t))
|
|
898 (get-buffer
|
|
899 (read-buffer "buffer-b "
|
63252
|
900 (window-buffer (next-window (selected-window))) t))))
|
54009
|
901 (let ((file-a (buffer-file-name buf-a))
|
|
902 (file-b (buffer-file-name buf-b)))
|
|
903 (highlight-markup-buffers buf-a file-a buf-b file-b)
|
|
904 ))
|
22957
|
905
|
|
906 ;;;###autoload
|
23288
|
907 (defun highlight-compare-with-file (file-b)
|
|
908 "Compare this buffer with a file, and highlight differences.
|
22957
|
909
|
30962
|
910 If the buffer has a backup filename, it is used as the default when
|
|
911 this function is called interactively.
|
22957
|
912
|
30962
|
913 If the current buffer is visiting the file being compared against, it
|
|
914 also will have its differences highlighted. Otherwise, the file is
|
|
915 read in temporarily but the buffer is deleted.
|
22957
|
916
|
30962
|
917 If the buffer is read-only, differences will be highlighted but no property
|
|
918 changes are made, so \\[highlight-changes-next-change] and
|
22957
|
919 \\[highlight-changes-previous-change] will not work."
|
|
920 (interactive (list
|
|
921 (read-file-name
|
|
922 "File to compare with? " ;; prompt
|
|
923 "" ;; directory
|
|
924 nil ;; default
|
|
925 'yes ;; must exist
|
54009
|
926 (let ((f (buffer-file-name (current-buffer))))
|
63252
|
927 (if f
|
54009
|
928 (progn
|
|
929 (setq f (make-backup-file-name f))
|
63252
|
930 (or (file-exists-p f)
|
54009
|
931 (setq f nil)))
|
|
932 )
|
|
933 f))))
|
22957
|
934 (let* ((buf-a (current-buffer))
|
|
935 (file-a (buffer-file-name))
|
|
936 (existing-buf (get-file-buffer file-b))
|
|
937 (buf-b (or existing-buf
|
|
938 (find-file-noselect file-b)))
|
54009
|
939 (buf-b-read-only (with-current-buffer buf-b buffer-read-only)))
|
|
940 (highlight-markup-buffers buf-a file-a buf-b file-b (not existing-buf))
|
|
941 (unless existing-buf
|
|
942 (kill-buffer buf-b))
|
|
943 ))
|
22957
|
944
|
|
945
|
|
946 (defun hilit-chg-get-diff-info (buf-a file-a buf-b file-b)
|
|
947 (let ((e nil) x y) ;; e is set by function hilit-chg-get-diff-list-hk
|
|
948 (ediff-setup buf-a file-a buf-b file-b
|
|
949 nil nil ; buf-c file-C
|
|
950 'hilit-chg-get-diff-list-hk
|
|
951 (list (cons 'ediff-job-name 'something))
|
|
952 )
|
|
953 (ediff-with-current-buffer e (ediff-really-quit nil))
|
|
954 (list x y)))
|
|
955
|
|
956
|
|
957 (defun hilit-chg-get-diff-list-hk ()
|
49588
|
958 ;; x and y are dynamically bound by hilit-chg-get-diff-info
|
22957
|
959 ;; which calls this function as a hook
|
|
960 (defvar x) ;; placate the byte-compiler
|
|
961 (defvar y)
|
68738
974d9b214cd3
(hilit-chg-update-all-buffers): Use `mapc' instead of `mapcar'; return nil.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
962 (setq e (current-buffer))
|
22957
|
963 (let ((n 0) extent p va vb a b)
|
68738
974d9b214cd3
(hilit-chg-update-all-buffers): Use `mapc' instead of `mapcar'; return nil.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
964 (setq x nil y nil) ;; x and y are bound by hilit-chg-get-diff-info
|
22957
|
965 (while (< n ediff-number-of-differences)
|
|
966 (ediff-make-fine-diffs n)
|
|
967 (setq va (ediff-get-fine-diff-vector n 'A))
|
|
968 ;; va is a vector if there are fine differences
|
|
969 (if va
|
|
970 (setq a (append va nil))
|
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
971 ;; if not, get the unrefined difference
|
22957
|
972 (setq va (ediff-get-difference n 'A))
|
30962
|
973 (setq a (list (elt va 0))))
|
22957
|
974 ;; a list a list
|
|
975 (setq p a)
|
|
976 (while p
|
|
977 (setq extent (list (overlay-start (car p))
|
|
978 (overlay-end (car p))))
|
|
979 (setq p (cdr p))
|
30962
|
980 (setq x (append x (list extent) )));; while p
|
22957
|
981 ;;
|
|
982 (setq vb (ediff-get-fine-diff-vector n 'B))
|
|
983 ;; vb is a vector
|
|
984 (if vb
|
|
985 (setq b (append vb nil))
|
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
986 ;; if not, get the unrefined difference
|
22957
|
987 (setq vb (ediff-get-difference n 'B))
|
30962
|
988 (setq b (list (elt vb 0))))
|
22957
|
989 ;; b list a list
|
|
990 (setq p b)
|
|
991 (while p
|
|
992 (setq extent (list (overlay-start (car p))
|
|
993 (overlay-end (car p))))
|
|
994 (setq p (cdr p))
|
30962
|
995 (setq y (append y (list extent) )))
|
|
996 (setq n (1+ n)));; while
|
22957
|
997 ;; ediff-quit doesn't work here.
|
|
998 ;; No point in returning a value, since this is a hook function.
|
|
999 ))
|
|
1000
|
|
1001 ;; ======================= automatic stuff ==============
|
|
1002
|
30962
|
1003 ;; Global Highlight Changes mode is modeled after Global Font-lock mode.
|
22957
|
1004 ;; Three hooks are used to gain control. When Global Changes Mode is
|
60902
|
1005 ;; enabled, `find-file-hook' and `change-major-mode-hook' are set.
|
|
1006 ;; `find-file-hook' is called when visiting a file, the new mode is
|
22957
|
1007 ;; known at this time.
|
|
1008 ;; `change-major-mode-hook' is called when a buffer is changing mode.
|
|
1009 ;; This could be because of finding a file in which case
|
60902
|
1010 ;; `find-file-hook' has already been called and has done its work.
|
22957
|
1011 ;; However, it also catches the case where a new mode is being set by
|
|
1012 ;; the user. However, it is called from `kill-all-variables' and at
|
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
1013 ;; this time the mode is the old mode, which is not what we want.
|
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
1014 ;; So, our function temporarily sets `post-command-hook' which will
|
22957
|
1015 ;; be called after the buffer has been completely set up (with the new
|
|
1016 ;; mode). It then removes the `post-command-hook'.
|
|
1017 ;; One other wrinkle - every M-x command runs the `change-major-mode-hook'
|
|
1018 ;; so we ignore this by examining the buffer name.
|
|
1019
|
|
1020
|
|
1021 (defun hilit-chg-major-mode-hook ()
|
30962
|
1022 (add-hook 'post-command-hook 'hilit-chg-post-command-hook))
|
22957
|
1023
|
|
1024 (defun hilit-chg-post-command-hook ()
|
|
1025 ;; This is called after changing a major mode, but also after each
|
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
1026 ;; M-x command, in which case the current buffer is a minibuffer.
|
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
1027 ;; In that case, do not act on it here, but don't turn it off
|
49588
|
1028 ;; either, we will get called here again soon-after.
|
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
1029 ;; Also, don't enable it for other special buffers.
|
22957
|
1030 (if (string-match "^[ *]" (buffer-name))
|
|
1031 nil ;; (message "ignoring this post-command-hook")
|
|
1032 (remove-hook 'post-command-hook 'hilit-chg-post-command-hook)
|
49588
|
1033 ;; The following check isn't necessary, since
|
22957
|
1034 ;; hilit-chg-turn-on-maybe makes this check too.
|
|
1035 (or highlight-changes-mode ;; don't turn it on if it already is
|
30962
|
1036 (hilit-chg-turn-on-maybe highlight-changes-global-initial-state))))
|
22957
|
1037
|
|
1038 (defun hilit-chg-check-global ()
|
|
1039 ;; This is called from the find file hook.
|
|
1040 (hilit-chg-turn-on-maybe highlight-changes-global-initial-state))
|
|
1041
|
|
1042
|
|
1043 ;;;###autoload
|
|
1044 (defun global-highlight-changes (&optional arg)
|
|
1045 "Turn on or off global Highlight Changes mode.
|
|
1046
|
|
1047 When called interactively:
|
|
1048 - if no prefix, toggle global Highlight Changes mode on or off
|
|
1049 - if called with a positive prefix (or just C-u) turn it on in active mode
|
68524
2f9b0e4b3a95
(highlight-changes-initial-state, highlight-changes-global-initial-state):
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
1050 - if called with a zero prefix turn it on in passive mode
|
22957
|
1051 - if called with a negative prefix turn it off
|
|
1052
|
|
1053 When called from a program:
|
|
1054 - if ARG is nil or omitted, turn it off
|
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
1055 - if ARG is `active', turn it on in active mode
|
30962
|
1056 - if ARG is `passive', turn it on in passive mode
|
49588
|
1057 - otherwise just turn it on
|
22957
|
1058
|
|
1059 When global Highlight Changes mode is enabled, Highlight Changes mode is turned
|
|
1060 on for future \"suitable\" buffers (and for \"suitable\" existing buffers if
|
|
1061 variable `highlight-changes-global-changes-existing-buffers' is non-nil).
|
30962
|
1062 \"Suitability\" is determined by variable `highlight-changes-global-modes'."
|
22957
|
1063
|
49588
|
1064 (interactive
|
22957
|
1065 (list
|
|
1066 (cond
|
|
1067 ((null current-prefix-arg)
|
|
1068 ;; no arg => toggle it on/off
|
|
1069 (setq global-highlight-changes (not global-highlight-changes)))
|
|
1070 ;; positive interactive arg - turn it on as active
|
|
1071 ((> (prefix-numeric-value current-prefix-arg) 0)
|
|
1072 (setq global-highlight-changes t)
|
|
1073 'active)
|
|
1074 ;; zero interactive arg - turn it on as passive
|
|
1075 ((= (prefix-numeric-value current-prefix-arg) 0)
|
|
1076 (setq global-highlight-changes t)
|
|
1077 'passive)
|
|
1078 ;; negative interactive arg - turn it off
|
|
1079 (t
|
49588
|
1080 (setq global-highlight-changes nil)
|
22957
|
1081 nil))))
|
|
1082
|
|
1083 (if arg
|
|
1084 (progn
|
|
1085 (if (eq arg 'active)
|
|
1086 (setq highlight-changes-global-initial-state 'active)
|
68738
974d9b214cd3
(hilit-chg-update-all-buffers): Use `mapc' instead of `mapcar'; return nil.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
1087 (if (eq arg 'passive)
|
22957
|
1088 (setq highlight-changes-global-initial-state 'passive)))
|
|
1089 (setq global-highlight-changes t)
|
44740
|
1090 (message "Turning ON Global Highlight Changes mode in %s state"
|
22957
|
1091 highlight-changes-global-initial-state)
|
60902
|
1092 ;; FIXME: Not sure what this was intended to do. --Stef
|
|
1093 ;; (add-hook 'hilit-chg-major-mode-hook 'hilit-chg-major-mode-hook)
|
|
1094 (add-hook 'find-file-hook 'hilit-chg-check-global)
|
22957
|
1095 (if highlight-changes-global-changes-existing-buffers
|
49588
|
1096 (hilit-chg-update-all-buffers
|
30962
|
1097 highlight-changes-global-initial-state)))
|
49588
|
1098
|
44740
|
1099 (message "Turning OFF global Highlight Changes mode")
|
60902
|
1100 ;; FIXME: Not sure what this was intended to do. --Stef
|
|
1101 ;; (remove-hook 'hilit-chg-major-mode-hook 'hilit-chg-major-mode-hook)
|
|
1102 (remove-hook 'post-command-hook 'hilit-chg-post-command-hook)
|
|
1103 (remove-hook 'find-file-hook 'hilit-chg-check-global)
|
22957
|
1104 (if highlight-changes-global-changes-existing-buffers
|
30962
|
1105 (hilit-chg-update-all-buffers nil))))
|
22957
|
1106
|
|
1107
|
|
1108 (defun hilit-chg-turn-on-maybe (value)
|
|
1109 "Turn on Highlight Changes mode if it is appropriate for this buffer.
|
|
1110
|
|
1111 A buffer is appropriate for Highlight Changes mode if all these are true:
|
49588
|
1112 - the buffer is not a special buffer (one whose name begins with
|
64587
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
1113 `*' or ` '),
|
30962
|
1114 - the buffer's mode is suitable as per variable
|
64587
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
1115 `highlight-changes-global-modes',
|
22957
|
1116 - Highlight Changes mode is not already on for this buffer.
|
|
1117
|
49588
|
1118 This function is called from `hilit-chg-update-all-buffers' or
|
30962
|
1119 from `global-highlight-changes' when turning on global Highlight Changes mode."
|
22957
|
1120 (or highlight-changes-mode ; do nothing if already on
|
|
1121 (if
|
|
1122 (cond
|
|
1123 ((null highlight-changes-global-modes)
|
|
1124 nil)
|
|
1125 ((functionp highlight-changes-global-modes)
|
|
1126 (funcall highlight-changes-global-modes))
|
|
1127 ((listp highlight-changes-global-modes)
|
|
1128 (if (eq (car-safe highlight-changes-global-modes) 'not)
|
|
1129 (not (memq major-mode (cdr highlight-changes-global-modes)))
|
|
1130 (memq major-mode highlight-changes-global-modes)))
|
|
1131 (t
|
49588
|
1132 (and
|
68738
974d9b214cd3
(hilit-chg-update-all-buffers): Use `mapc' instead of `mapcar'; return nil.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
1133 (not (string-match "^[ *]" (buffer-name)))
|
30962
|
1134 (buffer-file-name))))
|
22957
|
1135 (progn
|
|
1136 (hilit-chg-set value)
|
30962
|
1137 (run-hooks 'highlight-changes-enable-hook)))))
|
49588
|
1138
|
22957
|
1139
|
|
1140 (defun hilit-chg-turn-off-maybe ()
|
|
1141 (if highlight-changes-mode
|
|
1142 (progn
|
|
1143 (run-hooks 'highlight-changes-disable-hook)
|
|
1144 (hilit-chg-clear))))
|
|
1145
|
|
1146
|
|
1147 (defun hilit-chg-update-all-buffers (value)
|
68738
974d9b214cd3
(hilit-chg-update-all-buffers): Use `mapc' instead of `mapcar'; return nil.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
1148 (mapc
|
22957
|
1149 (function (lambda (buffer)
|
|
1150 (with-current-buffer buffer
|
|
1151 (if value
|
|
1152 (hilit-chg-turn-on-maybe value)
|
|
1153 (hilit-chg-turn-off-maybe))
|
|
1154 )))
|
68738
974d9b214cd3
(hilit-chg-update-all-buffers): Use `mapc' instead of `mapcar'; return nil.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
1155 (buffer-list))
|
974d9b214cd3
(hilit-chg-update-all-buffers): Use `mapc' instead of `mapcar'; return nil.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
1156 nil)
|
22957
|
1157
|
64895
|
1158 ;;;; Desktop support.
|
|
1159
|
|
1160 ;; Called by `desktop-create-buffer' to restore `highlight-changes-mode'.
|
|
1161 (defun hilit-chg-desktop-restore (desktop-buffer-locals)
|
|
1162 (highlight-changes-mode
|
|
1163 (or (cdr (assq 'highlight-changes-mode desktop-buffer-locals)) 1)))
|
|
1164
|
|
1165 (add-to-list 'desktop-minor-mode-handlers
|
|
1166 '(highlight-changes-mode . hilit-chg-desktop-restore))
|
|
1167
|
68752
|
1168 (add-to-list 'desktop-locals-to-save 'highlight-changes-mode)
|
|
1169
|
22957
|
1170 ;; ===================== debug ==================
|
|
1171 ;; For debug & test use:
|
|
1172 ;;
|
|
1173 ;; (defun hilit-chg-debug-show (&optional beg end)
|
|
1174 ;; (interactive)
|
|
1175 ;; (message "--- hilit-chg-debug-show ---")
|
|
1176 ;; (hilit-chg-map-changes '(lambda (prop start end)
|
|
1177 ;; (message "%d-%d: %s" start end prop)
|
|
1178 ;; )
|
|
1179 ;; beg end
|
|
1180 ;; ))
|
49588
|
1181 ;;
|
22957
|
1182 ;; ================== end of debug ===============
|
|
1183
|
|
1184 (provide 'hilit-chg)
|
22958
|
1185
|
59601
|
1186 ;; arch-tag: de00301d-5bad-44da-aa82-e0e010b0c463
|
22957
|
1187 ;;; hilit-chg.el ends here
|