]> code.delx.au - gnu-emacs/blob - lisp/hilit-chg.el
Merge from emacs--rel--22
[gnu-emacs] / lisp / hilit-chg.el
1 ;;; hilit-chg.el --- minor mode displaying buffer changes with special face
2
3 ;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004,
4 ;; 2005, 2006, 2007 Free Software Foundation, Inc.
5
6 ;; Author: Richard Sharman <rsharman@pobox.com>
7 ;; Keywords: faces
8
9 ;; This file is part of GNU Emacs.
10
11 ;; GNU Emacs is free software; you can redistribute it and/or modify
12 ;; it under the terms of the GNU General Public License as published by
13 ;; the Free Software Foundation; either version 2, or (at your option)
14 ;; any later version.
15
16 ;; GNU Emacs is distributed in the hope that it will be useful,
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19 ;; GNU General Public License for more details.
20
21 ;; You should have received a copy of the GNU General Public License
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the
23 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
24 ;; Boston, MA 02110-1301, USA.
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.
40 ;;
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.
44 ;;
45 ;;
46 ;; You can "age" different sets of changes by using
47 ;; `highlight-changes-rotate-faces'. This rotates through a series
48 ;; of different faces, so you can distinguish "new" changes from "older"
49 ;; changes. You can customize these "rotated" faces in two ways. You can
50 ;; either explicitly define each face by customizing
51 ;; `highlight-changes-face-list'. If, however, the faces differ from
52 ;; the `highlight-changes' face only in the foreground color, you can simply set
53 ;; `highlight-changes-colors'. If `highlight-changes-face-list' is nil when
54 ;; the faces are required they will be constructed from
55 ;; `highlight-changes-colors'.
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 ;;
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
65 ;; of the file). The command highlight-compare-buffers can be used to
66 ;; compare two buffers.
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'.)
80 ;;
81 ;;
82 ;;
83 ;; Example usage:
84 ;; (defun my-highlight-changes-enable-hook ()
85 ;; (add-hook 'write-file-functions 'highlight-changes-rotate-faces nil t)
86 ;; )
87 ;;
88 ;; (defun my-highlight-changes-disable-hook ()
89 ;; (remove-hook 'write-file-functions 'highlight-changes-rotate-faces t)
90 ;; )
91 ;;
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
97 ;; Explicit vs. Implicit
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.
104 ;;
105 ;; 1. Most modes have a major-hook, typically called MODE-hook. You
106 ;; can use `add-hook' to call `highlight-changes-mode'.
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):
113 ;; (add-hook 'emacs-lisp-mode-hook
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 ;;
120 ;; 2. You can use the function `global-highlight-changes'
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
124 ;; on Highlight Changes mode in all "suitable" existing buffers and will turn
125 ;; it on in new "suitable" buffers to be created.
126 ;;
127 ;; A buffer's "suitability" is determined by variable
128 ;; `highlight-changes-global-modes', as follows. If the variable is
129 ;; * nil -- then no buffers are suitable;
130 ;; * a function -- this function is called and the result is used. As
131 ;; an example, if the value is `buffer-file-name' then all buffers
132 ;; who are visiting files are suitable, but others (like dired
133 ;; buffers) are not;
134 ;; * a list -- then the buffer is suitable iff its mode is in the
135 ;; list, except if the first element is `not', in which case the test
136 ;; is reversed (i.e. it is a list of unsuitable modes).
137 ;; * Otherwise, the buffer is suitable if its name does not begin with
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
151 ;; highlight-compare-with-file
152 ;; highlight-compare-buffers
153
154 ;;
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;
163 ;; they should find the next "real" change, in other words treat
164 ;; consecutive changes as one.
165
166
167 ;;; To do (maybe), notes, ...
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?
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.
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
180 ;; R Sharman (rsharman@pobox.com) Feb 1998:
181 ;; - initial release as change-mode.
182 ;; Jari Aalto <jari.aalto@ntc.nokia.com> Mar 1998
183 ;; - fixes for byte compile errors
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
192 ;; - renamed to Highlight Changes mode.
193 ;; Dec 2003
194 ;; - Use require for ediff stuff
195 ;; - Added highlight-compare-buffers
196
197 ;;; Code:
198
199 (require 'wid-edit)
200
201 ;; ====================== Customization =======================
202 (defgroup highlight-changes nil
203 "Highlight Changes mode."
204 :version "20.4"
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.
212 ;; Note: underlining is helpful in that it shows up changes in white space.
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
216 (defface highlight-changes
217 '((((min-colors 88) (class color)) (:foreground "red1"))
218 (((class color)) (:foreground "red" ))
219 (t (:inverse-video t)))
220 "Face used for highlighting changes."
221 :group 'highlight-changes)
222 ;; backward-compatibility alias
223 (put 'highlight-changes-face 'face-alias 'highlight-changes)
224
225 ;; This looks pretty ugly, actually. Maybe the underline should be removed.
226 (defface highlight-changes-delete
227 '((((min-colors 88) (class color)) (:foreground "red1" :underline t))
228 (((class color)) (:foreground "red" :underline t))
229 (t (:inverse-video t)))
230 "Face used for highlighting deletions."
231 :group 'highlight-changes)
232 ;; backward-compatibility alias
233 (put 'highlight-changes-delete-face 'face-alias 'highlight-changes-delete)
234
235
236
237 ;; A (not very good) default list of colors to rotate through.
238 ;;
239 (defcustom highlight-changes-colors
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"))
245 "*Colors used by `highlight-changes-rotate-faces'.
246 The newest rotated change will be displayed in the first element of this list,
247 the next older will be in the second element etc.
248
249 This list is used if `highlight-changes-face-list' is nil, otherwise that
250 variable overrides this list. If you only care about foreground
251 colors then use this, if you want fancier faces then set
252 `highlight-changes-face-list'."
253 :type '(repeat color)
254 :group 'highlight-changes)
255
256 (define-obsolete-variable-alias 'highlight-changes-colours
257 'highlight-changes-colors "22.1")
258
259
260 ;; If you invoke highlight-changes-mode with no argument, should it start in
261 ;; active or passive mode?
262 ;;
263 (defcustom highlight-changes-initial-state 'active
264 "*What state (active or passive) Highlight Changes mode should start in.
265 This is used when `highlight-changes-mode' is called with no argument.
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))
269 :group 'highlight-changes)
270
271 (defcustom highlight-changes-global-initial-state 'passive
272 "*What state global Highlight Changes mode should start in.
273 This is used if `global-highlight-changes' is called with no argument.
274 This variable must be set to either `active' or `passive'."
275 :type '(choice (const :tag "Active" active)
276 (const :tag "Passive" passive))
277 :group 'highlight-changes)
278
279 ;; The strings displayed in the mode-line for the minor mode:
280 (defcustom highlight-changes-active-string " +Chg"
281 "*The string used when Highlight Changes mode is in the active state.
282 This should be set to nil if no indication is desired, or to
283 a string with a leading space."
284 :type '(choice string
285 (const :tag "None" nil))
286 :group 'highlight-changes)
287
288 (defcustom highlight-changes-passive-string " -Chg"
289 "*The string used when Highlight Changes mode is in the passive state.
290 This should be set to nil if no indication is desired, or to
291 a string with a leading space."
292 :type '(choice string
293 (const :tag "None" nil))
294 :group 'highlight-changes)
295
296 (defcustom highlight-changes-global-modes t
297 "*Determine whether a buffer is suitable for global Highlight Changes mode.
298
299 A function means call that function to decide: if it returns non-nil,
300 the buffer is suitable.
301
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.
305
306 A value of t means the buffer is suitable if it is visiting a file and
307 its name does not begin with ` ' or `*'.
308
309 A value of nil means no buffers are suitable for `global-highlight-changes'
310 \(effectively disabling the mode).
311
312 Example:
313 (c-mode c++-mode)
314 means that Highlight Changes mode is turned on for buffers in C and C++
315 modes only."
316 :type '(choice
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 )
326 :group 'highlight-changes)
327
328 (defvar global-highlight-changes nil)
329
330 (defcustom highlight-changes-global-changes-existing-buffers nil
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
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
342 ;; face it uses the default face. We don't want the user to modify this
343 ;; face, so we rename the faces in the list on an insert. The rename is
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))
358 (setq new-name (intern (format "highlight-changes-%d" n)))
359 (if (eq old-name new-name)
360 nil
361 ;; A new face has been inserted: we don't want to modify the
362 ;; default face so copy it. Better, though, (I think) is to
363 ;; make a new face have the same attributes as
364 ;; the `highlight-changes' face.
365 (if (eq old-name 'default)
366 (copy-face 'highlight-changes new-name)
367 (copy-face old-name new-name)
368 ))
369 (setq new-list (append (list new-name) new-list))
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
382 (widget-apply parent :notify w event))))
383
384
385 (defcustom highlight-changes-face-list nil
386 "*A list of faces used when rotating changes.
387 Normally the variable is initialized to nil and the list is created from
388 `highlight-changes-colors' when needed. However, you can set this variable
389 to any list of faces. You will have to do this if you want faces which
390 don't just differ from the `highlight-changes' face by the foreground color.
391 Otherwise, this list will be constructed when needed from
392 `highlight-changes-colors'."
393 :type '(choice
394 (repeat
395 :notify hilit-chg-cust-fix-changes-face-list
396 face )
397 (const :tag "Derive from highlight-changes-colors" nil)
398 )
399 :group 'highlight-changes)
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
416 (require 'ediff-init)
417 (require 'ediff-util)
418
419
420 ;;; Functions...
421
422 (defun hilit-chg-map-changes (func &optional start-position end-position)
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)))
435 (setq start end))))
436
437
438 (defun hilit-chg-display-changes (&optional beg end)
439 "Display face information for Highlight Changes mode.
440
441 An overlay containing a change face is added from the information
442 in the text property of type `hilit-chg'.
443
444 This is the opposite of `hilit-chg-hide-changes'."
445 (hilit-chg-map-changes 'hilit-chg-make-ov beg end))
446
447
448 (defun hilit-chg-make-ov (prop start end)
449 (or prop
450 (error "hilit-chg-make-ov: prop is nil"))
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)
456 (setq face 'highlight-changes-delete)
457 (setq face (nth 1 (member prop hilit-chg-list))))
458 (if face
459 (progn
460 ;; We must mark the face, that is the purpose of the overlay
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 )
469 (error "hilit-chg-make-ov: no face for prop: %s" prop))))
470
471 (defun hilit-chg-hide-changes (&optional beg end)
472 "Remove face information for Highlight Changes mode.
473
474 The overlay containing the face is removed, but the text property
475 containing the change information is retained.
476
477 This is the opposite of `hilit-chg-display-changes'."
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)))
486 (setq p (cdr p)))))
487
488 (defun hilit-chg-fixup (beg end)
489 "Fix change overlays in region between BEG and END.
490
491 Ensure the overlays agree with the changes as determined from
492 the text properties of type `hilit-chg'."
493 ;; Remove or alter overlays in region beg..end
494 (let (ov-start ov-end props q)
495 ;; temp for debugging:
496 ;; (or (eq highlight-changes-mode 'active)
497 ;; (error "hilit-chg-fixup called but Highlight Changes mode not active"))
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)))))))
513 (if (> ov-end end)
514 (move-overlay ov end ov-end)
515 (delete-overlay ov))))))
516 (hilit-chg-display-changes beg end)))
517
518 ;;;###autoload
519 (defun highlight-changes-remove-highlight (beg end)
520 "Remove the change face from the region between BEG and END.
521 This allows you to manually remove highlighting from uninteresting changes."
522 (interactive "r")
523 (let ((after-change-functions nil))
524 (remove-text-properties beg end '(hilit-chg nil))
525 (hilit-chg-fixup beg end)))
526
527 (defun hilit-chg-set-face-on-change (beg end leng-before
528 &optional no-property-change)
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.
534 ;; It is also called from `highlight-compare-with-file'.
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
538 ;; are automatically restored by undo, we must fix up the overlay.
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
550 ;; rather nasty looking displays when deleting text at the end
551 ;; of line, such as normal corrections as one is typing and
552 ;; immediately makes a correction, and when deleting first
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.
563 ;; Most of the time the following is not necessary, but
564 ;; if the current text was marked as a deletion then
565 ;; the old overlay is still in effect, so if we add some
566 ;; text then remove the deletion marking, but set it to
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))))))
574 (unless no-property-change
575 (put-text-property beg end 'hilit-chg type))
576 (if (or (eq highlight-changes-mode 'active) no-property-change)
577 (hilit-chg-make-ov type beg end))))))
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
592 (hilit-chg-hide-changes)))
593 (force-mode-line-update)
594 (add-hook 'after-change-functions 'hilit-chg-set-face-on-change nil t))
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)
607 (hilit-chg-map-changes
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
614 ;; we want to turn it off, but hilit-chg-post-command-hook
615 ;; runs and that turns it back on!
616 (remove-hook 'post-command-hook 'hilit-chg-post-command-hook)))
617
618 ;;;###autoload
619 (defun highlight-changes-mode (&optional arg)
620 "Toggle (or initially set) Highlight Changes mode.
621
622 Without an argument:
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.
627
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.
632
633 Active state - means changes are shown in a distinctive face.
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
639 \\[highlight-changes-previous-change] - move to beginning of previous change
640 \\[highlight-compare-with-file] - mark text as changed by comparing this
641 buffer with the contents of a file
642 \\[highlight-changes-remove-highlight] - remove the change face from the region
643 \\[highlight-changes-rotate-faces] - rotate different \"ages\" of changes \
644 through
645 various faces
646
647 Hook variables:
648 `highlight-changes-enable-hook' - when enabling Highlight Changes mode
649 `highlight-changes-toggle-hook' - when entering active or passive state
650 `highlight-changes-disable-hook' - when turning off Highlight Changes mode"
651 (interactive "P")
652 (if (or (display-color-p)
653 (and (fboundp 'x-display-grayscale-p) (x-display-grayscale-p)))
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)
665 ((eq arg 'passive)
666 'passive)
667 ((> (prefix-numeric-value arg) 0)
668 'active)
669 ((< (prefix-numeric-value arg) 0)
670 nil)
671 (t
672 'passive))))
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)
683 (hilit-chg-clear)))
684 (message "Highlight Changes mode requires color or grayscale display")))
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)
731 "Construct `hilit-chg-list' and `highlight-changes-face-list'."
732 ;; Constructs highlight-changes-face-list if necessary,
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.
738 (let ((p highlight-changes-colors)
739 (n 1) name)
740 (setq highlight-changes-face-list nil)
741 (while p
742 (setq name (intern (format "highlight-changes-%d" n)))
743 (copy-face 'highlight-changes name)
744 (set-face-foreground name (car p))
745 (setq highlight-changes-face-list
746 (append highlight-changes-face-list (list name)))
747 (setq p (cdr p))
748 (setq n (1+ n)))))
749 (setq hilit-chg-list (list 'hilit-chg 'highlight-changes))
750 (let ((p highlight-changes-face-list)
751 (n 1)
752 last-category last-face)
753 (while p
754 (setq last-category (intern (format "change-%d" n)))
755 ;; (setq last-face (intern (format "highlight-changes-%d" n)))
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
764 (list last-category last-face)))))
765
766 (defun hilit-chg-bump-change (prop start end)
767 "Increment (age) the Highlight Changes mode text property."
768 (let ( new-prop )
769 (if (eq prop 'hilit-chg-delete)
770 (setq new-prop (nth 2 hilit-chg-list))
771 (setq new-prop (nth 2 (member prop hilit-chg-list))))
772 (if prop
773 (put-text-property start end 'hilit-chg new-prop)
774 (message "%d-%d unknown property %s not changed" start end prop))))
775
776 ;;;###autoload
777 (defun highlight-changes-rotate-faces ()
778 "Rotate the faces used by Highlight Changes mode.
779
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
782 face described by the second element, and so on. Very old changes remain
783 shown in the last face in the list.
784
785 You can automatically rotate colors when the buffer is saved by adding
786 this function to `write-file-functions' as a buffer-local value. To do
787 this, eval the following in the buffer to be saved:
788
789 \(add-hook 'write-file-functions 'highlight-changes-rotate-faces nil t)"
790 (interactive)
791 ;; If not in active mode do nothing but don't complain because this
792 ;; may be bound to a hook.
793 (when (eq highlight-changes-mode 'active)
794 (let ((modified (buffer-modified-p))
795 (inhibit-modification-hooks t))
796 ;; The `modified' related code tries to combine two goals: (1) Record the
797 ;; rotation in `buffer-undo-list' and (2) avoid setting the modified flag
798 ;; of the current buffer due to the rotation. We do this by inserting (in
799 ;; `buffer-undo-list') entries restoring buffer-modified-p to nil before
800 ;; and after the entry for the rotation.
801 (unless modified
802 ;; Install the "before" entry.
803 (setq buffer-undo-list
804 (cons '(apply restore-buffer-modified-p nil)
805 buffer-undo-list)))
806 (unwind-protect
807 (progn
808 ;; ensure hilit-chg-list is made and up to date
809 (hilit-chg-make-list)
810 ;; remove our existing overlays
811 (hilit-chg-hide-changes)
812 ;; for each change text property, increment it
813 (hilit-chg-map-changes 'hilit-chg-bump-change)
814 ;; and display them all if active
815 (if (eq highlight-changes-mode 'active)
816 (hilit-chg-display-changes)))
817 (unless modified
818 ;; Install the "after" entry.
819 (setq buffer-undo-list
820 (cons '(apply restore-buffer-modified-p nil)
821 buffer-undo-list))
822
823 (restore-buffer-modified-p nil)))))
824 ;; This always returns nil so it is safe to use in write-file-functions
825 nil)
826
827 ;; ========================================================================
828 ;; Comparing buffers/files
829 ;; These use ediff to find the differences.
830
831 (defun highlight-markup-buffers
832 (buf-a file-a buf-b file-b &optional markup-a-only)
833 "Get differences between two buffers and set highlight changes.
834 Both buffers are done unless optional parameter MARKUP-A-ONLY
835 is non-nil."
836 (save-window-excursion
837 (let* (change-info
838 change-a change-b
839 a-start a-end len-a
840 b-start b-end len-b
841 (bufa-modified (buffer-modified-p buf-a))
842 (bufb-modified (buffer-modified-p buf-b))
843 (buf-a-read-only (with-current-buffer buf-a buffer-read-only))
844 (buf-b-read-only (with-current-buffer buf-b buffer-read-only))
845 temp-a temp-b)
846 (if (and file-a bufa-modified)
847 (if (y-or-n-p (format "Save buffer %s? " buf-a))
848 (with-current-buffer buf-a
849 (save-buffer)
850 (setq bufa-modified (buffer-modified-p buf-a)))
851 (setq file-a nil)))
852 (or file-a
853 (setq temp-a (setq file-a (ediff-make-temp-file buf-a nil))))
854
855 (if (and file-b bufb-modified)
856 (if (y-or-n-p (format "Save buffer %s? " buf-b))
857 (with-current-buffer buf-b
858 (save-buffer)
859 (setq bufb-modified (buffer-modified-p buf-b)))
860 (setq file-b nil)))
861 (or file-b
862 (setq temp-b (setq file-b (ediff-make-temp-file buf-b nil))))
863 (set-buffer buf-a)
864 (highlight-changes-mode 'active)
865 (or markup-a-only (with-current-buffer buf-b
866 (highlight-changes-mode 'active)))
867 (setq change-info (hilit-chg-get-diff-info buf-a file-a buf-b file-b))
868
869
870 (setq change-a (car change-info))
871 (setq change-b (car (cdr change-info)))
872
873 (hilit-chg-make-list)
874 (while change-a
875 (setq a-start (nth 0 (car change-a)))
876 (setq a-end (nth 1 (car change-a)))
877 (setq b-start (nth 0 (car change-b)))
878 (setq b-end (nth 1 (car change-b)))
879 (setq len-a (- a-end a-start))
880 (setq len-b (- b-end b-start))
881 (set-buffer buf-a)
882 (hilit-chg-set-face-on-change a-start a-end len-b buf-a-read-only)
883 (or markup-a-only
884 (with-current-buffer buf-b
885 (hilit-chg-set-face-on-change b-start b-end len-a
886 buf-b-read-only)
887 ))
888 (setq change-a (cdr change-a))
889 (setq change-b (cdr change-b)))
890 (or bufa-modified
891 (with-current-buffer buf-a (set-buffer-modified-p nil)))
892 (or bufb-modified
893 (with-current-buffer buf-b (set-buffer-modified-p nil)))
894 (if temp-a
895 (delete-file temp-a))
896 (if temp-b
897 (delete-file temp-b)))
898 ))
899
900 ;;;###autoload
901 (defun highlight-compare-buffers (buf-a buf-b)
902 "Compare two buffers and highlight the differences.
903
904 The default is the current buffer and the one in the next window.
905
906 If either buffer is modified and is visiting a file, you are prompted
907 to save the file.
908
909 Unless the buffer is unmodified and visiting a file, the buffer is
910 written to a temporary file for comparison.
911
912 If a buffer is read-only, differences will be highlighted but no property
913 changes are made, so \\[highlight-changes-next-change] and
914 \\[highlight-changes-previous-change] will not work."
915 (interactive
916 (list
917 (get-buffer (read-buffer "buffer-a " (current-buffer) t))
918 (get-buffer
919 (read-buffer "buffer-b "
920 (window-buffer (next-window (selected-window))) t))))
921 (let ((file-a (buffer-file-name buf-a))
922 (file-b (buffer-file-name buf-b)))
923 (highlight-markup-buffers buf-a file-a buf-b file-b)
924 ))
925
926 ;;;###autoload
927 (defun highlight-compare-with-file (file-b)
928 "Compare this buffer with a file, and highlight differences.
929
930 If the buffer has a backup filename, it is used as the default when
931 this function is called interactively.
932
933 If the current buffer is visiting the file being compared against, it
934 also will have its differences highlighted. Otherwise, the file is
935 read in temporarily but the buffer is deleted.
936
937 If the buffer is read-only, differences will be highlighted but no property
938 changes are made, so \\[highlight-changes-next-change] and
939 \\[highlight-changes-previous-change] will not work."
940 (interactive (list
941 (read-file-name
942 "File to compare with? " ;; prompt
943 "" ;; directory
944 nil ;; default
945 'yes ;; must exist
946 (let ((f (buffer-file-name (current-buffer))))
947 (if f
948 (progn
949 (setq f (make-backup-file-name f))
950 (or (file-exists-p f)
951 (setq f nil)))
952 )
953 f))))
954 (let* ((buf-a (current-buffer))
955 (file-a (buffer-file-name))
956 (existing-buf (get-file-buffer file-b))
957 (buf-b (or existing-buf
958 (find-file-noselect file-b)))
959 (buf-b-read-only (with-current-buffer buf-b buffer-read-only)))
960 (highlight-markup-buffers buf-a file-a buf-b file-b (not existing-buf))
961 (unless existing-buf
962 (kill-buffer buf-b))
963 ))
964
965
966 (defun hilit-chg-get-diff-info (buf-a file-a buf-b file-b)
967 (let ((e nil) x y) ;; e is set by function hilit-chg-get-diff-list-hk
968 (ediff-setup buf-a file-a buf-b file-b
969 nil nil ; buf-c file-C
970 'hilit-chg-get-diff-list-hk
971 (list (cons 'ediff-job-name 'something))
972 )
973 (ediff-with-current-buffer e (ediff-really-quit nil))
974 (list x y)))
975
976
977 (defun hilit-chg-get-diff-list-hk ()
978 ;; x and y are dynamically bound by hilit-chg-get-diff-info
979 ;; which calls this function as a hook
980 (defvar x) ;; placate the byte-compiler
981 (defvar y)
982 (setq e (current-buffer))
983 (let ((n 0) extent p va vb a b)
984 (setq x nil y nil) ;; x and y are bound by hilit-chg-get-diff-info
985 (while (< n ediff-number-of-differences)
986 (ediff-make-fine-diffs n)
987 (setq va (ediff-get-fine-diff-vector n 'A))
988 ;; va is a vector if there are fine differences
989 (if va
990 (setq a (append va nil))
991 ;; if not, get the unrefined difference
992 (setq va (ediff-get-difference n 'A))
993 (setq a (list (elt va 0))))
994 ;; a list a list
995 (setq p a)
996 (while p
997 (setq extent (list (overlay-start (car p))
998 (overlay-end (car p))))
999 (setq p (cdr p))
1000 (setq x (append x (list extent) )));; while p
1001 ;;
1002 (setq vb (ediff-get-fine-diff-vector n 'B))
1003 ;; vb is a vector
1004 (if vb
1005 (setq b (append vb nil))
1006 ;; if not, get the unrefined difference
1007 (setq vb (ediff-get-difference n 'B))
1008 (setq b (list (elt vb 0))))
1009 ;; b list a list
1010 (setq p b)
1011 (while p
1012 (setq extent (list (overlay-start (car p))
1013 (overlay-end (car p))))
1014 (setq p (cdr p))
1015 (setq y (append y (list extent) )))
1016 (setq n (1+ n)));; while
1017 ;; ediff-quit doesn't work here.
1018 ;; No point in returning a value, since this is a hook function.
1019 ))
1020
1021 ;; ======================= automatic stuff ==============
1022
1023 ;; Global Highlight Changes mode is modeled after Global Font-lock mode.
1024 ;; Three hooks are used to gain control. When Global Changes Mode is
1025 ;; enabled, `find-file-hook' and `change-major-mode-hook' are set.
1026 ;; `find-file-hook' is called when visiting a file, the new mode is
1027 ;; known at this time.
1028 ;; `change-major-mode-hook' is called when a buffer is changing mode.
1029 ;; This could be because of finding a file in which case
1030 ;; `find-file-hook' has already been called and has done its work.
1031 ;; However, it also catches the case where a new mode is being set by
1032 ;; the user. However, it is called from `kill-all-variables' and at
1033 ;; this time the mode is the old mode, which is not what we want.
1034 ;; So, our function temporarily sets `post-command-hook' which will
1035 ;; be called after the buffer has been completely set up (with the new
1036 ;; mode). It then removes the `post-command-hook'.
1037 ;; One other wrinkle - every M-x command runs the `change-major-mode-hook'
1038 ;; so we ignore this by examining the buffer name.
1039
1040
1041 (defun hilit-chg-major-mode-hook ()
1042 (add-hook 'post-command-hook 'hilit-chg-post-command-hook))
1043
1044 (defun hilit-chg-post-command-hook ()
1045 ;; This is called after changing a major mode, but also after each
1046 ;; M-x command, in which case the current buffer is a minibuffer.
1047 ;; In that case, do not act on it here, but don't turn it off
1048 ;; either, we will get called here again soon-after.
1049 ;; Also, don't enable it for other special buffers.
1050 (if (string-match "^[ *]" (buffer-name))
1051 nil ;; (message "ignoring this post-command-hook")
1052 (remove-hook 'post-command-hook 'hilit-chg-post-command-hook)
1053 ;; The following check isn't necessary, since
1054 ;; hilit-chg-turn-on-maybe makes this check too.
1055 (or highlight-changes-mode ;; don't turn it on if it already is
1056 (hilit-chg-turn-on-maybe highlight-changes-global-initial-state))))
1057
1058 (defun hilit-chg-check-global ()
1059 ;; This is called from the find file hook.
1060 (hilit-chg-turn-on-maybe highlight-changes-global-initial-state))
1061
1062
1063 ;;;###autoload
1064 (defun global-highlight-changes (&optional arg)
1065 "Turn on or off global Highlight Changes mode.
1066
1067 When called interactively:
1068 - if no prefix, toggle global Highlight Changes mode on or off
1069 - if called with a positive prefix (or just C-u) turn it on in active mode
1070 - if called with a zero prefix turn it on in passive mode
1071 - if called with a negative prefix turn it off
1072
1073 When called from a program:
1074 - if ARG is nil or omitted, turn it off
1075 - if ARG is `active', turn it on in active mode
1076 - if ARG is `passive', turn it on in passive mode
1077 - otherwise just turn it on
1078
1079 When global Highlight Changes mode is enabled, Highlight Changes mode is turned
1080 on for future \"suitable\" buffers (and for \"suitable\" existing buffers if
1081 variable `highlight-changes-global-changes-existing-buffers' is non-nil).
1082 \"Suitability\" is determined by variable `highlight-changes-global-modes'."
1083
1084 (interactive
1085 (list
1086 (cond
1087 ((null current-prefix-arg)
1088 ;; no arg => toggle it on/off
1089 (setq global-highlight-changes (not global-highlight-changes)))
1090 ;; positive interactive arg - turn it on as active
1091 ((> (prefix-numeric-value current-prefix-arg) 0)
1092 (setq global-highlight-changes t)
1093 'active)
1094 ;; zero interactive arg - turn it on as passive
1095 ((= (prefix-numeric-value current-prefix-arg) 0)
1096 (setq global-highlight-changes t)
1097 'passive)
1098 ;; negative interactive arg - turn it off
1099 (t
1100 (setq global-highlight-changes nil)
1101 nil))))
1102
1103 (if arg
1104 (progn
1105 (if (eq arg 'active)
1106 (setq highlight-changes-global-initial-state 'active)
1107 (if (eq arg 'passive)
1108 (setq highlight-changes-global-initial-state 'passive)))
1109 (setq global-highlight-changes t)
1110 (message "Turning ON Global Highlight Changes mode in %s state"
1111 highlight-changes-global-initial-state)
1112 ;; FIXME: Not sure what this was intended to do. --Stef
1113 ;; (add-hook 'hilit-chg-major-mode-hook 'hilit-chg-major-mode-hook)
1114 (add-hook 'find-file-hook 'hilit-chg-check-global)
1115 (if highlight-changes-global-changes-existing-buffers
1116 (hilit-chg-update-all-buffers
1117 highlight-changes-global-initial-state)))
1118
1119 (message "Turning OFF global Highlight Changes mode")
1120 ;; FIXME: Not sure what this was intended to do. --Stef
1121 ;; (remove-hook 'hilit-chg-major-mode-hook 'hilit-chg-major-mode-hook)
1122 (remove-hook 'post-command-hook 'hilit-chg-post-command-hook)
1123 (remove-hook 'find-file-hook 'hilit-chg-check-global)
1124 (if highlight-changes-global-changes-existing-buffers
1125 (hilit-chg-update-all-buffers nil))))
1126
1127
1128 (defun hilit-chg-turn-on-maybe (value)
1129 "Turn on Highlight Changes mode if it is appropriate for this buffer.
1130
1131 A buffer is appropriate for Highlight Changes mode if all these are true:
1132 - the buffer is not a special buffer (one whose name begins with
1133 `*' or ` '),
1134 - the buffer's mode is suitable as per variable
1135 `highlight-changes-global-modes',
1136 - Highlight Changes mode is not already on for this buffer.
1137
1138 This function is called from `hilit-chg-update-all-buffers' or
1139 from `global-highlight-changes' when turning on global Highlight Changes mode."
1140 (or highlight-changes-mode ; do nothing if already on
1141 (if
1142 (cond
1143 ((null highlight-changes-global-modes)
1144 nil)
1145 ((functionp highlight-changes-global-modes)
1146 (funcall highlight-changes-global-modes))
1147 ((listp highlight-changes-global-modes)
1148 (if (eq (car-safe highlight-changes-global-modes) 'not)
1149 (not (memq major-mode (cdr highlight-changes-global-modes)))
1150 (memq major-mode highlight-changes-global-modes)))
1151 (t
1152 (and
1153 (not (string-match "^[ *]" (buffer-name)))
1154 (buffer-file-name))))
1155 (progn
1156 (hilit-chg-set value)
1157 (run-hooks 'highlight-changes-enable-hook)))))
1158
1159
1160 (defun hilit-chg-turn-off-maybe ()
1161 (if highlight-changes-mode
1162 (progn
1163 (run-hooks 'highlight-changes-disable-hook)
1164 (hilit-chg-clear))))
1165
1166
1167 (defun hilit-chg-update-all-buffers (value)
1168 (mapc
1169 (function (lambda (buffer)
1170 (with-current-buffer buffer
1171 (if value
1172 (hilit-chg-turn-on-maybe value)
1173 (hilit-chg-turn-off-maybe))
1174 )))
1175 (buffer-list))
1176 nil)
1177
1178 ;;;; Desktop support.
1179
1180 ;; Called by `desktop-create-buffer' to restore `highlight-changes-mode'.
1181 (defun hilit-chg-desktop-restore (desktop-buffer-locals)
1182 (highlight-changes-mode
1183 (or (cdr (assq 'highlight-changes-mode desktop-buffer-locals)) 1)))
1184
1185 (add-to-list 'desktop-minor-mode-handlers
1186 '(highlight-changes-mode . hilit-chg-desktop-restore))
1187
1188 (add-to-list 'desktop-locals-to-save 'highlight-changes-mode)
1189
1190 ;; ===================== debug ==================
1191 ;; For debug & test use:
1192 ;;
1193 ;; (defun hilit-chg-debug-show (&optional beg end)
1194 ;; (interactive)
1195 ;; (message "--- hilit-chg-debug-show ---")
1196 ;; (hilit-chg-map-changes '(lambda (prop start end)
1197 ;; (message "%d-%d: %s" start end prop)
1198 ;; )
1199 ;; beg end
1200 ;; ))
1201 ;;
1202 ;; ================== end of debug ===============
1203
1204 (provide 'hilit-chg)
1205
1206 ;; arch-tag: de00301d-5bad-44da-aa82-e0e010b0c463
1207 ;;; hilit-chg.el ends here