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