(top-level): Don't require comint when compiling.
[emacs.git] / lisp / hilit-chg.el
blobe567e37354b23b0481fda94cab04e2a1918d0eb7
1 ;;; hilit-chg.el --- minor mode displaying buffer changes with special face
3 ;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004,
4 ;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
6 ;; Author: Richard Sharman <rsharman@pobox.com>
7 ;; Keywords: faces
9 ;; This file is part of GNU Emacs.
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.
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.
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.
26 ;;; Commentary:
28 ;; A minor mode: "Highlight Changes mode".
31 ;; Highlight Changes mode has 2 submodes: active and passive.
32 ;; When active, changes to the buffer are displayed in a different face.
33 ;; When passive, any existing displayed changes are saved and new ones
34 ;; recorded but are not displayed differently.
35 ;; Why active and passive? Having the changes visible can be handy when you
36 ;; want the information but very distracting otherwise. So, you can keep
37 ;; Highlight Changes mode in passive state while you make your changes, toggle
38 ;; it on to active mode to see them, then toggle it back off to avoid
39 ;; distraction.
41 ;; When active, changes are displayed in the `highlight-changes' face.
42 ;; When text is deleted, the following character is displayed in the
43 ;; `highlight-changes-delete' face.
46 ;; You can "age" different sets of changes by using
47 ;; `highlight-changes-rotate-faces'. This rotates through a series
48 ;; of different faces, so you can distinguish "new" changes from "older"
49 ;; changes. You can customize these "rotated" faces in two ways. You can
50 ;; either explicitly define each face by customizing
51 ;; `highlight-changes-face-list'. If, however, the faces differ from
52 ;; the `highlight-changes' face only in the foreground color, you can simply set
53 ;; `highlight-changes-colors'. If `highlight-changes-face-list' is nil when
54 ;; the faces are required they will be constructed from
55 ;; `highlight-changes-colors'.
58 ;; When a Highlight Changes mode is on (either active or passive) you can go
59 ;; to the next or previous change with `highlight-changes-next-change' and
60 ;; `highlight-changes-previous-change'.
63 ;; You can also use the command highlight-compare-with-file to show changes
64 ;; in this file compared with another file (typically the previous version
65 ;; of the file). The command highlight-compare-buffers can be used to
66 ;; compare two buffers.
69 ;; There are currently three hooks run by `highlight-changes-mode':
70 ;; `highlight-changes-enable-hook' - is run when Highlight Changes mode
71 ;; is initially enabled for a buffer.
72 ;; `highlight-changes-disable-hook' - is run when Highlight Changes mode
73 ;; is turned off.
74 ;; `highlight-changes-toggle-hook' - is run each time `highlight-changes-mode'
75 ;; is called. Typically this is when
76 ;; toggling between active and passive
77 ;; modes. The variable
78 ;; `highlight-changes-mode' contains the new
79 ;; state (`active' or `passive'.)
83 ;; Example usage:
84 ;; (defun my-highlight-changes-enable-hook ()
85 ;; (add-hook 'write-file-functions 'highlight-changes-rotate-faces nil t)
86 ;; )
88 ;; (defun my-highlight-changes-disable-hook ()
89 ;; (remove-hook 'write-file-functions 'highlight-changes-rotate-faces t)
90 ;; )
92 ;; (add-hook 'highlight-changes-enable-hook 'my-highlight-changes-enable-hook)
93 ;; (add-hook 'highlight-changes-disable-hook
94 ;; 'my-highlight-changes-disable-hook)
97 ;; Explicit vs. Implicit
100 ;; Normally, Highlight Changes mode is turned on explicitly in a buffer.
102 ;; If you prefer to have it automatically invoked you can do it as
103 ;; follows.
105 ;; 1. Most modes have a major-hook, typically called MODE-hook. You
106 ;; can use `add-hook' to call `highlight-changes-mode'.
108 ;; Example:
109 ;; (add-hook 'c-mode-hook 'highlight-changes-mode)
111 ;; If you want to make it start up in passive mode (regardless of the
112 ;; setting of highlight-changes-initial-state):
113 ;; (add-hook 'emacs-lisp-mode-hook
114 ;; (lambda ()
115 ;; (highlight-changes-mode 'passive)))
117 ;; However, this cannot be done for Fundamental mode for there is no
118 ;; such hook.
120 ;; 2. You can use the function `global-highlight-changes'
122 ;; This function, which is fashioned after the way `global-font-lock' works,
123 ;; toggles on or off global Highlight Changes mode. When activated, it turns
124 ;; on Highlight Changes mode in all "suitable" existing buffers and will turn
125 ;; it on in new "suitable" buffers to be created.
127 ;; A buffer's "suitability" is determined by variable
128 ;; `highlight-changes-global-modes', as follows. If the variable is
129 ;; * nil -- then no buffers are suitable;
130 ;; * a function -- this function is called and the result is used. As
131 ;; an example, if the value is `buffer-file-name' then all buffers
132 ;; who are visiting files are suitable, but others (like dired
133 ;; buffers) are not;
134 ;; * a list -- then the buffer is suitable if its mode is in the
135 ;; list, except if the first element is `not', in which case the test
136 ;; is reversed (i.e. it is a list of unsuitable modes).
137 ;; * Otherwise, the buffer is suitable if its name does not begin with
138 ;; ` ' or `*' and if `buffer-file-name' returns true.
143 ;; Possible bindings:
144 ;; (global-set-key '[C-right] 'highlight-changes-next-change)
145 ;; (global-set-key '[C-left] 'highlight-changes-previous-change)
147 ;; Other interactive functions (which could be bound if desired):
148 ;; highlight-changes-mode
149 ;; highlight-changes-remove-highlight
150 ;; highlight-changes-rotate-faces
151 ;; highlight-compare-with-file
152 ;; highlight-compare-buffers
155 ;; You can automatically rotate faces when the buffer is saved;
156 ;; see function `highlight-changes-rotate-faces' for how to do this.
160 ;;; Bugs:
162 ;; - the next-change and previous-change functions are too literal;
163 ;; they should find the next "real" change, in other words treat
164 ;; consecutive changes as one.
167 ;;; To do (maybe), notes, ...
169 ;; - having different faces for deletion and non-deletion: is it
170 ;; really worth the hassle?
171 ;; - should have better hooks: when should they be run?
172 ;; - highlight-compare-with-file should allow RCS files - e.g. nice to be
173 ;; able to say show changes compared with version 2.1.
174 ;; - Maybe we should have compare-with-buffer as well. (When I tried
175 ;; a while back I ran into a problem with ediff-buffers-internal.)
178 ;;; History:
180 ;; R Sharman (rsharman@pobox.com) Feb 1998:
181 ;; - initial release as change-mode.
182 ;; Jari Aalto <jari.aalto@ntc.nokia.com> Mar 1998
183 ;; - fixes for byte compile errors
184 ;; - use eval-and-compile for autoload
185 ;; Marijn Ros <J.M.Ros@fys.ruu.nl> Mar 98
186 ;; - suggested turning it on by default
187 ;; Eric Ludlam <zappo@gnu.org> Suggested using overlays.
188 ;; July 98
189 ;; - global mode and various stuff added
190 ;; - Changed to use overlays
191 ;; August 98
192 ;; - renamed to Highlight Changes mode.
193 ;; Dec 2003
194 ;; - Use require for ediff stuff
195 ;; - Added highlight-compare-buffers
197 ;;; Code:
199 (require 'wid-edit)
201 ;; ====================== Customization =======================
202 (defgroup highlight-changes nil
203 "Highlight Changes mode."
204 :version "20.4"
205 :group 'faces)
208 ;; Face information: How the changes appear.
210 ;; Defaults for face: red foreground, no change to background,
211 ;; and underlined if a change is because of a deletion.
212 ;; Note: underlining is helpful in that it shows up changes in white space.
213 ;; However, having it set for non-delete changes can be annoying because all
214 ;; indentation on inserts gets underlined (which can look pretty ugly!).
216 (defface highlight-changes
217 '((((min-colors 88) (class color)) (:foreground "red1"))
218 (((class color)) (:foreground "red" ))
219 (t (:inverse-video t)))
220 "Face used for highlighting changes."
221 :group 'highlight-changes)
222 ;; backward-compatibility alias
223 (put 'highlight-changes-face 'face-alias 'highlight-changes)
225 ;; This looks pretty ugly, actually. Maybe the underline should be removed.
226 (defface highlight-changes-delete
227 '((((min-colors 88) (class color)) (:foreground "red1" :underline t))
228 (((class color)) (:foreground "red" :underline t))
229 (t (:inverse-video t)))
230 "Face used for highlighting deletions."
231 :group 'highlight-changes)
232 ;; backward-compatibility alias
233 (put 'highlight-changes-delete-face 'face-alias 'highlight-changes-delete)
237 ;; A (not very good) default list of colors to rotate through.
239 (defcustom highlight-changes-colors
240 (if (eq (frame-parameter nil 'background-mode) 'light)
241 ;; defaults for light background:
242 '( "magenta" "blue" "darkgreen" "chocolate" "sienna4" "NavyBlue")
243 ;; defaults for dark background:
244 '("yellow" "magenta" "blue" "maroon" "firebrick" "green4" "DarkOrchid"))
245 "Colors used by `highlight-changes-rotate-faces'.
246 The newest rotated change will be displayed in the first element of this list,
247 the next older will be in the second element etc.
249 This list is used if `highlight-changes-face-list' is nil, otherwise that
250 variable overrides this list. If you only care about foreground
251 colors then use this, if you want fancier faces then set
252 `highlight-changes-face-list'."
253 :type '(repeat color)
254 :group 'highlight-changes)
256 (define-obsolete-variable-alias 'highlight-changes-colours
257 'highlight-changes-colors "22.1")
260 ;; If you invoke highlight-changes-mode with no argument, should it start in
261 ;; active or passive mode?
263 (defcustom highlight-changes-initial-state 'active
264 "What state (active or passive) Highlight Changes mode should start in.
265 This is used when `highlight-changes-mode' is called with no argument.
266 This variable must be set to one of the symbols `active' or `passive'."
267 :type '(choice (const :tag "Active" active)
268 (const :tag "Passive" passive))
269 :group 'highlight-changes)
271 (defcustom highlight-changes-global-initial-state 'passive
272 "What state global Highlight Changes mode should start in.
273 This is used if `global-highlight-changes' is called with no argument.
274 This variable must be set to either `active' or `passive'."
275 :type '(choice (const :tag "Active" active)
276 (const :tag "Passive" passive))
277 :group 'highlight-changes)
279 ;; The strings displayed in the mode-line for the minor mode:
280 (defcustom highlight-changes-active-string " +Chg"
281 "The string used when Highlight Changes mode is in the active state.
282 This should be set to nil if no indication is desired, or to
283 a string with a leading space."
284 :type '(choice string
285 (const :tag "None" nil))
286 :group 'highlight-changes)
288 (defcustom highlight-changes-passive-string " -Chg"
289 "The string used when Highlight Changes mode is in the passive state.
290 This should be set to nil if no indication is desired, or to
291 a string with a leading space."
292 :type '(choice string
293 (const :tag "None" nil))
294 :group 'highlight-changes)
296 (defcustom highlight-changes-global-modes t
297 "Determine whether a buffer is suitable for global Highlight Changes mode.
299 A function means call that function to decide: if it returns non-nil,
300 the buffer is suitable.
302 A list means the elements are major modes suitable for Highlight
303 Changes mode, or a list whose first element is `not' followed by major
304 modes which are not suitable.
306 A value of t means the buffer is suitable if it is visiting a file and
307 its name does not begin with ` ' or `*'.
309 A value of nil means no buffers are suitable for `global-highlight-changes'
310 \(effectively disabling the mode).
312 Example:
313 (c-mode c++-mode)
314 means that Highlight Changes mode is turned on for buffers in C and C++
315 modes only."
316 :type '(choice
317 (const :tag "all non-special buffers visiting files" t)
318 (set :menu-tag "specific modes" :tag "modes"
319 :value (not)
320 (const :tag "All except these" not)
321 (repeat :tag "Modes" :inline t (symbol :tag "mode")))
322 (function :menu-tag "determined by function"
323 :value buffer-file-name)
324 (const :tag "none" nil)
326 :group 'highlight-changes)
328 (defvar global-highlight-changes nil)
330 (defcustom highlight-changes-global-changes-existing-buffers nil
331 "If non-nil, toggling global Highlight Changes mode affects existing buffers.
332 Normally, `global-highlight-changes' affects only new buffers (to be
333 created). However, if `highlight-changes-global-changes-existing-buffers'
334 is non-nil, then turning on `global-highlight-changes' will turn on
335 Highlight Changes mode in suitable buffers, and turning the mode off will
336 remove it from existing buffers."
337 :type 'boolean
338 :group 'highlight-changes)
340 (defun hilit-chg-cust-fix-changes-face-list (w wc &optional event)
341 ;; When customization function `highlight-changes-face-list' inserts a new
342 ;; face it uses the default face. We don't want the user to modify this
343 ;; face, so we rename the faces in the list on an insert. The rename is
344 ;; actually done by copying the faces so user-defined faces still remain
345 ;; in the same order.
346 ;; The notifying the parent is needed because without it changes to the
347 ;; faces are saved but not to the actual list itself.
348 (let ((old-list (widget-value w)))
349 (if (member 'default old-list)
350 (let
351 ((p (reverse old-list))
352 (n (length old-list))
353 new-name old-name
354 (new-list nil)
356 (while p
357 (setq old-name (car p))
358 (setq new-name (intern (format "highlight-changes-%d" n)))
359 (if (eq old-name new-name)
361 ;; A new face has been inserted: we don't want to modify the
362 ;; default face so copy it. Better, though, (I think) is to
363 ;; make a new face have the same attributes as
364 ;; the `highlight-changes' face.
365 (if (eq old-name 'default)
366 (copy-face 'highlight-changes new-name)
367 (copy-face old-name new-name)
369 (setq new-list (append (list new-name) new-list))
370 (setq n (1- n))
371 (setq p (cdr p)))
372 (if (equal new-list (widget-value w))
373 nil ;; (message "notify: no change!")
374 (widget-value-set w new-list)
375 (widget-setup)
378 ;; (message "notify: no default here!")
380 (let ((parent (widget-get w :parent)))
381 (when parent
382 (widget-apply parent :notify w event))))
385 (defcustom highlight-changes-face-list nil
386 "A list of faces used when rotating changes.
387 Normally the variable is initialized to nil and the list is created from
388 `highlight-changes-colors' when needed. However, you can set this variable
389 to any list of faces. You will have to do this if you want faces which
390 don't just differ from the `highlight-changes' face by the foreground color.
391 Otherwise, this list will be constructed when needed from
392 `highlight-changes-colors'."
393 :type '(choice
394 (repeat
395 :notify hilit-chg-cust-fix-changes-face-list
396 face )
397 (const :tag "Derive from highlight-changes-colors" nil)
399 :group 'highlight-changes)
401 ;; ========================================================================
403 ;; These shouldn't be changed!
405 (defvar highlight-changes-mode nil)
406 (defvar hilit-chg-list nil)
407 (defvar hilit-chg-string " ??")
408 (or (assq 'highlight-changes-mode minor-mode-alist)
409 (setq minor-mode-alist
410 (cons '(highlight-changes-mode hilit-chg-string) minor-mode-alist)
412 (make-variable-buffer-local 'highlight-changes-mode)
413 (make-variable-buffer-local 'hilit-chg-string)
416 (require 'ediff-init)
417 (require 'ediff-util)
420 ;;; Functions...
422 (defun hilit-chg-map-changes (func &optional start-position end-position)
423 "Call function FUNC for each region used by Highlight Changes mode."
424 ;; if start-position is nil, (point-min) is used
425 ;; if end-position is nil, (point-max) is used
426 ;; FUNC is called with 3 params: property start stop
427 (let ((start (or start-position (point-min)))
428 (limit (or end-position (point-max)))
429 prop end)
430 (while (and start (< start limit))
431 (setq prop (get-text-property start 'hilit-chg))
432 (setq end (text-property-not-all start limit 'hilit-chg prop))
433 (if prop
434 (funcall func prop start (or end limit)))
435 (setq start end))))
438 (defun hilit-chg-display-changes (&optional beg end)
439 "Display face information for Highlight Changes mode.
441 An overlay containing a change face is added from the information
442 in the text property of type `hilit-chg'.
444 This is the opposite of `hilit-chg-hide-changes'."
445 (hilit-chg-map-changes 'hilit-chg-make-ov beg end))
448 (defun hilit-chg-make-ov (prop start end)
449 (or prop
450 (error "hilit-chg-make-ov: prop is nil"))
451 ;; for the region make change overlays corresponding to
452 ;; the text property 'hilit-chg
453 (let ((ov (make-overlay start end))
454 (face (if (eq prop 'hilit-chg-delete)
455 'highlight-changes-delete
456 (nth 1 (member prop hilit-chg-list)))))
457 (if face
458 (progn
459 ;; We must mark the face, that is the purpose of the overlay
460 (overlay-put ov 'face face)
461 ;; I don't think we need to set evaporate since we should
462 ;; be controlling them!
463 (overlay-put ov 'evaporate t)
464 ;; We set the change property so we can tell this is one
465 ;; of our overlays (so we don't delete someone else's).
466 (overlay-put ov 'hilit-chg t)
468 (error "hilit-chg-make-ov: no face for prop: %s" prop))))
470 (defun hilit-chg-hide-changes (&optional beg end)
471 "Remove face information for Highlight Changes mode.
473 The overlay containing the face is removed, but the text property
474 containing the change information is retained.
476 This is the opposite of `hilit-chg-display-changes'."
477 (let ((start (or beg (point-min)))
478 (limit (or end (point-max)))
479 p ov)
480 (setq p (overlays-in start limit))
481 (while p
482 ;; don't delete the overlay if it isn't ours!
483 (if (overlay-get (car p) 'hilit-chg)
484 (delete-overlay (car p)))
485 (setq p (cdr p)))))
487 (defun hilit-chg-fixup (beg end)
488 "Fix change overlays in region between BEG and END.
490 Ensure the overlays agree with the changes as determined from
491 the text properties of type `hilit-chg'."
492 ;; Remove or alter overlays in region beg..end
493 (remove-overlays beg end 'hilit-chg t)
494 (hilit-chg-display-changes beg end))
496 ;; Inspired by font-lock. Something like this should be moved to subr.el.
497 (defmacro highlight-save-buffer-state (&rest body)
498 "Bind variables according to VARLIST and eval BODY restoring buffer state."
499 (declare (indent 0) (debug t))
500 (let ((modified (make-symbol "modified")))
501 `(let* ((,modified (buffer-modified-p))
502 (inhibit-modification-hooks t)
503 deactivate-mark
504 ;; So we don't check the file's mtime.
505 buffer-file-name
506 buffer-file-truename)
507 (progn
508 ,@body)
509 (unless ,modified
510 (restore-buffer-modified-p nil)))))
512 ;;;###autoload
513 (defun highlight-changes-remove-highlight (beg end)
514 "Remove the change face from the region between BEG and END.
515 This allows you to manually remove highlighting from uninteresting changes."
516 (interactive "r")
517 (highlight-save-buffer-state
518 (remove-text-properties beg end '(hilit-chg nil))
519 (hilit-chg-fixup beg end)))
521 (defun hilit-chg-set-face-on-change (beg end leng-before
522 &optional no-property-change)
523 "Record changes and optionally display them in a distinctive face.
524 `hilit-chg-set' adds this function to the `after-change-functions' hook."
526 ;; This function is called by the `after-change-functions' hook, which
527 ;; is how we are notified when text is changed.
528 ;; It is also called from `highlight-compare-with-file'.
530 ;; We do NOT want to simply do this if this is an undo command, because
531 ;; otherwise an undone change shows up as changed. While the properties
532 ;; are automatically restored by undo, we must fix up the overlay.
533 (save-match-data
534 (let ((beg-decr 1) (end-incr 1)
535 (type 'hilit-chg)
536 old)
537 (if undo-in-progress
538 (if (eq highlight-changes-mode 'active)
539 (hilit-chg-fixup beg end))
540 (highlight-save-buffer-state
541 (if (and (= beg end) (> leng-before 0))
542 ;; deletion
543 (progn
544 ;; The eolp and bolp tests are a kludge! But they prevent
545 ;; rather nasty looking displays when deleting text at the end
546 ;; of line, such as normal corrections as one is typing and
547 ;; immediately makes a correction, and when deleting first
548 ;; character of a line.
549 ;; (if (= leng-before 1)
550 ;; (if (eolp)
551 ;; (setq beg-decr 0 end-incr 0)
552 ;; (if (bolp)
553 ;; (setq beg-decr 0))))
554 ;; (setq beg (max (- beg beg-decr) (point-min)))
555 (setq end (min (+ end end-incr) (point-max)))
556 (setq type 'hilit-chg-delete))
557 ;; Not a deletion.
558 ;; Most of the time the following is not necessary, but
559 ;; if the current text was marked as a deletion then
560 ;; the old overlay is still in effect, so if we add some
561 ;; text then remove the deletion marking, but set it to
562 ;; changed otherwise its highlighting disappears.
563 (if (eq (get-text-property end 'hilit-chg) 'hilit-chg-delete)
564 (progn
565 (put-text-property end (+ end 1) 'hilit-chg 'hilit-chg)
566 (if (eq highlight-changes-mode 'active)
567 (hilit-chg-fixup beg (+ end 1))))))
568 (unless no-property-change
569 (put-text-property beg end 'hilit-chg type))
570 (if (or (eq highlight-changes-mode 'active) no-property-change)
571 (hilit-chg-make-ov type beg end)))))))
573 (defun hilit-chg-set (value)
574 "Turn on Highlight Changes mode for this buffer."
575 (setq highlight-changes-mode value)
576 (remove-hook 'after-change-functions 'hilit-chg-set-face-on-change t)
577 (hilit-chg-make-list)
578 (if (eq highlight-changes-mode 'active)
579 (progn
580 (setq hilit-chg-string highlight-changes-active-string)
581 (or buffer-read-only
582 (hilit-chg-display-changes)))
583 ;; mode is passive
584 (setq hilit-chg-string highlight-changes-passive-string)
585 (or buffer-read-only
586 (hilit-chg-hide-changes)))
587 (force-mode-line-update)
588 (add-hook 'after-change-functions 'hilit-chg-set-face-on-change nil t))
590 (defun hilit-chg-clear ()
591 "Remove Highlight Changes mode for this buffer.
592 This removes all saved change information."
593 (if buffer-read-only
594 ;; We print the buffer name because this function could be called
595 ;; on many buffers from `global-highlight-changes'.
596 (message "Cannot remove highlighting from read-only mode buffer %s"
597 (buffer-name))
598 (remove-hook 'after-change-functions 'hilit-chg-set-face-on-change t)
599 (highlight-save-buffer-state
600 (hilit-chg-hide-changes)
601 (hilit-chg-map-changes
602 (lambda (prop start stop)
603 (remove-text-properties start stop '(hilit-chg nil)))))
604 (setq highlight-changes-mode nil)
605 (force-mode-line-update)
606 ;; If we type: C-u -1 M-x highlight-changes-mode
607 ;; we want to turn it off, but hilit-chg-post-command-hook
608 ;; runs and that turns it back on!
609 (remove-hook 'post-command-hook 'hilit-chg-post-command-hook)))
611 ;;;###autoload
612 (defun highlight-changes-mode (&optional arg)
613 "Toggle (or initially set) Highlight Changes mode.
615 Without an argument:
616 If Highlight Changes mode is not enabled, then enable it (in either active
617 or passive state as determined by the variable
618 `highlight-changes-initial-state'); otherwise, toggle between active
619 and passive state.
621 With an argument ARG:
622 If ARG is positive, set state to active;
623 If ARG is zero, set state to passive;
624 If ARG is negative, disable Highlight Changes mode completely.
626 Active state - means changes are shown in a distinctive face.
627 Passive state - means changes are kept and new ones recorded but are
628 not displayed in a different face.
630 Functions:
631 \\[highlight-changes-next-change] - move point to beginning of next change
632 \\[highlight-changes-previous-change] - move to beginning of previous change
633 \\[highlight-compare-with-file] - mark text as changed by comparing this
634 buffer with the contents of a file
635 \\[highlight-changes-remove-highlight] - remove the change face from the region
636 \\[highlight-changes-rotate-faces] - rotate different \"ages\" of changes \
637 through
638 various faces
640 Hook variables:
641 `highlight-changes-enable-hook' - when enabling Highlight Changes mode
642 `highlight-changes-toggle-hook' - when entering active or passive state
643 `highlight-changes-disable-hook' - when turning off Highlight Changes mode"
644 (interactive "P")
645 (if (or (display-color-p)
646 (and (fboundp 'x-display-grayscale-p) (x-display-grayscale-p)))
647 (let ((was-on highlight-changes-mode)
648 (new-highlight-changes-mode
649 (cond
650 ((null arg)
651 ;; no arg => toggle (or set to active initially)
652 (if highlight-changes-mode
653 (if (eq highlight-changes-mode 'active) 'passive 'active)
654 highlight-changes-initial-state))
655 ;; an argument is given
656 ((eq arg 'active)
657 'active)
658 ((eq arg 'passive)
659 'passive)
660 ((> (prefix-numeric-value arg) 0)
661 'active)
662 ((< (prefix-numeric-value arg) 0)
663 nil)
665 'passive))))
666 (if new-highlight-changes-mode
667 ;; mode is turned on -- but may be passive
668 (progn
669 (hilit-chg-set new-highlight-changes-mode)
670 (or was-on
671 ;; run highlight-changes-enable-hook once
672 (run-hooks 'highlight-changes-enable-hook))
673 (run-hooks 'highlight-changes-toggle-hook))
674 ;; mode is turned off
675 (run-hooks 'highlight-changes-disable-hook)
676 (hilit-chg-clear)))
677 (message "Highlight Changes mode requires color or grayscale display")))
679 ;;;###autoload
680 (defun highlight-changes-next-change ()
681 "Move to the beginning of the next change, if in Highlight Changes mode."
682 (interactive)
683 (if highlight-changes-mode
684 (let ((start (point))
685 prop)
686 (setq prop (get-text-property (point) 'hilit-chg))
687 (if prop
688 ;; we are in a change
689 (setq start (next-single-property-change (point) 'hilit-chg)))
690 (if start
691 (setq start (next-single-property-change start 'hilit-chg)))
692 (if start
693 (goto-char start)
694 (message "no next change")))
695 (message "This buffer is not in Highlight Changes mode.")))
698 ;;;###autoload
699 (defun highlight-changes-previous-change ()
700 "Move to the beginning of the previous change, if in Highlight Changes mode."
701 (interactive)
702 (if highlight-changes-mode
703 (let ( (start (point)) (prop nil) )
704 (or (bobp)
705 (setq prop (get-text-property (1- (point)) 'hilit-chg)))
706 (if prop
707 ;; we are in a change
708 (setq start (previous-single-property-change (point) 'hilit-chg)))
709 (if start
710 (setq start (previous-single-property-change start 'hilit-chg)))
711 ;; special handling for the case where (point-min) is a change
712 (if start
713 (setq start (or (previous-single-property-change start 'hilit-chg)
714 (if (get-text-property (point-min) 'hilit-chg)
715 (point-min)))))
716 (if start
717 (goto-char start)
718 (message "no previous change")))
719 (message "This buffer is not in Highlight Changes mode.")))
721 ;; ========================================================================
723 (defun hilit-chg-make-list (&optional force)
724 "Construct `hilit-chg-list' and `highlight-changes-face-list'."
725 ;; Constructs highlight-changes-face-list if necessary,
726 ;; and hilit-chg-list always:
727 ;; Maybe this should always be called when rotating a face
728 ;; so we pick up any changes?
729 (if (or (null highlight-changes-face-list) ; Don't do it if it
730 force) ; already exists unless FORCE non-nil.
731 (let ((p highlight-changes-colors)
732 (n 1) name)
733 (setq highlight-changes-face-list nil)
734 (while p
735 (setq name (intern (format "highlight-changes-%d" n)))
736 (copy-face 'highlight-changes name)
737 (set-face-foreground name (car p))
738 (setq highlight-changes-face-list
739 (append highlight-changes-face-list (list name)))
740 (setq p (cdr p))
741 (setq n (1+ n)))))
742 (setq hilit-chg-list (list 'hilit-chg 'highlight-changes))
743 (let ((p highlight-changes-face-list)
744 (n 1)
745 last-category last-face)
746 (while p
747 (setq last-category (intern (format "change-%d" n)))
748 ;; (setq last-face (intern (format "highlight-changes-%d" n)))
749 (setq last-face (car p))
750 (setq hilit-chg-list
751 (append hilit-chg-list
752 (list last-category last-face)))
753 (setq p (cdr p))
754 (setq n (1+ n)))
755 (setq hilit-chg-list
756 (append hilit-chg-list
757 (list last-category last-face)))))
759 (defun hilit-chg-bump-change (prop start end)
760 "Increment (age) the Highlight Changes mode text property."
761 (let ( new-prop )
762 (if (eq prop 'hilit-chg-delete)
763 (setq new-prop (nth 2 hilit-chg-list))
764 (setq new-prop (nth 2 (member prop hilit-chg-list))))
765 (if prop
766 (put-text-property start end 'hilit-chg new-prop)
767 (message "%d-%d unknown property %s not changed" start end prop))))
769 ;;;###autoload
770 (defun highlight-changes-rotate-faces ()
771 "Rotate the faces used by Highlight Changes mode.
773 Current changes are displayed in the face described by the first element
774 of `highlight-changes-face-list', one level older changes are shown in
775 face described by the second element, and so on. Very old changes remain
776 shown in the last face in the list.
778 You can automatically rotate colors when the buffer is saved by adding
779 this function to `write-file-functions' as a buffer-local value. To do
780 this, eval the following in the buffer to be saved:
782 \(add-hook 'write-file-functions 'highlight-changes-rotate-faces nil t)"
783 (interactive)
784 ;; If not in active mode do nothing but don't complain because this
785 ;; may be bound to a hook.
786 (when (eq highlight-changes-mode 'active)
787 (let ((modified (buffer-modified-p))
788 (inhibit-modification-hooks t))
789 ;; The `modified' related code tries to combine two goals: (1) Record the
790 ;; rotation in `buffer-undo-list' and (2) avoid setting the modified flag
791 ;; of the current buffer due to the rotation. We do this by inserting (in
792 ;; `buffer-undo-list') entries restoring buffer-modified-p to nil before
793 ;; and after the entry for the rotation.
794 ;; FIXME: this is no good: we need to test the `modified' state at the
795 ;; time of the undo, not at the time of the "do", otherwise the undo
796 ;; may erroneously clear the modified flag. --Stef
797 ;; (unless modified
798 ;; ;; Install the "before" entry.
799 ;; (push '(apply restore-buffer-modified-p nil) buffer-undo-list))
800 (unwind-protect
801 (progn
802 ;; ensure hilit-chg-list is made and up to date
803 (hilit-chg-make-list)
804 ;; remove our existing overlays
805 (hilit-chg-hide-changes)
806 ;; for each change text property, increment it
807 (hilit-chg-map-changes 'hilit-chg-bump-change)
808 ;; and display them all if active
809 (if (eq highlight-changes-mode 'active)
810 (hilit-chg-display-changes)))
811 (unless modified
812 ;; Install the "after" entry. FIXME: See above.
813 ;; (push '(apply restore-buffer-modified-p nil) buffer-undo-list)
815 (restore-buffer-modified-p nil)))))
816 ;; This always returns nil so it is safe to use in write-file-functions
817 nil)
819 ;; ========================================================================
820 ;; Comparing buffers/files
821 ;; These use ediff to find the differences.
823 (defun highlight-markup-buffers
824 (buf-a file-a buf-b file-b &optional markup-a-only)
825 "Get differences between two buffers and set highlight changes.
826 Both buffers are done unless optional parameter MARKUP-A-ONLY
827 is non-nil."
828 (save-window-excursion
829 (let* (change-info
830 change-a change-b
831 a-start a-end len-a
832 b-start b-end len-b
833 (bufa-modified (buffer-modified-p buf-a))
834 (bufb-modified (buffer-modified-p buf-b))
835 (buf-a-read-only (with-current-buffer buf-a buffer-read-only))
836 (buf-b-read-only (with-current-buffer buf-b buffer-read-only))
837 temp-a temp-b)
838 (if (and file-a bufa-modified)
839 (if (y-or-n-p (format "Save buffer %s? " buf-a))
840 (with-current-buffer buf-a
841 (save-buffer)
842 (setq bufa-modified (buffer-modified-p buf-a)))
843 (setq file-a nil)))
844 (or file-a
845 (setq temp-a (setq file-a (ediff-make-temp-file buf-a nil))))
847 (if (and file-b bufb-modified)
848 (if (y-or-n-p (format "Save buffer %s? " buf-b))
849 (with-current-buffer buf-b
850 (save-buffer)
851 (setq bufb-modified (buffer-modified-p buf-b)))
852 (setq file-b nil)))
853 (or file-b
854 (setq temp-b (setq file-b (ediff-make-temp-file buf-b nil))))
855 (set-buffer buf-a)
856 (highlight-changes-mode 'active)
857 (or markup-a-only (with-current-buffer buf-b
858 (highlight-changes-mode 'active)))
859 (setq change-info (hilit-chg-get-diff-info buf-a file-a buf-b file-b))
862 (setq change-a (car change-info))
863 (setq change-b (car (cdr change-info)))
865 (hilit-chg-make-list)
866 (while change-a
867 (setq a-start (nth 0 (car change-a)))
868 (setq a-end (nth 1 (car change-a)))
869 (setq b-start (nth 0 (car change-b)))
870 (setq b-end (nth 1 (car change-b)))
871 (setq len-a (- a-end a-start))
872 (setq len-b (- b-end b-start))
873 (set-buffer buf-a)
874 (hilit-chg-set-face-on-change a-start a-end len-b buf-a-read-only)
875 (or markup-a-only
876 (with-current-buffer buf-b
877 (hilit-chg-set-face-on-change b-start b-end len-a
878 buf-b-read-only)
880 (setq change-a (cdr change-a))
881 (setq change-b (cdr change-b)))
882 (or bufa-modified
883 (with-current-buffer buf-a (set-buffer-modified-p nil)))
884 (or bufb-modified
885 (with-current-buffer buf-b (set-buffer-modified-p nil)))
886 (if temp-a
887 (delete-file temp-a))
888 (if temp-b
889 (delete-file temp-b)))
892 ;;;###autoload
893 (defun highlight-compare-buffers (buf-a buf-b)
894 "Compare two buffers and highlight the differences.
896 The default is the current buffer and the one in the next window.
898 If either buffer is modified and is visiting a file, you are prompted
899 to save the file.
901 Unless the buffer is unmodified and visiting a file, the buffer is
902 written to a temporary file for comparison.
904 If a buffer is read-only, differences will be highlighted but no property
905 changes are made, so \\[highlight-changes-next-change] and
906 \\[highlight-changes-previous-change] will not work."
907 (interactive
908 (list
909 (get-buffer (read-buffer "buffer-a " (current-buffer) t))
910 (get-buffer
911 (read-buffer "buffer-b "
912 (window-buffer (next-window (selected-window))) t))))
913 (let ((file-a (buffer-file-name buf-a))
914 (file-b (buffer-file-name buf-b)))
915 (highlight-markup-buffers buf-a file-a buf-b file-b)
918 ;;;###autoload
919 (defun highlight-compare-with-file (file-b)
920 "Compare this buffer with a file, and highlight differences.
922 If the buffer has a backup filename, it is used as the default when
923 this function is called interactively.
925 If the current buffer is visiting the file being compared against, it
926 also will have its differences highlighted. Otherwise, the file is
927 read in temporarily but the buffer is deleted.
929 If the buffer is read-only, differences will be highlighted but no property
930 changes are made, so \\[highlight-changes-next-change] and
931 \\[highlight-changes-previous-change] will not work."
932 (interactive (list
933 (read-file-name
934 "File to compare with? " ;; prompt
935 "" ;; directory
936 nil ;; default
937 'yes ;; must exist
938 (let ((f (buffer-file-name (current-buffer))))
939 (if f
940 (progn
941 (setq f (make-backup-file-name f))
942 (or (file-exists-p f)
943 (setq f nil)))
945 f))))
946 (let* ((buf-a (current-buffer))
947 (file-a (buffer-file-name))
948 (existing-buf (get-file-buffer file-b))
949 (buf-b (or existing-buf
950 (find-file-noselect file-b)))
951 (buf-b-read-only (with-current-buffer buf-b buffer-read-only)))
952 (highlight-markup-buffers buf-a file-a buf-b file-b (not existing-buf))
953 (unless existing-buf
954 (kill-buffer buf-b))
958 (defun hilit-chg-get-diff-info (buf-a file-a buf-b file-b)
959 (let ((e nil) x y) ;; e is set by function hilit-chg-get-diff-list-hk
960 (ediff-setup buf-a file-a buf-b file-b
961 nil nil ; buf-c file-C
962 'hilit-chg-get-diff-list-hk
963 (list (cons 'ediff-job-name 'something))
965 (ediff-with-current-buffer e (ediff-really-quit nil))
966 (list x y)))
969 (defun hilit-chg-get-diff-list-hk ()
970 ;; x and y are dynamically bound by hilit-chg-get-diff-info
971 ;; which calls this function as a hook
972 (defvar x) ;; placate the byte-compiler
973 (defvar y)
974 (setq e (current-buffer))
975 (let ((n 0) extent p va vb a b)
976 (setq x nil y nil) ;; x and y are bound by hilit-chg-get-diff-info
977 (while (< n ediff-number-of-differences)
978 (ediff-make-fine-diffs n)
979 (setq va (ediff-get-fine-diff-vector n 'A))
980 ;; va is a vector if there are fine differences
981 (if va
982 (setq a (append va nil))
983 ;; if not, get the unrefined difference
984 (setq va (ediff-get-difference n 'A))
985 (setq a (list (elt va 0))))
986 ;; a list a list
987 (setq p a)
988 (while p
989 (setq extent (list (overlay-start (car p))
990 (overlay-end (car p))))
991 (setq p (cdr p))
992 (setq x (append x (list extent) )));; while p
994 (setq vb (ediff-get-fine-diff-vector n 'B))
995 ;; vb is a vector
996 (if vb
997 (setq b (append vb nil))
998 ;; if not, get the unrefined difference
999 (setq vb (ediff-get-difference n 'B))
1000 (setq b (list (elt vb 0))))
1001 ;; b list a list
1002 (setq p b)
1003 (while p
1004 (setq extent (list (overlay-start (car p))
1005 (overlay-end (car p))))
1006 (setq p (cdr p))
1007 (setq y (append y (list extent) )))
1008 (setq n (1+ n)));; while
1009 ;; ediff-quit doesn't work here.
1010 ;; No point in returning a value, since this is a hook function.
1013 ;; ======================= automatic stuff ==============
1015 ;; Global Highlight Changes mode is modeled after Global Font-lock mode.
1016 ;; Three hooks are used to gain control. When Global Changes Mode is
1017 ;; enabled, `find-file-hook' and `change-major-mode-hook' are set.
1018 ;; `find-file-hook' is called when visiting a file, the new mode is
1019 ;; known at this time.
1020 ;; `change-major-mode-hook' is called when a buffer is changing mode.
1021 ;; This could be because of finding a file in which case
1022 ;; `find-file-hook' has already been called and has done its work.
1023 ;; However, it also catches the case where a new mode is being set by
1024 ;; the user. However, it is called from `kill-all-variables' and at
1025 ;; this time the mode is the old mode, which is not what we want.
1026 ;; So, our function temporarily sets `post-command-hook' which will
1027 ;; be called after the buffer has been completely set up (with the new
1028 ;; mode). It then removes the `post-command-hook'.
1029 ;; One other wrinkle - every M-x command runs the `change-major-mode-hook'
1030 ;; so we ignore this by examining the buffer name.
1033 (defun hilit-chg-major-mode-hook ()
1034 (add-hook 'post-command-hook 'hilit-chg-post-command-hook))
1036 (defun hilit-chg-post-command-hook ()
1037 ;; This is called after changing a major mode, but also after each
1038 ;; M-x command, in which case the current buffer is a minibuffer.
1039 ;; In that case, do not act on it here, but don't turn it off
1040 ;; either, we will get called here again soon-after.
1041 ;; Also, don't enable it for other special buffers.
1042 (if (string-match "^[ *]" (buffer-name))
1043 nil ;; (message "ignoring this post-command-hook")
1044 (remove-hook 'post-command-hook 'hilit-chg-post-command-hook)
1045 ;; The following check isn't necessary, since
1046 ;; hilit-chg-turn-on-maybe makes this check too.
1047 (or highlight-changes-mode ;; don't turn it on if it already is
1048 (hilit-chg-turn-on-maybe highlight-changes-global-initial-state))))
1050 (defun hilit-chg-check-global ()
1051 ;; This is called from the find file hook.
1052 (hilit-chg-turn-on-maybe highlight-changes-global-initial-state))
1055 ;;;###autoload
1056 (defun global-highlight-changes (&optional arg)
1057 "Turn on or off global Highlight Changes mode.
1059 When called interactively:
1060 - if no prefix, toggle global Highlight Changes mode on or off
1061 - if called with a positive prefix (or just C-u) turn it on in active mode
1062 - if called with a zero prefix turn it on in passive mode
1063 - if called with a negative prefix turn it off
1065 When called from a program:
1066 - if ARG is nil or omitted, turn it off
1067 - if ARG is `active', turn it on in active mode
1068 - if ARG is `passive', turn it on in passive mode
1069 - otherwise just turn it on
1071 When global Highlight Changes mode is enabled, Highlight Changes mode is turned
1072 on for future \"suitable\" buffers (and for \"suitable\" existing buffers if
1073 variable `highlight-changes-global-changes-existing-buffers' is non-nil).
1074 \"Suitability\" is determined by variable `highlight-changes-global-modes'."
1076 (interactive
1077 (list
1078 (cond
1079 ((null current-prefix-arg)
1080 ;; no arg => toggle it on/off
1081 (setq global-highlight-changes (not global-highlight-changes)))
1082 ;; positive interactive arg - turn it on as active
1083 ((> (prefix-numeric-value current-prefix-arg) 0)
1084 (setq global-highlight-changes t)
1085 'active)
1086 ;; zero interactive arg - turn it on as passive
1087 ((= (prefix-numeric-value current-prefix-arg) 0)
1088 (setq global-highlight-changes t)
1089 'passive)
1090 ;; negative interactive arg - turn it off
1092 (setq global-highlight-changes nil)
1093 nil))))
1095 (if arg
1096 (progn
1097 (if (eq arg 'active)
1098 (setq highlight-changes-global-initial-state 'active)
1099 (if (eq arg 'passive)
1100 (setq highlight-changes-global-initial-state 'passive)))
1101 (setq global-highlight-changes t)
1102 (message "Turning ON Global Highlight Changes mode in %s state"
1103 highlight-changes-global-initial-state)
1104 ;; FIXME: Not sure what this was intended to do. --Stef
1105 ;; (add-hook 'hilit-chg-major-mode-hook 'hilit-chg-major-mode-hook)
1106 (add-hook 'find-file-hook 'hilit-chg-check-global)
1107 (if highlight-changes-global-changes-existing-buffers
1108 (hilit-chg-update-all-buffers
1109 highlight-changes-global-initial-state)))
1111 (message "Turning OFF global Highlight Changes mode")
1112 ;; FIXME: Not sure what this was intended to do. --Stef
1113 ;; (remove-hook 'hilit-chg-major-mode-hook 'hilit-chg-major-mode-hook)
1114 (remove-hook 'post-command-hook 'hilit-chg-post-command-hook)
1115 (remove-hook 'find-file-hook 'hilit-chg-check-global)
1116 (if highlight-changes-global-changes-existing-buffers
1117 (hilit-chg-update-all-buffers nil))))
1120 (defun hilit-chg-turn-on-maybe (value)
1121 "Turn on Highlight Changes mode if it is appropriate for this buffer.
1123 A buffer is appropriate for Highlight Changes mode if all these are true:
1124 - the buffer is not a special buffer (one whose name begins with
1125 `*' or ` '),
1126 - the buffer's mode is suitable as per variable
1127 `highlight-changes-global-modes',
1128 - Highlight Changes mode is not already on for this buffer.
1130 This function is called from `hilit-chg-update-all-buffers' or
1131 from `global-highlight-changes' when turning on global Highlight Changes mode."
1132 (or highlight-changes-mode ; do nothing if already on
1134 (cond
1135 ((null highlight-changes-global-modes)
1136 nil)
1137 ((functionp highlight-changes-global-modes)
1138 (funcall highlight-changes-global-modes))
1139 ((listp highlight-changes-global-modes)
1140 (if (eq (car-safe highlight-changes-global-modes) 'not)
1141 (not (memq major-mode (cdr highlight-changes-global-modes)))
1142 (memq major-mode highlight-changes-global-modes)))
1144 (and
1145 (not (string-match "^[ *]" (buffer-name)))
1146 (buffer-file-name))))
1147 (progn
1148 (hilit-chg-set value)
1149 (run-hooks 'highlight-changes-enable-hook)))))
1152 (defun hilit-chg-turn-off-maybe ()
1153 (if highlight-changes-mode
1154 (progn
1155 (run-hooks 'highlight-changes-disable-hook)
1156 (hilit-chg-clear))))
1159 (defun hilit-chg-update-all-buffers (value)
1160 (mapc
1161 (function (lambda (buffer)
1162 (with-current-buffer buffer
1163 (if value
1164 (hilit-chg-turn-on-maybe value)
1165 (hilit-chg-turn-off-maybe))
1167 (buffer-list))
1168 nil)
1170 ;;;; Desktop support.
1172 ;; Called by `desktop-create-buffer' to restore `highlight-changes-mode'.
1173 (defun hilit-chg-desktop-restore (desktop-buffer-locals)
1174 (highlight-changes-mode
1175 (or (cdr (assq 'highlight-changes-mode desktop-buffer-locals)) 1)))
1177 (add-to-list 'desktop-minor-mode-handlers
1178 '(highlight-changes-mode . hilit-chg-desktop-restore))
1180 (add-to-list 'desktop-locals-to-save 'highlight-changes-mode)
1182 ;; ===================== debug ==================
1183 ;; For debug & test use:
1185 ;; (defun hilit-chg-debug-show (&optional beg end)
1186 ;; (interactive)
1187 ;; (message "--- hilit-chg-debug-show ---")
1188 ;; (hilit-chg-map-changes '(lambda (prop start end)
1189 ;; (message "%d-%d: %s" start end prop)
1190 ;; )
1191 ;; beg end
1192 ;; ))
1194 ;; ================== end of debug ===============
1196 (provide 'hilit-chg)
1198 ;; arch-tag: de00301d-5bad-44da-aa82-e0e010b0c463
1199 ;;; hilit-chg.el ends here