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