annotate lisp/hilit-chg.el @ 96350:96074e8d2af6

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