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