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