]> code.delx.au - gnu-emacs/blob - lisp/hilit-chg.el
(highlight-changes-colors): Rename from `highlight-changes-colours'.
[gnu-emacs] / lisp / hilit-chg.el
1 ;;; hilit-chg.el --- minor mode displaying buffer changes with special face
2
3 ;; Copyright (C) 1998, 2000, 2005 Free Software Foundation, Inc.
4
5 ;; Author: Richard Sharman <rsharman@pobox.com>
6 ;; Keywords: faces
7
8 ;; This file is part of GNU Emacs.
9
10 ;; GNU Emacs is free software; you can redistribute it and/or modify
11 ;; it under the terms of the GNU General Public License as published by
12 ;; the Free Software Foundation; either version 2, or (at your option)
13 ;; any later version.
14
15 ;; GNU Emacs is distributed in the hope that it will be useful,
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18 ;; GNU General Public License for more details.
19
20 ;; You should have received a copy of the GNU General Public License
21 ;; along with GNU Emacs; see the file COPYING. If not, write to the
22 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
23 ;; Boston, MA 02111-1307, USA.
24
25 ;;; Commentary:
26
27 ;; A minor mode: "Highlight Changes mode".
28 ;;
29
30 ;; Highlight Changes mode has 2 submodes: active and passive.
31 ;; When active, changes to the buffer are displayed in a different face.
32 ;; When passive, any existing displayed changes are saved and new ones
33 ;; recorded but are not displayed differently.
34 ;; Why active and passive? Having the changes visible can be handy when you
35 ;; want the information but very distracting otherwise. So, you can keep
36 ;; Highlight Changes mode in passive state while you make your changes, toggle
37 ;; it on to active mode to see them, then toggle it back off to avoid
38 ;; distraction.
39 ;;
40 ;; When active, changes are displayed in the `highlight-changes' face.
41 ;; When text is deleted, the following character is displayed in the
42 ;; `highlight-changes-delete' face.
43 ;;
44 ;;
45 ;; You can "age" different sets of changes by using
46 ;; `highlight-changes-rotate-faces'. This rotates through a series
47 ;; of different faces, so you can distinguish "new" changes from "older"
48 ;; changes. You can customize these "rotated" faces in two ways. You can
49 ;; either explicitly define each face by customizing
50 ;; `highlight-changes-face-list'. If, however, the faces differ from
51 ;; the `highlight-changes' face only in the foreground color, you can simply set
52 ;; `highlight-changes-colors'. If `highlight-changes-face-list' is nil when
53 ;; the faces are required they will be constructed from
54 ;; `highlight-changes-colors'.
55 ;;
56 ;;
57 ;; When a Highlight Changes mode is on (either active or passive) you can go
58 ;; to the next or previous change with `highlight-changes-next-change' and
59 ;; `highlight-changes-previous-change'.
60 ;;
61 ;;
62 ;; You can also use the command highlight-compare-with-file to show changes
63 ;; in this file compared with another file (typically the previous version
64 ;; of the file). The command highlight-compare-buffers can be used to
65 ;; compare two buffers.
66 ;;
67 ;;
68 ;; There are currently three hooks run by `highlight-changes-mode':
69 ;; `highlight-changes-enable-hook' - is run when Highlight Changes mode
70 ;; is initially enabled for a buffer.
71 ;; `highlight-changes-disable-hook' - is run when Highlight Changes mode
72 ;; is turned off.
73 ;; `highlight-changes-toggle-hook' - is run each time `highlight-changes-mode'
74 ;; is called. Typically this is when
75 ;; toggling between active and passive
76 ;; modes. The variable
77 ;; `highlight-changes-mode' contains the new
78 ;; state (`active' or `passive'.)
79 ;;
80 ;;
81 ;;
82 ;; Example usage:
83 ;; (defun my-highlight-changes-enable-hook ()
84 ;; (add-hook 'local-write-file-hooks 'highlight-changes-rotate-faces)
85 ;; )
86 ;;
87 ;; (defun my-highlight-changes-disable-hook ()
88 ;; (remove-hook 'local-write-file-hooks 'highlight-changes-rotate-faces)
89 ;; )
90 ;;
91 ;; (add-hook 'highlight-changes-enable-hook 'my-highlight-changes-enable-hook)
92 ;; (add-hook 'highlight-changes-disable-hook
93 ;; 'my-highlight-changes-disable-hook)
94
95
96 ;; Explicit vs. Implicit
97 ;;
98
99 ;; Normally, Highlight Changes mode is turned on explicitly in a buffer.
100 ;;
101 ;; If you prefer to have it automatically invoked you can do it as
102 ;; follows.
103 ;;
104 ;; 1. Most modes have a major-hook, typically called MODE-hook. You
105 ;; can use `add-hook' to call `highlight-changes-mode'.
106 ;;
107 ;; Example:
108 ;; (add-hook 'c-mode-hook 'highlight-changes-mode)
109 ;;
110 ;; If you want to make it start up in passive mode (regardless of the
111 ;; setting of highlight-changes-initial-state):
112 ;; (add-hook 'emacs-lisp-mode-hook
113 ;; (lambda ()
114 ;; (highlight-changes-mode 'passive)))
115 ;;
116 ;; However, this cannot be done for Fundamental mode for there is no
117 ;; such hook.
118 ;;
119 ;; 2. You can use the function `global-highlight-changes'
120 ;;
121 ;; This function, which is fashioned after the way `global-font-lock' works,
122 ;; toggles on or off global Highlight Changes mode. When activated, it turns
123 ;; on Highlight Changes mode in all "suitable" existing buffers and will turn
124 ;; it on in new "suitable" buffers to be created.
125 ;;
126 ;; A buffer's "suitability" is determined by variable
127 ;; `highlight-changes-global-modes', as follows. If the variable is
128 ;; * nil -- then no buffers are suitable;
129 ;; * a function -- this function is called and the result is used. As
130 ;; an example, if the value is `buffer-file-name' then all buffers
131 ;; who are visiting files are suitable, but others (like dired
132 ;; buffers) are not;
133 ;; * a list -- then the buffer is suitable iff its mode is in the
134 ;; list, except if the first element is `not', in which case the test
135 ;; is reversed (i.e. it is a list of unsuitable modes).
136 ;; * Otherwise, the buffer is suitable if its name does not begin with
137 ;; ` ' or `*' and if `buffer-file-name' returns true.
138 ;;
139
140
141
142 ;; Possible bindings:
143 ;; (global-set-key '[C-right] 'highlight-changes-next-change)
144 ;; (global-set-key '[C-left] 'highlight-changes-previous-change)
145 ;;
146 ;; Other interactive functions (which could be bound if desired):
147 ;; highlight-changes-mode
148 ;; highlight-changes-remove-highlight
149 ;; highlight-changes-rotate-faces
150 ;; highlight-compare-with-file
151 ;; highlight-compare-buffers
152
153 ;;
154 ;; You can automatically rotate faces when the buffer is saved;
155 ;; see function `highlight-changes-rotate-faces' for how to do this.
156 ;;
157
158
159 ;;; Bugs:
160
161 ;; - the next-change and previous-change functions are too literal;
162 ;; they should find the next "real" change, in other words treat
163 ;; consecutive changes as one.
164
165
166 ;;; To do (maybe), notes, ...
167
168 ;; - having different faces for deletion and non-deletion: is it
169 ;; really worth the hassle?
170 ;; - should have better hooks: when should they be run?
171 ;; - highlight-compare-with-file should allow RCS files - e.g. nice to be
172 ;; able to say show changes compared with version 2.1.
173 ;; - Maybe we should have compare-with-buffer as well. (When I tried
174 ;; a while back I ran into a problem with ediff-buffers-internal.)
175
176
177 ;;; History:
178
179 ;; R Sharman (rsharman@pobox.com) Feb 1998:
180 ;; - initial release as change-mode.
181 ;; Jari Aalto <jari.aalto@ntc.nokia.com> Mar 1998
182 ;; - fixes for byte compile errors
183 ;; - use eval-and-compile for autoload
184 ;; Marijn Ros <J.M.Ros@fys.ruu.nl> Mar 98
185 ;; - suggested turning it on by default
186 ;; Eric Ludlam <zappo@gnu.org> Suggested using overlays.
187 ;; July 98
188 ;; - global mode and various stuff added
189 ;; - Changed to use overlays
190 ;; August 98
191 ;; - renamed to Highlight Changes mode.
192 ;; Dec 2003
193 ;; - Use require for ediff stuff
194 ;; - Added highlight-compare-buffers
195
196 ;;; Code:
197
198 (require 'wid-edit)
199
200 ;; ====================== Customization =======================
201 (defgroup highlight-changes nil
202 "Highlight Changes mode."
203 :version "20.4"
204 :group 'faces)
205
206
207 ;; Face information: How the changes appear.
208
209 ;; Defaults for face: red foreground, no change to background,
210 ;; and underlined if a change is because of a deletion.
211 ;; Note: underlining is helpful in that it shows up changes in white space.
212 ;; However, having it set for non-delete changes can be annoying because all
213 ;; indentation on inserts gets underlined (which can look pretty ugly!).
214
215 (defface highlight-changes
216 '((((min-colors 88) (class color)) (:foreground "red1" ))
217 (((class color)) (:foreground "red" ))
218 (t (:inverse-video t)))
219 "Face used for highlighting changes."
220 :group 'highlight-changes)
221 ;; backward-compatibility alias
222 (put 'highlight-changes-face 'face-alias 'highlight-changes)
223
224 ;; This looks pretty ugly, actually. Maybe the underline should be removed.
225 (defface highlight-changes-delete
226 '((((min-colors 88) (class color)) (:foreground "red1" :underline t))
227 (((class color)) (:foreground "red" :underline t))
228 (t (:inverse-video t)))
229 "Face used for highlighting deletions."
230 :group 'highlight-changes)
231 ;; backward-compatibility alias
232 (put 'highlight-changes-delete-face 'face-alias 'highlight-changes-delete)
233
234
235
236 ;; A (not very good) default list of colors to rotate through.
237 ;;
238 (defcustom highlight-changes-colors
239 (if (eq (frame-parameter nil 'background-mode) 'light)
240 ;; defaults for light background:
241 '( "magenta" "blue" "darkgreen" "chocolate" "sienna4" "NavyBlue")
242 ;; defaults for dark background:
243 '("yellow" "magenta" "blue" "maroon" "firebrick" "green4" "DarkOrchid"))
244 "*Colors used by `highlight-changes-rotate-faces'.
245 The newest rotated change will be displayed in the first element of this list,
246 the next older will be in the second element etc.
247
248 This list is used if `highlight-changes-face-list' is nil, otherwise that
249 variable overrides this list. If you only care about foreground
250 colors then use this, if you want fancier faces then set
251 `highlight-changes-face-list'."
252 :type '(repeat color)
253 :group 'highlight-changes)
254
255 (define-obsolete-variable-alias 'highlight-changes-colours
256 'highlight-changes-colors "22.1")
257
258
259 ;; If you invoke highlight-changes-mode with no argument, should it start in
260 ;; active or passive mode?
261 ;;
262 (defcustom highlight-changes-initial-state 'active
263 "*What state (active or passive) `highlight-changes' should start in.
264 This is used when `highlight-changes' is called with no argument.
265 This variable must be set to one of the symbols `active' or `passive'."
266 :type '(choice (const :tag "Active" active)
267 (const :tag "Passive" passive))
268 :group 'highlight-changes)
269
270 (defcustom highlight-changes-global-initial-state 'passive
271 "*What state `global-highlight-changes' should start in.
272 This is used if `global-highlight-changes' is called with no argument.
273 This variable must be set to either `active' or `passive'"
274 :type '(choice (const :tag "Active" active)
275 (const :tag "Passive" passive))
276 :group 'highlight-changes)
277
278 ;; The strings displayed in the mode-line for the minor mode:
279 (defcustom highlight-changes-active-string " +Chg"
280 "*The string used when Highlight Changes mode is in the active state.
281 This should be set to nil if no indication is desired, or to
282 a string with a leading space."
283 :type '(choice string
284 (const :tag "None" nil))
285 :group 'highlight-changes)
286
287 (defcustom highlight-changes-passive-string " -Chg"
288 "*The string used when Highlight Changes mode is in the passive state.
289 This should be set to nil if no indication is desired, or to
290 a string with a leading space."
291 :type '(choice string
292 (const :tag "None" nil))
293 :group 'highlight-changes)
294
295 (defcustom highlight-changes-global-modes t
296 "*Determine whether a buffer is suitable for global Highlight Changes mode.
297
298 A function means call that function to decide: if it returns non-nil,
299 the buffer is suitable.
300
301 A list means the elements are major modes suitable for Highlight
302 Changes mode, or a list whose first element is `not' followed by major
303 modes which are not suitable.
304
305 t means the buffer is suitable if it is visiting a file and its name
306 does not begin with ` ' or `*'.
307
308 A value of nil means no buffers are suitable for `global-highlight-changes'
309 \(effectively disabling the mode).
310
311 Examples:
312 (c-mode c++-mode)
313 means that Highlight Changes mode is turned on for buffers in C and C++
314 modes only."
315 :type '(choice
316 (const :tag "all non-special buffers visiting files" t)
317 (set :menu-tag "specific modes" :tag "modes"
318 :value (not)
319 (const :tag "All except these" not)
320 (repeat :tag "Modes" :inline t (symbol :tag "mode")))
321 (function :menu-tag "determined by function"
322 :value buffer-file-name)
323 (const :tag "none" nil)
324 )
325 :group 'highlight-changes)
326
327 (defvar global-highlight-changes nil)
328
329 (defcustom highlight-changes-global-changes-existing-buffers nil
330 "*If non-nil, toggling global Highlight Changes mode affects existing buffers.
331 Normally, `global-highlight-changes' affects only new buffers (to be
332 created). However, if `highlight-changes-global-changes-existing-buffers'
333 is non-nil, then turning on `global-highlight-changes' will turn on
334 Highlight Changes mode in suitable buffers, and turning the mode off will
335 remove it from existing buffers."
336 :type 'boolean
337 :group 'highlight-changes)
338
339 (defun hilit-chg-cust-fix-changes-face-list (w wc &optional event)
340 ;; When customization function `highlight-changes-face-list' inserts a new
341 ;; face it uses the default face. We don't want the user to modify this
342 ;; face, so we rename the faces in the list on an insert. The rename is
343 ;; actually done by copying the faces so user-defined faces still remain
344 ;; in the same order.
345 ;; The notifying the parent is needed because without it changes to the
346 ;; faces are saved but not to the actual list itself.
347 (let ((old-list (widget-value w)))
348 (if (member 'default old-list)
349 (let
350 ((p (reverse old-list))
351 (n (length old-list))
352 new-name old-name
353 (new-list nil)
354 )
355 (while p
356 (setq old-name (car p))
357 (setq new-name (intern (format "highlight-changes-%d" n)))
358 (if (eq old-name new-name)
359 nil
360 ;; A new face has been inserted: we don't want to modify the
361 ;; default face so copy it. Better, though, (I think) is to
362 ;; make a new face have the same attributes as
363 ;; the `highlight-changes' face.
364 (if (eq old-name 'default)
365 (copy-face 'highlight-changes new-name)
366 (copy-face old-name new-name)
367 ))
368 (setq new-list (append (list new-name) new-list))
369 (setq n (1- n))
370 (setq p (cdr p)))
371 (if (equal new-list (widget-value w))
372 nil ;; (message "notify: no change!")
373 (widget-value-set w new-list)
374 (widget-setup)
375 )
376 )
377 ;; (message "notify: no default here!")
378 ))
379 (let ((parent (widget-get w :parent)))
380 (when parent
381 (widget-apply parent :notify w event))))
382
383
384 (defcustom highlight-changes-face-list nil
385 "*A list of faces used when rotating changes.
386 Normally the variable is initialized to nil and the list is created from
387 `highlight-changes-colors' when needed. However, you can set this variable
388 to any list of faces. You will have to do this if you want faces which
389 don't just differ from the `highlight-changes' face by the foreground color.
390 Otherwise, this list will be constructed when needed from
391 `highlight-changes-colors'."
392 :type '(choice
393 (repeat
394 :notify hilit-chg-cust-fix-changes-face-list
395 face )
396 (const :tag "Derive from highlight-changes-colors" nil)
397 )
398 :group 'highlight-changes)
399
400 ;; ========================================================================
401
402 ;; These shouldn't be changed!
403
404 (defvar highlight-changes-mode nil)
405 (defvar hilit-chg-list nil)
406 (defvar hilit-chg-string " ??")
407 (or (assq 'highlight-changes-mode minor-mode-alist)
408 (setq minor-mode-alist
409 (cons '(highlight-changes-mode hilit-chg-string) minor-mode-alist)
410 ))
411 (make-variable-buffer-local 'highlight-changes-mode)
412 (make-variable-buffer-local 'hilit-chg-string)
413
414
415 (require 'ediff-init)
416 (require 'ediff-util)
417
418
419 ;;; Functions...
420
421 (defun hilit-chg-map-changes (func &optional start-position end-position)
422 "Call function FUNC for each region used by Highlight Changes mode."
423 ;; if start-position is nil, (point-min) is used
424 ;; if end-position is nil, (point-max) is used
425 ;; FUNC is called with 3 params: property start stop
426 (let ((start (or start-position (point-min)))
427 (limit (or end-position (point-max)))
428 prop end)
429 (while (and start (< start limit))
430 (setq prop (get-text-property start 'hilit-chg))
431 (setq end (text-property-not-all start limit 'hilit-chg prop))
432 (if prop
433 (funcall func prop start (or end limit)))
434 (setq start end))))
435
436
437 (defun hilit-chg-display-changes (&optional beg end)
438 "Display face information for Highlight Changes mode.
439
440 An overlay containing a change face is added from the information
441 in the text property of type `hilit-chg'.
442
443 This is the opposite of `hilit-chg-hide-changes'."
444 (hilit-chg-map-changes 'hilit-chg-make-ov beg end))
445
446
447 (defun hilit-chg-make-ov (prop start end)
448 (or prop
449 (error "hilit-chg-make-ov: prop is nil"))
450 ;; for the region make change overlays corresponding to
451 ;; the text property 'hilit-chg
452 (let ((ov (make-overlay start end))
453 face)
454 (if (eq prop 'hilit-chg-delete)
455 (setq face 'highlight-changes-delete)
456 (setq face (nth 1 (member prop hilit-chg-list))))
457 (if face
458 (progn
459 ;; We must mark the face, that is the purpose of the overlay
460 (overlay-put ov 'face face)
461 ;; I don't think we need to set evaporate since we should
462 ;; be controlling them!
463 (overlay-put ov 'evaporate t)
464 ;; We set the change property so we can tell this is one
465 ;; of our overlays (so we don't delete someone else's).
466 (overlay-put ov 'hilit-chg t)
467 )
468 (error "hilit-chg-make-ov: no face for prop: %s" prop))))
469
470 (defun hilit-chg-hide-changes (&optional beg end)
471 "Remove face information for Highlight Changes mode.
472
473 The overlay containing the face is removed, but the text property
474 containing the change information is retained.
475
476 This is the opposite of `hilit-chg-display-changes'."
477 (let ((start (or beg (point-min)))
478 (limit (or end (point-max)))
479 p ov)
480 (setq p (overlays-in start limit))
481 (while p
482 ;; don't delete the overlay if it isn't ours!
483 (if (overlay-get (car p) 'hilit-chg)
484 (delete-overlay (car p)))
485 (setq p (cdr p)))))
486
487 (defun hilit-chg-fixup (beg end)
488 "Fix change overlays in region between BEG and END.
489
490 Ensure the overlays agree with the changes as determined from
491 the text properties of type `hilit-chg' ."
492 ;; Remove or alter overlays in region beg..end
493 (let (ov-start ov-end props q)
494 ;; temp for debugging:
495 ;; (or (eq highlight-changes-mode 'active)
496 ;; (error "hilit-chg-fixup called but Highlight Changes mode not active"))
497 (dolist (ov (overlays-in beg end))
498 ;; Don't alter overlays that are not ours.
499 (when (overlay-get ov 'hilit-chg)
500 (let ((ov-start (overlay-start ov))
501 (ov-end (overlay-end ov)))
502 (if (< ov-start beg)
503 (progn
504 (move-overlay ov ov-start beg)
505 (if (> ov-end end)
506 (progn
507 (setq props (overlay-properties ov))
508 (setq ov (make-overlay end ov-end))
509 (while props
510 (overlay-put ov (car props)(car (cdr props)))
511 (setq props (cdr (cdr props)))))))
512 (if (> ov-end end)
513 (move-overlay ov end ov-end)
514 (delete-overlay ov))))))
515 (hilit-chg-display-changes beg end)))
516
517 ;;;###autoload
518 (defun highlight-changes-remove-highlight (beg end)
519 "Remove the change face from the region between BEG and END.
520 This allows you to manually remove highlighting from uninteresting changes."
521 (interactive "r")
522 (let ((after-change-functions nil))
523 (remove-text-properties beg end '(hilit-chg nil))
524 (hilit-chg-fixup beg end)))
525
526 (defun hilit-chg-set-face-on-change (beg end leng-before
527 &optional no-property-change)
528 "Record changes and optionally display them in a distinctive face.
529 `hilit-chg-set' adds this function to the `after-change-functions' hook."
530 ;;
531 ;; This function is called by the `after-change-functions' hook, which
532 ;; is how we are notified when text is changed.
533 ;; It is also called from `highlight-compare-with-file'.
534 ;;
535 ;; We do NOT want to simply do this if this is an undo command, because
536 ;; otherwise an undone change shows up as changed. While the properties
537 ;; are automatically restored by undo, we must fix up the overlay.
538 (save-match-data
539 (let ((beg-decr 1) (end-incr 1)
540 (type 'hilit-chg)
541 old)
542 (if undo-in-progress
543 (if (eq highlight-changes-mode 'active)
544 (hilit-chg-fixup beg end))
545 (if (and (= beg end) (> leng-before 0))
546 ;; deletion
547 (progn
548 ;; The eolp and bolp tests are a kludge! But they prevent
549 ;; rather nasty looking displays when deleting text at the end
550 ;; of line, such as normal corrections as one is typing and
551 ;; immediately makes a correction, and when deleting first
552 ;; character of a line.
553 ;;; (if (= leng-before 1)
554 ;;; (if (eolp)
555 ;;; (setq beg-decr 0 end-incr 0)
556 ;;; (if (bolp)
557 ;;; (setq beg-decr 0))))
558 ;;; (setq beg (max (- beg beg-decr) (point-min)))
559 (setq end (min (+ end end-incr) (point-max)))
560 (setq type 'hilit-chg-delete))
561 ;; Not a deletion.
562 ;; Most of the time the following is not necessary, but
563 ;; if the current text was marked as a deletion then
564 ;; the old overlay is still in effect, so if we add some
565 ;; text then remove the deletion marking, but set it to
566 ;; changed otherwise its highlighting disappears.
567 (if (eq (get-text-property end 'hilit-chg) 'hilit-chg-delete)
568 (progn
569 (remove-text-properties end (+ end 1) '(hilit-chg nil))
570 (put-text-property end (+ end 1) 'hilit-chg 'hilit-chg)
571 (if (eq highlight-changes-mode 'active)
572 (hilit-chg-fixup beg (+ end 1))))))
573 (unless no-property-change
574 (put-text-property beg end 'hilit-chg type))
575 (if (or (eq highlight-changes-mode 'active) no-property-change)
576 (hilit-chg-make-ov type beg end))))))
577
578 (defun hilit-chg-set (value)
579 "Turn on Highlight Changes mode for this buffer."
580 (setq highlight-changes-mode value)
581 (remove-hook 'after-change-functions 'hilit-chg-set-face-on-change t)
582 (hilit-chg-make-list)
583 (if (eq highlight-changes-mode 'active)
584 (progn
585 (setq hilit-chg-string highlight-changes-active-string)
586 (or buffer-read-only
587 (hilit-chg-display-changes)))
588 ;; mode is passive
589 (setq hilit-chg-string highlight-changes-passive-string)
590 (or buffer-read-only
591 (hilit-chg-hide-changes)))
592 (force-mode-line-update)
593 (add-hook 'after-change-functions 'hilit-chg-set-face-on-change nil t))
594
595 (defun hilit-chg-clear ()
596 "Remove Highlight Changes mode for this buffer.
597 This removes all saved change information."
598 (if buffer-read-only
599 ;; We print the buffer name because this function could be called
600 ;; on many buffers from `global-highlight-changes'.
601 (message "Cannot remove highlighting from read-only mode buffer %s"
602 (buffer-name))
603 (remove-hook 'after-change-functions 'hilit-chg-set-face-on-change t)
604 (let ((after-change-functions nil))
605 (hilit-chg-hide-changes)
606 (hilit-chg-map-changes
607 '(lambda (prop start stop)
608 (remove-text-properties start stop '(hilit-chg nil))))
609 )
610 (setq highlight-changes-mode nil)
611 (force-mode-line-update)
612 ;; If we type: C-u -1 M-x highlight-changes-mode
613 ;; we want to turn it off, but hilit-chg-post-command-hook
614 ;; runs and that turns it back on!
615 (remove-hook 'post-command-hook 'hilit-chg-post-command-hook)))
616
617 ;;;###autoload
618 (defun highlight-changes-mode (&optional arg)
619 "Toggle (or initially set) Highlight Changes mode.
620
621 Without an argument:
622 If Highlight Changes mode is not enabled, then enable it (in either active
623 or passive state as determined by the variable
624 `highlight-changes-initial-state'); otherwise, toggle between active
625 and passive state.
626
627 With an argument ARG:
628 If ARG is positive, set state to active;
629 If ARG is zero, set state to passive;
630 If ARG is negative, disable Highlight Changes mode completely.
631
632 Active state - means changes are shown in a distinctive face.
633 Passive state - means changes are kept and new ones recorded but are
634 not displayed in a different face.
635
636 Functions:
637 \\[highlight-changes-next-change] - move point to beginning of next change
638 \\[highlight-changes-previous-change] - move to beginning of previous change
639 \\[highlight-compare-with-file] - mark text as changed by comparing this
640 buffer with the contents of a file
641 \\[highlight-changes-remove-highlight] - remove the change face from the region
642 \\[highlight-changes-rotate-faces] - rotate different \"ages\" of changes \
643 through
644 various faces.
645
646 Hook variables:
647 `highlight-changes-enable-hook' - when enabling Highlight Changes mode.
648 `highlight-changes-toggle-hook' - when entering active or passive state
649 `highlight-changes-disable-hook' - when turning off Highlight Changes mode."
650 (interactive "P")
651 (if (or (display-color-p)
652 (and (fboundp 'x-display-grayscale-p) (x-display-grayscale-p)))
653 (let ((was-on highlight-changes-mode)
654 (new-highlight-changes-mode
655 (cond
656 ((null arg)
657 ;; no arg => toggle (or set to active initially)
658 (if highlight-changes-mode
659 (if (eq highlight-changes-mode 'active) 'passive 'active)
660 highlight-changes-initial-state))
661 ;; an argument is given
662 ((eq arg 'active)
663 'active)
664 ((eq arg 'passive)
665 'passive)
666 ((> (prefix-numeric-value arg) 0)
667 'active)
668 ((< (prefix-numeric-value arg) 0)
669 nil)
670 (t
671 'passive))))
672 (if new-highlight-changes-mode
673 ;; mode is turned on -- but may be passive
674 (progn
675 (hilit-chg-set new-highlight-changes-mode)
676 (or was-on
677 ;; run highlight-changes-enable-hook once
678 (run-hooks 'highlight-changes-enable-hook))
679 (run-hooks 'highlight-changes-toggle-hook))
680 ;; mode is turned off
681 (run-hooks 'highlight-changes-disable-hook)
682 (hilit-chg-clear)))
683 (message "Highlight Changes mode requires color or grayscale display")))
684
685 ;;;###autoload
686 (defun highlight-changes-next-change ()
687 "Move to the beginning of the next change, if in Highlight Changes mode."
688 (interactive)
689 (if highlight-changes-mode
690 (let ((start (point))
691 prop)
692 (setq prop (get-text-property (point) 'hilit-chg))
693 (if prop
694 ;; we are in a change
695 (setq start (next-single-property-change (point) 'hilit-chg)))
696 (if start
697 (setq start (next-single-property-change start 'hilit-chg)))
698 (if start
699 (goto-char start)
700 (message "no next change")))
701 (message "This buffer is not in Highlight Changes mode.")))
702
703
704 ;;;###autoload
705 (defun highlight-changes-previous-change ()
706 "Move to the beginning of the previous change, if in Highlight Changes mode."
707 (interactive)
708 (if highlight-changes-mode
709 (let ( (start (point)) (prop nil) )
710 (or (bobp)
711 (setq prop (get-text-property (1- (point)) 'hilit-chg)))
712 (if prop
713 ;; we are in a change
714 (setq start (previous-single-property-change (point) 'hilit-chg)))
715 (if start
716 (setq start (previous-single-property-change start 'hilit-chg)))
717 ;; special handling for the case where (point-min) is a change
718 (if start
719 (setq start (or (previous-single-property-change start 'hilit-chg)
720 (if (get-text-property (point-min) 'hilit-chg)
721 (point-min)))))
722 (if start
723 (goto-char start)
724 (message "no previous change")))
725 (message "This buffer is not in Highlight Changes mode.")))
726
727 ;; ========================================================================
728
729 (defun hilit-chg-make-list (&optional force)
730 "Construct `hilit-chg-list' and `highlight-changes-face-list'."
731 ;; Constructs highlight-changes-face-list if necessary,
732 ;; and hilit-chg-list always:
733 ;; Maybe this should always be called when rotating a face
734 ;; so we pick up any changes?
735 (if (or (null highlight-changes-face-list) ; Don't do it if it
736 force) ; already exists unless FORCE non-nil.
737 (let ((p highlight-changes-colors)
738 (n 1) name)
739 (setq highlight-changes-face-list nil)
740 (while p
741 (setq name (intern (format "highlight-changes-%d" n)))
742 (copy-face 'highlight-changes name)
743 (set-face-foreground name (car p))
744 (setq highlight-changes-face-list
745 (append highlight-changes-face-list (list name)))
746 (setq p (cdr p))
747 (setq n (1+ n)))))
748 (setq hilit-chg-list (list 'hilit-chg 'highlight-changes))
749 (let ((p highlight-changes-face-list)
750 (n 1)
751 last-category last-face)
752 (while p
753 (setq last-category (intern (format "change-%d" n)))
754 ;; (setq last-face (intern (format "highlight-changes-%d" n)))
755 (setq last-face (car p))
756 (setq hilit-chg-list
757 (append hilit-chg-list
758 (list last-category last-face)))
759 (setq p (cdr p))
760 (setq n (1+ n)))
761 (setq hilit-chg-list
762 (append hilit-chg-list
763 (list last-category last-face)))))
764
765 (defun hilit-chg-bump-change (prop start end)
766 "Increment (age) the Highlight Changes mode text property."
767 (let ( new-prop )
768 (if (eq prop 'hilit-chg-delete)
769 (setq new-prop (nth 2 hilit-chg-list))
770 (setq new-prop (nth 2 (member prop hilit-chg-list))))
771 (if prop
772 (put-text-property start end 'hilit-chg new-prop)
773 (message "%d-%d unknown property %s not changed" start end prop))))
774
775 ;;;###autoload
776 (defun highlight-changes-rotate-faces ()
777 "Rotate the faces used by Highlight Changes mode.
778
779 Current changes are displayed in the face described by the first element
780 of `highlight-changes-face-list', one level older changes are shown in
781 face described by the second element, and so on. Very old changes remain
782 shown in the last face in the list.
783
784 You can automatically rotate colors when the buffer is saved
785 by adding the following to `local-write-file-hooks', by evaling it in the
786 buffer to be saved):
787
788 \(add-hook 'local-write-file-hooks 'highlight-changes-rotate-faces)"
789 (interactive)
790 ;; If not in active mode do nothing but don't complain because this
791 ;; may be bound to a hook.
792 (if (eq highlight-changes-mode 'active)
793 (let ((after-change-functions nil))
794 ;; ensure hilit-chg-list is made and up to date
795 (hilit-chg-make-list)
796 ;; remove our existing overlays
797 (hilit-chg-hide-changes)
798 ;; for each change text property, increment it
799 (hilit-chg-map-changes 'hilit-chg-bump-change)
800 ;; and display them all if active
801 (if (eq highlight-changes-mode 'active)
802 (hilit-chg-display-changes))))
803 ;; This always returns nil so it is safe to use in
804 ;; local-write-file-hook
805 nil)
806
807 ;; ========================================================================
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)))
852
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
889 Unless the buffer is unmodified and visiting a file, the buffer is
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
896 (list
897 (get-buffer (read-buffer "buffer-a " (current-buffer) t))
898 (get-buffer
899 (read-buffer "buffer-b "
900 (window-buffer (next-window (selected-window))) t))))
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 ))
905
906 ;;;###autoload
907 (defun highlight-compare-with-file (file-b)
908 "Compare this buffer with a file, and highlight differences.
909
910 If the buffer has a backup filename, it is used as the default when
911 this function is called interactively.
912
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.
916
917 If the buffer is read-only, differences will be highlighted but no property
918 changes are made, so \\[highlight-changes-next-change] and
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
926 (let ((f (buffer-file-name (current-buffer))))
927 (if f
928 (progn
929 (setq f (make-backup-file-name f))
930 (or (file-exists-p f)
931 (setq f nil)))
932 )
933 f))))
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)))
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 ))
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 ()
958 ;; x and y are dynamically bound by hilit-chg-get-diff-info
959 ;; which calls this function as a hook
960 (defvar x) ;; placate the byte-compiler
961 (defvar y)
962 (setq e (current-buffer))
963 (let ((n 0) extent p va vb a b)
964 (setq x nil y nil) ;; x and y are bound by hilit-chg-get-diff-info
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))
971 ;; if not, get the unrefined difference
972 (setq va (ediff-get-difference n 'A))
973 (setq a (list (elt va 0))))
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))
980 (setq x (append x (list extent) )));; while p
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))
986 ;; if not, get the unrefined difference
987 (setq vb (ediff-get-difference n 'B))
988 (setq b (list (elt vb 0))))
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))
995 (setq y (append y (list extent) )))
996 (setq n (1+ n)));; while
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
1003 ;; Global Highlight Changes mode is modeled after Global Font-lock mode.
1004 ;; Three hooks are used to gain control. When Global Changes Mode is
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
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
1010 ;; `find-file-hook' has already been called and has done its work.
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
1013 ;; this time the mode is the old mode, which is not what we want.
1014 ;; So, our function temporarily sets `post-command-hook' which will
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 ()
1022 (add-hook 'post-command-hook 'hilit-chg-post-command-hook))
1023
1024 (defun hilit-chg-post-command-hook ()
1025 ;; This is called after changing a major mode, but also after each
1026 ;; M-x command, in which case the current buffer is a minibuffer.
1027 ;; In that case, do not act on it here, but don't turn it off
1028 ;; either, we will get called here again soon-after.
1029 ;; Also, don't enable it for other special buffers.
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)
1033 ;; The following check isn't necessary, since
1034 ;; hilit-chg-turn-on-maybe makes this check too.
1035 (or highlight-changes-mode ;; don't turn it on if it already is
1036 (hilit-chg-turn-on-maybe highlight-changes-global-initial-state))))
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
1050 - if called with a zero prefix turn it on in passive mode
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
1055 - if ARG is `active', turn it on in active mode
1056 - if ARG is `passive', turn it on in passive mode
1057 - otherwise just turn it on
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).
1062 \"Suitability\" is determined by variable `highlight-changes-global-modes'."
1063
1064 (interactive
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
1080 (setq global-highlight-changes nil)
1081 nil))))
1082
1083 (if arg
1084 (progn
1085 (if (eq arg 'active)
1086 (setq highlight-changes-global-initial-state 'active)
1087 (if (eq arg 'passive)
1088 (setq highlight-changes-global-initial-state 'passive)))
1089 (setq global-highlight-changes t)
1090 (message "Turning ON Global Highlight Changes mode in %s state"
1091 highlight-changes-global-initial-state)
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)
1095 (if highlight-changes-global-changes-existing-buffers
1096 (hilit-chg-update-all-buffers
1097 highlight-changes-global-initial-state)))
1098
1099 (message "Turning OFF global Highlight Changes mode")
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)
1104 (if highlight-changes-global-changes-existing-buffers
1105 (hilit-chg-update-all-buffers nil))))
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:
1112 - the buffer is not a special buffer (one whose name begins with
1113 `*' or ` ')
1114 - the buffer's mode is suitable as per variable
1115 `highlight-changes-global-modes'
1116 - Highlight Changes mode is not already on for this buffer.
1117
1118 This function is called from `hilit-chg-update-all-buffers' or
1119 from `global-highlight-changes' when turning on global Highlight Changes mode."
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
1132 (and
1133 (not (string-match "^[ *]" (buffer-name)))
1134 (buffer-file-name))))
1135 (progn
1136 (hilit-chg-set value)
1137 (run-hooks 'highlight-changes-enable-hook)))))
1138
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)
1148 (mapcar
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 )))
1155 (buffer-list)))
1156
1157 ;; ===================== debug ==================
1158 ;; For debug & test use:
1159 ;;
1160 ;; (defun hilit-chg-debug-show (&optional beg end)
1161 ;; (interactive)
1162 ;; (message "--- hilit-chg-debug-show ---")
1163 ;; (hilit-chg-map-changes '(lambda (prop start end)
1164 ;; (message "%d-%d: %s" start end prop)
1165 ;; )
1166 ;; beg end
1167 ;; ))
1168 ;;
1169 ;; ================== end of debug ===============
1170
1171 (provide 'hilit-chg)
1172
1173 ;; arch-tag: de00301d-5bad-44da-aa82-e0e010b0c463
1174 ;;; hilit-chg.el ends here