Mercurial > emacs
annotate lisp/hilit-chg.el @ 93332:bf0cafc88be5
*** empty log message ***
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Fri, 28 Mar 2008 02:47:59 +0000 |
parents | e8b93cb7392a |
children | dfdeba5ae4fd |
rev | line source |
---|---|
22957 | 1 ;;; hilit-chg.el --- minor mode displaying buffer changes with special face |
2 | |
74442 | 3 ;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004, |
79721 | 4 ;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
22957 | 5 |
23614 | 6 ;; Author: Richard Sharman <rsharman@pobox.com> |
22957 | 7 ;; Keywords: faces |
8 | |
23101 | 9 ;; This file is part of GNU Emacs. |
10 | |
38401 | 11 ;; GNU Emacs is free software; you can redistribute it and/or modify |
22957 | 12 ;; it under the terms of the GNU General Public License as published by |
78236
9355f9b7bbff
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
77896
diff
changeset
|
13 ;; the Free Software Foundation; either version 3, or (at your option) |
22957 | 14 ;; any later version. |
15 | |
38401 | 16 ;; GNU Emacs is distributed in the hope that it will be useful, |
22957 | 17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
64091 | 23 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
24 ;; Boston, MA 02110-1301, USA. | |
22957 | 25 |
26 ;;; Commentary: | |
27 | |
28 ;; A minor mode: "Highlight Changes mode". | |
29 ;; | |
30 | |
31 ;; Highlight Changes mode has 2 submodes: active and passive. | |
32 ;; When active, changes to the buffer are displayed in a different face. | |
33 ;; When passive, any existing displayed changes are saved and new ones | |
34 ;; recorded but are not displayed differently. | |
35 ;; Why active and passive? Having the changes visible can be handy when you | |
36 ;; want the information but very distracting otherwise. So, you can keep | |
37 ;; Highlight Changes mode in passive state while you make your changes, toggle | |
38 ;; it on to active mode to see them, then toggle it back off to avoid | |
39 ;; distraction. | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
40 ;; |
63207
fecefbfcd215
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-377
Miles Bader <miles@gnu.org>
parents:
61394
diff
changeset
|
41 ;; When active, changes are displayed in the `highlight-changes' face. |
fecefbfcd215
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-377
Miles Bader <miles@gnu.org>
parents:
61394
diff
changeset
|
42 ;; When text is deleted, the following character is displayed in the |
fecefbfcd215
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-377
Miles Bader <miles@gnu.org>
parents:
61394
diff
changeset
|
43 ;; `highlight-changes-delete' face. |
22957 | 44 ;; |
45 ;; | |
46 ;; 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
|
47 ;; `highlight-changes-rotate-faces'. This rotates through a series |
22957 | 48 ;; of different faces, so you can distinguish "new" changes from "older" |
23046 | 49 ;; changes. You can customize these "rotated" faces in two ways. You can |
22957 | 50 ;; either explicitly define each face by customizing |
51 ;; `highlight-changes-face-list'. If, however, the faces differ from | |
63207
fecefbfcd215
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-377
Miles Bader <miles@gnu.org>
parents:
61394
diff
changeset
|
52 ;; the `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
|
53 ;; `highlight-changes-colors'. If `highlight-changes-face-list' is nil when |
22957 | 54 ;; 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
|
55 ;; `highlight-changes-colors'. |
22957 | 56 ;; |
57 ;; | |
58 ;; When a Highlight Changes mode is on (either active or passive) you can go | |
59 ;; to the next or previous change with `highlight-changes-next-change' and | |
60 ;; `highlight-changes-previous-change'. | |
61 ;; | |
62 ;; | |
23289 | 63 ;; You can also use the command highlight-compare-with-file to show changes |
64 ;; in this file compared with another file (typically the previous version | |
54009
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
65 ;; of the file). The command highlight-compare-buffers can be used to |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
66 ;; compare two buffers. |
22957 | 67 ;; |
68 ;; | |
69 ;; There are currently three hooks run by `highlight-changes-mode': | |
70 ;; `highlight-changes-enable-hook' - is run when Highlight Changes mode | |
71 ;; is initially enabled for a buffer. | |
72 ;; `highlight-changes-disable-hook' - is run when Highlight Changes mode | |
73 ;; is turned off. | |
74 ;; `highlight-changes-toggle-hook' - is run each time `highlight-changes-mode' | |
75 ;; is called. Typically this is when | |
76 ;; toggling between active and passive | |
77 ;; modes. The variable | |
78 ;; `highlight-changes-mode' contains the new | |
79 ;; state (`active' or `passive'.) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
80 ;; |
22957 | 81 ;; |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
82 ;; |
22957 | 83 ;; Example usage: |
84 ;; (defun my-highlight-changes-enable-hook () | |
64587
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
85 ;; (add-hook 'write-file-functions 'highlight-changes-rotate-faces nil t) |
22957 | 86 ;; ) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
87 ;; |
22957 | 88 ;; (defun my-highlight-changes-disable-hook () |
64587
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
89 ;; (remove-hook 'write-file-functions 'highlight-changes-rotate-faces t) |
22957 | 90 ;; ) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
91 ;; |
22957 | 92 ;; (add-hook 'highlight-changes-enable-hook 'my-highlight-changes-enable-hook) |
93 ;; (add-hook 'highlight-changes-disable-hook | |
94 ;; 'my-highlight-changes-disable-hook) | |
95 | |
96 | |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
97 ;; Explicit vs. Implicit |
22957 | 98 ;; |
99 | |
100 ;; Normally, Highlight Changes mode is turned on explicitly in a buffer. | |
101 ;; | |
102 ;; If you prefer to have it automatically invoked you can do it as | |
103 ;; follows. | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
104 ;; |
22957 | 105 ;; 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
|
106 ;; can use `add-hook' to call `highlight-changes-mode'. |
22957 | 107 ;; |
108 ;; Example: | |
109 ;; (add-hook 'c-mode-hook 'highlight-changes-mode) | |
110 ;; | |
111 ;; If you want to make it start up in passive mode (regardless of the | |
112 ;; setting of highlight-changes-initial-state): | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
113 ;; (add-hook 'emacs-lisp-mode-hook |
22957 | 114 ;; (lambda () |
115 ;; (highlight-changes-mode 'passive))) | |
116 ;; | |
117 ;; However, this cannot be done for Fundamental mode for there is no | |
118 ;; such hook. | |
119 ;; | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
120 ;; 2. You can use the function `global-highlight-changes' |
22957 | 121 ;; |
122 ;; This function, which is fashioned after the way `global-font-lock' works, | |
123 ;; toggles on or off global Highlight Changes mode. When activated, it turns | |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
124 ;; on Highlight Changes mode in all "suitable" existing buffers and will turn |
22957 | 125 ;; it on in new "suitable" buffers to be created. |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
126 ;; |
22957 | 127 ;; A buffer's "suitability" is determined by variable |
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
parents:
44740
diff
changeset
|
128 ;; `highlight-changes-global-modes', as follows. If the variable is |
22957 | 129 ;; * nil -- then no buffers are suitable; |
130 ;; * 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
|
131 ;; an example, if the value is `buffer-file-name' then all buffers |
22957 | 132 ;; who are visiting files are suitable, but others (like dired |
133 ;; buffers) are not; | |
78492
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
134 ;; * a list -- then the buffer is suitable if its mode is in the |
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
parents:
44740
diff
changeset
|
135 ;; list, except if the first element is `not', in which case the test |
22957 | 136 ;; 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
|
137 ;; * Otherwise, the buffer is suitable if its name does not begin with |
22957 | 138 ;; ` ' or `*' and if `buffer-file-name' returns true. |
139 ;; | |
140 | |
141 | |
142 | |
143 ;; Possible bindings: | |
144 ;; (global-set-key '[C-right] 'highlight-changes-next-change) | |
145 ;; (global-set-key '[C-left] 'highlight-changes-previous-change) | |
146 ;; | |
147 ;; Other interactive functions (which could be bound if desired): | |
148 ;; highlight-changes-mode | |
149 ;; highlight-changes-remove-highlight | |
150 ;; highlight-changes-rotate-faces | |
23289 | 151 ;; highlight-compare-with-file |
54009
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
152 ;; highlight-compare-buffers |
22957 | 153 |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
154 ;; |
22957 | 155 ;; You can automatically rotate faces when the buffer is saved; |
156 ;; see function `highlight-changes-rotate-faces' for how to do this. | |
157 ;; | |
158 | |
159 | |
160 ;;; Bugs: | |
161 | |
162 ;; - 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
|
163 ;; they should find the next "real" change, in other words treat |
22957 | 164 ;; consecutive changes as one. |
165 | |
166 | |
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
parents:
44740
diff
changeset
|
167 ;;; To do (maybe), notes, ... |
22957 | 168 |
169 ;; - having different faces for deletion and non-deletion: is it | |
170 ;; really worth the hassle? | |
171 ;; - should have better hooks: when should they be run? | |
23289 | 172 ;; - highlight-compare-with-file should allow RCS files - e.g. nice to be |
173 ;; able to say show changes compared with version 2.1. | |
22957 | 174 ;; - Maybe we should have compare-with-buffer as well. (When I tried |
175 ;; a while back I ran into a problem with ediff-buffers-internal.) | |
176 | |
177 | |
178 ;;; History: | |
179 | |
54009
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
180 ;; R Sharman (rsharman@pobox.com) Feb 1998: |
22957 | 181 ;; - initial release as change-mode. |
182 ;; Jari Aalto <jari.aalto@ntc.nokia.com> Mar 1998 | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
183 ;; - fixes for byte compile errors |
22957 | 184 ;; - use eval-and-compile for autoload |
185 ;; Marijn Ros <J.M.Ros@fys.ruu.nl> Mar 98 | |
186 ;; - suggested turning it on by default | |
187 ;; Eric Ludlam <zappo@gnu.org> Suggested using overlays. | |
188 ;; July 98 | |
189 ;; - global mode and various stuff added | |
190 ;; - Changed to use overlays | |
191 ;; August 98 | |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
192 ;; - 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
|
193 ;; Dec 2003 |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
194 ;; - Use require for ediff stuff |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
195 ;; - Added highlight-compare-buffers |
22957 | 196 |
197 ;;; Code: | |
198 | |
199 (require 'wid-edit) | |
200 | |
201 ;; ====================== Customization ======================= | |
202 (defgroup highlight-changes nil | |
203 "Highlight Changes mode." | |
24554
9a9a307e9a57
(highlight-changes): Add defgroup :version.
Dave Love <fx@gnu.org>
parents:
23614
diff
changeset
|
204 :version "20.4" |
22957 | 205 :group 'faces) |
206 | |
207 | |
208 ;; Face information: How the changes appear. | |
209 | |
210 ;; Defaults for face: red foreground, no change to background, | |
211 ;; 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
|
212 ;; Note: underlining is helpful in that it shows up changes in white space. |
22957 | 213 ;; However, having it set for non-delete changes can be annoying because all |
214 ;; indentation on inserts gets underlined (which can look pretty ugly!). | |
215 | |
63207
fecefbfcd215
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-377
Miles Bader <miles@gnu.org>
parents:
61394
diff
changeset
|
216 (defface highlight-changes |
64587
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
217 '((((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
|
218 (((class color)) (:foreground "red" )) |
22957 | 219 (t (:inverse-video t))) |
220 "Face used for highlighting changes." | |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
221 :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
|
222 ;; 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
|
223 (put 'highlight-changes-face 'face-alias 'highlight-changes) |
22957 | 224 |
225 ;; 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
|
226 (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
|
227 '((((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
|
228 (((class color)) (:foreground "red" :underline t)) |
22957 | 229 (t (:inverse-video t))) |
230 "Face used for highlighting deletions." | |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
231 :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
|
232 ;; 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
|
233 (put 'highlight-changes-delete-face 'face-alias 'highlight-changes-delete) |
22957 | 234 |
235 | |
236 | |
63351
071d62682d14
(highlight-changes-colors): Rename from `highlight-changes-colours'.
Juanma Barranquero <lekktu@gmail.com>
parents:
63252
diff
changeset
|
237 ;; A (not very good) default list of colors to rotate through. |
22957 | 238 ;; |
63351
071d62682d14
(highlight-changes-colors): Rename from `highlight-changes-colours'.
Juanma Barranquero <lekktu@gmail.com>
parents:
63252
diff
changeset
|
239 (defcustom highlight-changes-colors |
22957 | 240 (if (eq (frame-parameter nil 'background-mode) 'light) |
241 ;; defaults for light background: | |
242 '( "magenta" "blue" "darkgreen" "chocolate" "sienna4" "NavyBlue") | |
243 ;; defaults for dark background: | |
244 '("yellow" "magenta" "blue" "maroon" "firebrick" "green4" "DarkOrchid")) | |
92149
e8b93cb7392a
Remove spurious * in defcustom docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80118
diff
changeset
|
245 "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
|
246 The newest rotated change will be displayed in the first element of this list, |
22957 | 247 the next older will be in the second element etc. |
248 | |
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
parents:
44740
diff
changeset
|
249 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
|
250 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
|
251 colors then use this, if you want fancier faces then set |
22957 | 252 `highlight-changes-face-list'." |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
253 :type '(repeat color) |
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
254 :group 'highlight-changes) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
255 |
63351
071d62682d14
(highlight-changes-colors): Rename from `highlight-changes-colours'.
Juanma Barranquero <lekktu@gmail.com>
parents:
63252
diff
changeset
|
256 (define-obsolete-variable-alias 'highlight-changes-colours |
071d62682d14
(highlight-changes-colors): Rename from `highlight-changes-colours'.
Juanma Barranquero <lekktu@gmail.com>
parents:
63252
diff
changeset
|
257 'highlight-changes-colors "22.1") |
071d62682d14
(highlight-changes-colors): Rename from `highlight-changes-colours'.
Juanma Barranquero <lekktu@gmail.com>
parents:
63252
diff
changeset
|
258 |
22957 | 259 |
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
parents:
44740
diff
changeset
|
260 ;; If you invoke highlight-changes-mode with no argument, should it start in |
22957 | 261 ;; active or passive mode? |
262 ;; | |
263 (defcustom highlight-changes-initial-state 'active | |
92149
e8b93cb7392a
Remove spurious * in defcustom docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80118
diff
changeset
|
264 "What state (active or passive) Highlight Changes mode should start in. |
68524
2f9b0e4b3a95
(highlight-changes-initial-state, highlight-changes-global-initial-state):
Juanma Barranquero <lekktu@gmail.com>
parents:
64895
diff
changeset
|
265 This is used when `highlight-changes-mode' is called with no argument. |
22957 | 266 This variable must be set to one of the symbols `active' or `passive'." |
267 :type '(choice (const :tag "Active" active) | |
268 (const :tag "Passive" passive)) | |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
269 :group 'highlight-changes) |
22957 | 270 |
271 (defcustom highlight-changes-global-initial-state 'passive | |
92149
e8b93cb7392a
Remove spurious * in defcustom docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80118
diff
changeset
|
272 "What state global Highlight Changes mode should start in. |
22957 | 273 This is used if `global-highlight-changes' is called with no argument. |
64587
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
274 This variable must be set to either `active' or `passive'." |
22957 | 275 :type '(choice (const :tag "Active" active) |
276 (const :tag "Passive" passive)) | |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
277 :group 'highlight-changes) |
22957 | 278 |
279 ;; The strings displayed in the mode-line for the minor mode: | |
43132
0dd2ebecd217
(highlight-changes-active-string): Default to +Chg.
Richard M. Stallman <rms@gnu.org>
parents:
43030
diff
changeset
|
280 (defcustom highlight-changes-active-string " +Chg" |
92149
e8b93cb7392a
Remove spurious * in defcustom docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80118
diff
changeset
|
281 "The string used when Highlight Changes mode is in the active state. |
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
parents:
44740
diff
changeset
|
282 This should be set to nil if no indication is desired, or to |
22957 | 283 a string with a leading space." |
284 :type '(choice string | |
285 (const :tag "None" nil)) | |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
286 :group 'highlight-changes) |
22957 | 287 |
43132
0dd2ebecd217
(highlight-changes-active-string): Default to +Chg.
Richard M. Stallman <rms@gnu.org>
parents:
43030
diff
changeset
|
288 (defcustom highlight-changes-passive-string " -Chg" |
92149
e8b93cb7392a
Remove spurious * in defcustom docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80118
diff
changeset
|
289 "The string used when Highlight Changes mode is in the passive state. |
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
parents:
44740
diff
changeset
|
290 This should be set to nil if no indication is desired, or to |
22957 | 291 a string with a leading space." |
292 :type '(choice string | |
293 (const :tag "None" nil)) | |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
294 :group 'highlight-changes) |
22957 | 295 |
296 (defcustom highlight-changes-global-modes t | |
92149
e8b93cb7392a
Remove spurious * in defcustom docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80118
diff
changeset
|
297 "Determine whether a buffer is suitable for global Highlight Changes mode. |
22957 | 298 |
43132
0dd2ebecd217
(highlight-changes-active-string): Default to +Chg.
Richard M. Stallman <rms@gnu.org>
parents:
43030
diff
changeset
|
299 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
|
300 the buffer is suitable. |
22957 | 301 |
43132
0dd2ebecd217
(highlight-changes-active-string): Default to +Chg.
Richard M. Stallman <rms@gnu.org>
parents:
43030
diff
changeset
|
302 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
|
303 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
|
304 modes which are not suitable. |
22957 | 305 |
64587
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
306 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
|
307 its name does not begin with ` ' or `*'. |
22957 | 308 |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
309 A value of nil means no buffers are suitable for `global-highlight-changes' |
41701 | 310 \(effectively disabling the mode). |
22957 | 311 |
68524
2f9b0e4b3a95
(highlight-changes-initial-state, highlight-changes-global-initial-state):
Juanma Barranquero <lekktu@gmail.com>
parents:
64895
diff
changeset
|
312 Example: |
22957 | 313 (c-mode c++-mode) |
314 means that Highlight Changes mode is turned on for buffers in C and C++ | |
315 modes only." | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
316 :type '(choice |
22957 | 317 (const :tag "all non-special buffers visiting files" t) |
318 (set :menu-tag "specific modes" :tag "modes" | |
319 :value (not) | |
320 (const :tag "All except these" not) | |
321 (repeat :tag "Modes" :inline t (symbol :tag "mode"))) | |
322 (function :menu-tag "determined by function" | |
323 :value buffer-file-name) | |
324 (const :tag "none" nil) | |
325 ) | |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
326 :group 'highlight-changes) |
22957 | 327 |
328 (defvar global-highlight-changes nil) | |
329 | |
330 (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
|
331 "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
|
332 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
|
333 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
|
334 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
|
335 Highlight Changes mode in suitable buffers, and turning the mode off will |
22957 | 336 remove it from existing buffers." |
337 :type 'boolean | |
338 :group 'highlight-changes) | |
339 | |
340 (defun hilit-chg-cust-fix-changes-face-list (w wc &optional event) | |
341 ;; 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
|
342 ;; 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
|
343 ;; face, so we rename the faces in the list on an insert. The rename is |
22957 | 344 ;; actually done by copying the faces so user-defined faces still remain |
345 ;; in the same order. | |
346 ;; The notifying the parent is needed because without it changes to the | |
347 ;; faces are saved but not to the actual list itself. | |
348 (let ((old-list (widget-value w))) | |
349 (if (member 'default old-list) | |
350 (let | |
351 ((p (reverse old-list)) | |
352 (n (length old-list)) | |
353 new-name old-name | |
354 (new-list nil) | |
355 ) | |
356 (while p | |
357 (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
|
358 (setq new-name (intern (format "highlight-changes-%d" n))) |
22957 | 359 (if (eq old-name new-name) |
360 nil | |
361 ;; 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
|
362 ;; default face so copy it. Better, though, (I think) is to |
22957 | 363 ;; 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
|
364 ;; the `highlight-changes' face. |
22957 | 365 (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
|
366 (copy-face 'highlight-changes new-name) |
22957 | 367 (copy-face old-name new-name) |
368 )) | |
68524
2f9b0e4b3a95
(highlight-changes-initial-state, highlight-changes-global-initial-state):
Juanma Barranquero <lekktu@gmail.com>
parents:
64895
diff
changeset
|
369 (setq new-list (append (list new-name) new-list)) |
22957 | 370 (setq n (1- n)) |
371 (setq p (cdr p))) | |
372 (if (equal new-list (widget-value w)) | |
373 nil ;; (message "notify: no change!") | |
374 (widget-value-set w new-list) | |
375 (widget-setup) | |
376 ) | |
377 ) | |
378 ;; (message "notify: no default here!") | |
379 )) | |
380 (let ((parent (widget-get w :parent))) | |
381 (when parent | |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
382 (widget-apply parent :notify w event)))) |
22957 | 383 |
384 | |
385 (defcustom highlight-changes-face-list nil | |
92149
e8b93cb7392a
Remove spurious * in defcustom docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80118
diff
changeset
|
386 "A list of faces used when rotating changes. |
22957 | 387 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
|
388 `highlight-changes-colors' when needed. However, you can set this variable |
22957 | 389 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
|
390 don't just differ from the `highlight-changes' face by the foreground color. |
22957 | 391 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
|
392 `highlight-changes-colors'." |
22957 | 393 :type '(choice |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
394 (repeat |
22957 | 395 :notify hilit-chg-cust-fix-changes-face-list |
396 face ) | |
63351
071d62682d14
(highlight-changes-colors): Rename from `highlight-changes-colours'.
Juanma Barranquero <lekktu@gmail.com>
parents:
63252
diff
changeset
|
397 (const :tag "Derive from highlight-changes-colors" nil) |
22957 | 398 ) |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
399 :group 'highlight-changes) |
22957 | 400 |
401 ;; ======================================================================== | |
402 | |
403 ;; These shouldn't be changed! | |
404 | |
405 (defvar highlight-changes-mode nil) | |
406 (defvar hilit-chg-list nil) | |
407 (defvar hilit-chg-string " ??") | |
408 (or (assq 'highlight-changes-mode minor-mode-alist) | |
409 (setq minor-mode-alist | |
410 (cons '(highlight-changes-mode hilit-chg-string) minor-mode-alist) | |
411 )) | |
412 (make-variable-buffer-local 'highlight-changes-mode) | |
413 (make-variable-buffer-local 'hilit-chg-string) | |
414 | |
415 | |
54009
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
416 (require 'ediff-init) |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
417 (require 'ediff-util) |
22957 | 418 |
419 | |
420 ;;; Functions... | |
421 | |
68524
2f9b0e4b3a95
(highlight-changes-initial-state, highlight-changes-global-initial-state):
Juanma Barranquero <lekktu@gmail.com>
parents:
64895
diff
changeset
|
422 (defun hilit-chg-map-changes (func &optional start-position end-position) |
22957 | 423 "Call function FUNC for each region used by Highlight Changes mode." |
424 ;; if start-position is nil, (point-min) is used | |
425 ;; if end-position is nil, (point-max) is used | |
426 ;; FUNC is called with 3 params: property start stop | |
427 (let ((start (or start-position (point-min))) | |
428 (limit (or end-position (point-max))) | |
429 prop end) | |
430 (while (and start (< start limit)) | |
431 (setq prop (get-text-property start 'hilit-chg)) | |
432 (setq end (text-property-not-all start limit 'hilit-chg prop)) | |
433 (if prop | |
434 (funcall func prop start (or end limit))) | |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
435 (setq start end)))) |
22957 | 436 |
437 | |
438 (defun hilit-chg-display-changes (&optional beg end) | |
439 "Display face information for Highlight Changes mode. | |
440 | |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
441 An overlay containing a change face is added from the information |
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
442 in the text property of type `hilit-chg'. |
22957 | 443 |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
444 This is the opposite of `hilit-chg-hide-changes'." |
22957 | 445 (hilit-chg-map-changes 'hilit-chg-make-ov beg end)) |
446 | |
447 | |
448 (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
|
449 (or prop |
90bce6424b8b
(hilit-chg-fixup): Don't alter overlay if not ours.
Richard M. Stallman <rms@gnu.org>
parents:
41701
diff
changeset
|
450 (error "hilit-chg-make-ov: prop is nil")) |
22957 | 451 ;; for the region make change overlays corresponding to |
452 ;; the text property 'hilit-chg | |
453 (let ((ov (make-overlay start end)) | |
92149
e8b93cb7392a
Remove spurious * in defcustom docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80118
diff
changeset
|
454 (face (if (eq prop 'hilit-chg-delete) |
e8b93cb7392a
Remove spurious * in defcustom docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80118
diff
changeset
|
455 'highlight-changes-delete |
e8b93cb7392a
Remove spurious * in defcustom docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80118
diff
changeset
|
456 (nth 1 (member prop hilit-chg-list))))) |
22957 | 457 (if face |
458 (progn | |
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
parents:
44740
diff
changeset
|
459 ;; We must mark the face, that is the purpose of the overlay |
22957 | 460 (overlay-put ov 'face face) |
461 ;; I don't think we need to set evaporate since we should | |
462 ;; be controlling them! | |
463 (overlay-put ov 'evaporate t) | |
464 ;; We set the change property so we can tell this is one | |
465 ;; of our overlays (so we don't delete someone else's). | |
466 (overlay-put ov 'hilit-chg t) | |
467 ) | |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
468 (error "hilit-chg-make-ov: no face for prop: %s" prop)))) |
22957 | 469 |
470 (defun hilit-chg-hide-changes (&optional beg end) | |
471 "Remove face information for Highlight Changes mode. | |
472 | |
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
parents:
44740
diff
changeset
|
473 The overlay containing the face is removed, but the text property |
22957 | 474 containing the change information is retained. |
475 | |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
476 This is the opposite of `hilit-chg-display-changes'." |
22957 | 477 (let ((start (or beg (point-min))) |
478 (limit (or end (point-max))) | |
479 p ov) | |
480 (setq p (overlays-in start limit)) | |
481 (while p | |
482 ;; don't delete the overlay if it isn't ours! | |
483 (if (overlay-get (car p) 'hilit-chg) | |
484 (delete-overlay (car p))) | |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
485 (setq p (cdr p))))) |
22957 | 486 |
487 (defun hilit-chg-fixup (beg end) | |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
488 "Fix change overlays in region between BEG and END. |
22957 | 489 |
490 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
|
491 the text properties of type `hilit-chg'." |
22957 | 492 ;; 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
|
493 (remove-overlays beg end 'hilit-chg t) |
e8b93cb7392a
Remove spurious * in defcustom docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
80118
diff
changeset
|
494 (hilit-chg-display-changes beg end)) |
22957 | 495 |
80118
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
496 ;; 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
|
497 (defmacro highlight-save-buffer-state (&rest body) |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
498 "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
|
499 (declare (indent 0) (debug t)) |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
500 (let ((modified (make-symbol "modified"))) |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
501 `(let* ((,modified (buffer-modified-p)) |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
502 (inhibit-modification-hooks t) |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
503 deactivate-mark |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
504 ;; 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
|
505 buffer-file-name |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
506 buffer-file-truename) |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
507 (progn |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
508 ,@body) |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
509 (unless ,modified |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
510 (restore-buffer-modified-p nil))))) |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
511 |
22957 | 512 ;;;###autoload |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
513 (defun highlight-changes-remove-highlight (beg end) |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
514 "Remove the change face from the region between BEG and END. |
22957 | 515 This allows you to manually remove highlighting from uninteresting changes." |
516 (interactive "r") | |
80118
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
517 (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
|
518 (remove-text-properties beg end '(hilit-chg nil)) |
22957 | 519 (hilit-chg-fixup beg end))) |
520 | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
521 (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
|
522 &optional no-property-change) |
22957 | 523 "Record changes and optionally display them in a distinctive face. |
524 `hilit-chg-set' adds this function to the `after-change-functions' hook." | |
525 ;; | |
526 ;; This function is called by the `after-change-functions' hook, which | |
527 ;; is how we are notified when text is changed. | |
23289 | 528 ;; It is also called from `highlight-compare-with-file'. |
22957 | 529 ;; |
530 ;; We do NOT want to simply do this if this is an undo command, because | |
531 ;; otherwise an undone change shows up as changed. While the properties | |
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
parents:
44740
diff
changeset
|
532 ;; are automatically restored by undo, we must fix up the overlay. |
22957 | 533 (save-match-data |
534 (let ((beg-decr 1) (end-incr 1) | |
535 (type 'hilit-chg) | |
536 old) | |
537 (if undo-in-progress | |
538 (if (eq highlight-changes-mode 'active) | |
539 (hilit-chg-fixup beg end)) | |
80118
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
540 (highlight-save-buffer-state |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
541 (if (and (= beg end) (> leng-before 0)) |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
542 ;; deletion |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
543 (progn |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
544 ;; 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
|
545 ;; 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
|
546 ;; 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
|
547 ;; 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
|
548 ;; character of a line. |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
549 ;; (if (= leng-before 1) |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
550 ;; (if (eolp) |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
551 ;; (setq beg-decr 0 end-incr 0) |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
552 ;; (if (bolp) |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
553 ;; (setq beg-decr 0)))) |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
554 ;; (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
|
555 (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
|
556 (setq type 'hilit-chg-delete)) |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
557 ;; Not a deletion. |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
558 ;; 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
|
559 ;; 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
|
560 ;; 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
|
561 ;; text then remove the deletion marking, but set it to |
22957 | 562 ;; changed otherwise its highlighting disappears. |
563 (if (eq (get-text-property end 'hilit-chg) 'hilit-chg-delete) | |
564 (progn | |
565 (put-text-property end (+ end 1) 'hilit-chg 'hilit-chg) | |
566 (if (eq highlight-changes-mode 'active) | |
80118
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
567 (hilit-chg-fixup beg (+ end 1)))))) |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
568 (unless no-property-change |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
569 (put-text-property beg end 'hilit-chg type)) |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
570 (if (or (eq highlight-changes-mode 'active) no-property-change) |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
571 (hilit-chg-make-ov type beg end))))))) |
22957 | 572 |
573 (defun hilit-chg-set (value) | |
574 "Turn on Highlight Changes mode for this buffer." | |
575 (setq highlight-changes-mode value) | |
576 (remove-hook 'after-change-functions 'hilit-chg-set-face-on-change t) | |
577 (hilit-chg-make-list) | |
578 (if (eq highlight-changes-mode 'active) | |
579 (progn | |
580 (setq hilit-chg-string highlight-changes-active-string) | |
581 (or buffer-read-only | |
582 (hilit-chg-display-changes))) | |
583 ;; mode is passive | |
584 (setq hilit-chg-string highlight-changes-passive-string) | |
585 (or buffer-read-only | |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
586 (hilit-chg-hide-changes))) |
22957 | 587 (force-mode-line-update) |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
588 (add-hook 'after-change-functions 'hilit-chg-set-face-on-change nil t)) |
22957 | 589 |
590 (defun hilit-chg-clear () | |
591 "Remove Highlight Changes mode for this buffer. | |
592 This removes all saved change information." | |
593 (if buffer-read-only | |
594 ;; We print the buffer name because this function could be called | |
595 ;; on many buffers from `global-highlight-changes'. | |
596 (message "Cannot remove highlighting from read-only mode buffer %s" | |
597 (buffer-name)) | |
598 (remove-hook 'after-change-functions 'hilit-chg-set-face-on-change t) | |
80118
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
599 (highlight-save-buffer-state |
22957 | 600 (hilit-chg-hide-changes) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
601 (hilit-chg-map-changes |
80118
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
602 (lambda (prop start stop) |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
603 (remove-text-properties start stop '(hilit-chg nil))))) |
22957 | 604 (setq highlight-changes-mode nil) |
605 (force-mode-line-update) | |
606 ;; If we type: C-u -1 M-x highlight-changes-mode | |
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
parents:
44740
diff
changeset
|
607 ;; we want to turn it off, but hilit-chg-post-command-hook |
22957 | 608 ;; runs and that turns it back on! |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
609 (remove-hook 'post-command-hook 'hilit-chg-post-command-hook))) |
22957 | 610 |
611 ;;;###autoload | |
612 (defun highlight-changes-mode (&optional arg) | |
613 "Toggle (or initially set) Highlight Changes mode. | |
614 | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
615 Without an argument: |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
616 If Highlight Changes mode is not enabled, then enable it (in either active |
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
617 or passive state as determined by the variable |
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
618 `highlight-changes-initial-state'); otherwise, toggle between active |
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
619 and passive state. |
22957 | 620 |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
621 With an argument ARG: |
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
622 If ARG is positive, set state to active; |
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
623 If ARG is zero, set state to passive; |
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
624 If ARG is negative, disable Highlight Changes mode completely. |
22957 | 625 |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
626 Active state - means changes are shown in a distinctive face. |
22957 | 627 Passive state - means changes are kept and new ones recorded but are |
628 not displayed in a different face. | |
629 | |
630 Functions: | |
631 \\[highlight-changes-next-change] - move point to beginning of next change | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
632 \\[highlight-changes-previous-change] - move to beginning of previous change |
23289 | 633 \\[highlight-compare-with-file] - mark text as changed by comparing this |
634 buffer with the contents of a file | |
22957 | 635 \\[highlight-changes-remove-highlight] - remove the change face from the region |
636 \\[highlight-changes-rotate-faces] - rotate different \"ages\" of changes \ | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
637 through |
64587
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
638 various faces |
22957 | 639 |
640 Hook variables: | |
64587
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
641 `highlight-changes-enable-hook' - when enabling Highlight Changes mode |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
642 `highlight-changes-toggle-hook' - when entering active or passive state |
64587
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
643 `highlight-changes-disable-hook' - when turning off Highlight Changes mode" |
22957 | 644 (interactive "P") |
29204
d38a98cddcec
(highlight-changes-mode): Ask about color or
Eli Zaretskii <eliz@gnu.org>
parents:
25533
diff
changeset
|
645 (if (or (display-color-p) |
d38a98cddcec
(highlight-changes-mode): Ask about color or
Eli Zaretskii <eliz@gnu.org>
parents:
25533
diff
changeset
|
646 (and (fboundp 'x-display-grayscale-p) (x-display-grayscale-p))) |
22957 | 647 (let ((was-on highlight-changes-mode) |
648 (new-highlight-changes-mode | |
649 (cond | |
650 ((null arg) | |
651 ;; no arg => toggle (or set to active initially) | |
652 (if highlight-changes-mode | |
653 (if (eq highlight-changes-mode 'active) 'passive 'active) | |
654 highlight-changes-initial-state)) | |
655 ;; an argument is given | |
656 ((eq arg 'active) | |
657 'active) | |
68738
974d9b214cd3
(hilit-chg-update-all-buffers): Use `mapc' instead of `mapcar'; return nil.
Juanma Barranquero <lekktu@gmail.com>
parents:
68651
diff
changeset
|
658 ((eq arg 'passive) |
22957 | 659 'passive) |
660 ((> (prefix-numeric-value arg) 0) | |
661 'active) | |
662 ((< (prefix-numeric-value arg) 0) | |
663 nil) | |
664 (t | |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
665 'passive)))) |
22957 | 666 (if new-highlight-changes-mode |
667 ;; mode is turned on -- but may be passive | |
668 (progn | |
669 (hilit-chg-set new-highlight-changes-mode) | |
670 (or was-on | |
671 ;; run highlight-changes-enable-hook once | |
672 (run-hooks 'highlight-changes-enable-hook)) | |
673 (run-hooks 'highlight-changes-toggle-hook)) | |
674 ;; mode is turned off | |
675 (run-hooks 'highlight-changes-disable-hook) | |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
676 (hilit-chg-clear))) |
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
677 (message "Highlight Changes mode requires color or grayscale display"))) |
22957 | 678 |
679 ;;;###autoload | |
680 (defun highlight-changes-next-change () | |
681 "Move to the beginning of the next change, if in Highlight Changes mode." | |
682 (interactive) | |
683 (if highlight-changes-mode | |
684 (let ((start (point)) | |
685 prop) | |
686 (setq prop (get-text-property (point) 'hilit-chg)) | |
687 (if prop | |
688 ;; we are in a change | |
689 (setq start (next-single-property-change (point) 'hilit-chg))) | |
690 (if start | |
691 (setq start (next-single-property-change start 'hilit-chg))) | |
692 (if start | |
693 (goto-char start) | |
694 (message "no next change"))) | |
695 (message "This buffer is not in Highlight Changes mode."))) | |
696 | |
697 | |
698 ;;;###autoload | |
699 (defun highlight-changes-previous-change () | |
700 "Move to the beginning of the previous change, if in Highlight Changes mode." | |
701 (interactive) | |
702 (if highlight-changes-mode | |
703 (let ( (start (point)) (prop nil) ) | |
704 (or (bobp) | |
705 (setq prop (get-text-property (1- (point)) 'hilit-chg))) | |
706 (if prop | |
707 ;; we are in a change | |
708 (setq start (previous-single-property-change (point) 'hilit-chg))) | |
709 (if start | |
710 (setq start (previous-single-property-change start 'hilit-chg))) | |
711 ;; special handling for the case where (point-min) is a change | |
712 (if start | |
713 (setq start (or (previous-single-property-change start 'hilit-chg) | |
714 (if (get-text-property (point-min) 'hilit-chg) | |
715 (point-min))))) | |
716 (if start | |
717 (goto-char start) | |
718 (message "no previous change"))) | |
719 (message "This buffer is not in Highlight Changes mode."))) | |
720 | |
721 ;; ======================================================================== | |
722 | |
723 (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
|
724 "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
|
725 ;; Constructs highlight-changes-face-list if necessary, |
22957 | 726 ;; and hilit-chg-list always: |
727 ;; Maybe this should always be called when rotating a face | |
728 ;; so we pick up any changes? | |
729 (if (or (null highlight-changes-face-list) ; Don't do it if it | |
730 force) ; already exists unless FORCE non-nil. | |
63351
071d62682d14
(highlight-changes-colors): Rename from `highlight-changes-colours'.
Juanma Barranquero <lekktu@gmail.com>
parents:
63252
diff
changeset
|
731 (let ((p highlight-changes-colors) |
22957 | 732 (n 1) name) |
733 (setq highlight-changes-face-list nil) | |
734 (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
|
735 (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
|
736 (copy-face 'highlight-changes name) |
22957 | 737 (set-face-foreground name (car p)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
738 (setq highlight-changes-face-list |
22957 | 739 (append highlight-changes-face-list (list name))) |
740 (setq p (cdr p)) | |
741 (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
|
742 (setq hilit-chg-list (list 'hilit-chg 'highlight-changes)) |
22957 | 743 (let ((p highlight-changes-face-list) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
744 (n 1) |
22957 | 745 last-category last-face) |
746 (while p | |
747 (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
|
748 ;; (setq last-face (intern (format "highlight-changes-%d" n))) |
22957 | 749 (setq last-face (car p)) |
750 (setq hilit-chg-list | |
751 (append hilit-chg-list | |
752 (list last-category last-face))) | |
753 (setq p (cdr p)) | |
754 (setq n (1+ n))) | |
755 (setq hilit-chg-list | |
756 (append hilit-chg-list | |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
757 (list last-category last-face))))) |
22957 | 758 |
759 (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
|
760 "Increment (age) the Highlight Changes mode text property." |
22957 | 761 (let ( new-prop ) |
762 (if (eq prop 'hilit-chg-delete) | |
763 (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
|
764 (setq new-prop (nth 2 (member prop hilit-chg-list)))) |
22957 | 765 (if prop |
766 (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
|
767 (message "%d-%d unknown property %s not changed" start end prop)))) |
22957 | 768 |
769 ;;;###autoload | |
770 (defun highlight-changes-rotate-faces () | |
771 "Rotate the faces used by Highlight Changes mode. | |
772 | |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
773 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
|
774 of `highlight-changes-face-list', one level older changes are shown in |
22957 | 775 face described by the second element, and so on. Very old changes remain |
776 shown in the last face in the list. | |
777 | |
64587
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
778 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
|
779 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
|
780 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
|
781 |
64587
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
782 \(add-hook 'write-file-functions 'highlight-changes-rotate-faces nil t)" |
22957 | 783 (interactive) |
784 ;; If not in active mode do nothing but don't complain because this | |
785 ;; may be bound to a hook. | |
77896
c11694f17ad9
(highlight-changes-rotate-faces): Don't set modified flag of buffer.
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
786 (when (eq highlight-changes-mode 'active) |
c11694f17ad9
(highlight-changes-rotate-faces): Don't set modified flag of buffer.
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
787 (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
|
788 (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
|
789 ;; 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
|
790 ;; 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
|
791 ;; 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
|
792 ;; `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
|
793 ;; 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
|
794 ;; 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
|
795 ;; 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
|
796 ;; may erroneously clear the modified flag. --Stef |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
797 ;; (unless modified |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
798 ;; ;; Install the "before" entry. |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
799 ;; (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
|
800 (unwind-protect |
c11694f17ad9
(highlight-changes-rotate-faces): Don't set modified flag of buffer.
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
801 (progn |
c11694f17ad9
(highlight-changes-rotate-faces): Don't set modified flag of buffer.
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
802 ;; 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
|
803 (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
|
804 ;; 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
|
805 (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
|
806 ;; 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
|
807 (hilit-chg-map-changes 'hilit-chg-bump-change) |
c11694f17ad9
(highlight-changes-rotate-faces): Don't set modified flag of buffer.
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
808 ;; and display them all if active |
c11694f17ad9
(highlight-changes-rotate-faces): Don't set modified flag of buffer.
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
809 (if (eq highlight-changes-mode 'active) |
c11694f17ad9
(highlight-changes-rotate-faces): Don't set modified flag of buffer.
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
810 (hilit-chg-display-changes))) |
c11694f17ad9
(highlight-changes-rotate-faces): Don't set modified flag of buffer.
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
811 (unless modified |
80118
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
812 ;; Install the "after" entry. FIXME: See above. |
cb439b5418e5
(highlight-save-buffer-state): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
813 ;; (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
|
814 |
c11694f17ad9
(highlight-changes-rotate-faces): Don't set modified flag of buffer.
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
815 (restore-buffer-modified-p nil))))) |
64587
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
816 ;; This always returns nil so it is safe to use in write-file-functions |
22957 | 817 nil) |
818 | |
819 ;; ======================================================================== | |
54009
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
820 ;; Comparing buffers/files |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
821 ;; 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
|
822 |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
823 (defun highlight-markup-buffers |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
824 (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
|
825 "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
|
826 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
|
827 is non-nil." |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
828 (save-window-excursion |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
829 (let* (change-info |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
830 change-a change-b |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
831 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
|
832 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
|
833 (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
|
834 (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
|
835 (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
|
836 (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
|
837 temp-a temp-b) |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
838 (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
|
839 (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
|
840 (with-current-buffer buf-a |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
841 (save-buffer) |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
842 (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
|
843 (setq file-a nil))) |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
844 (or file-a |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
845 (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
|
846 |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
847 (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
|
848 (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
|
849 (with-current-buffer buf-b |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
850 (save-buffer) |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
851 (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
|
852 (setq file-b nil))) |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
853 (or file-b |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
854 (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
|
855 (set-buffer buf-a) |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
856 (highlight-changes-mode 'active) |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
857 (or markup-a-only (with-current-buffer buf-b |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
858 (highlight-changes-mode 'active))) |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
859 (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
|
860 |
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 (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
|
863 (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
|
864 |
54009
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
865 (hilit-chg-make-list) |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
866 (while change-a |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
867 (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
|
868 (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
|
869 (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
|
870 (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
|
871 (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
|
872 (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
|
873 (set-buffer buf-a) |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
874 (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
|
875 (or markup-a-only |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
876 (with-current-buffer buf-b |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
877 (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
|
878 buf-b-read-only) |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
879 )) |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
880 (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
|
881 (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
|
882 (or bufa-modified |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
883 (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
|
884 (or bufb-modified |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
885 (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
|
886 (if temp-a |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
887 (delete-file temp-a)) |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
888 (if temp-b |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
889 (delete-file temp-b))) |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
890 )) |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
891 |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
892 ;;;###autoload |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
893 (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
|
894 "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
|
895 |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
896 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
|
897 |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
898 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
|
899 to save the file. |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
900 |
64587
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
901 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
|
902 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
|
903 |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
904 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
|
905 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
|
906 \\[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
|
907 (interactive |
63252
f4b47991b594
(highlight-changes-colours highlight-changes-face-list,
Juanma Barranquero <lekktu@gmail.com>
parents:
63207
diff
changeset
|
908 (list |
54009
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
909 (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
|
910 (get-buffer |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
911 (read-buffer "buffer-b " |
63252
f4b47991b594
(highlight-changes-colours highlight-changes-face-list,
Juanma Barranquero <lekktu@gmail.com>
parents:
63207
diff
changeset
|
912 (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
|
913 (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
|
914 (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
|
915 (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
|
916 )) |
22957 | 917 |
918 ;;;###autoload | |
23288
17dd9ecf84f1
(highlight-compare-with-file): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
23101
diff
changeset
|
919 (defun highlight-compare-with-file (file-b) |
17dd9ecf84f1
(highlight-compare-with-file): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
23101
diff
changeset
|
920 "Compare this buffer with a file, and highlight differences. |
22957 | 921 |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
922 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
|
923 this function is called interactively. |
22957 | 924 |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
925 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
|
926 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
|
927 read in temporarily but the buffer is deleted. |
22957 | 928 |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
929 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
|
930 changes are made, so \\[highlight-changes-next-change] and |
22957 | 931 \\[highlight-changes-previous-change] will not work." |
932 (interactive (list | |
933 (read-file-name | |
934 "File to compare with? " ;; prompt | |
935 "" ;; directory | |
936 nil ;; default | |
937 'yes ;; must exist | |
54009
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
938 (let ((f (buffer-file-name (current-buffer)))) |
63252
f4b47991b594
(highlight-changes-colours highlight-changes-face-list,
Juanma Barranquero <lekktu@gmail.com>
parents:
63207
diff
changeset
|
939 (if f |
54009
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
940 (progn |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
941 (setq f (make-backup-file-name f)) |
63252
f4b47991b594
(highlight-changes-colours highlight-changes-face-list,
Juanma Barranquero <lekktu@gmail.com>
parents:
63207
diff
changeset
|
942 (or (file-exists-p f) |
54009
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
943 (setq f nil))) |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
944 ) |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
945 f)))) |
22957 | 946 (let* ((buf-a (current-buffer)) |
947 (file-a (buffer-file-name)) | |
948 (existing-buf (get-file-buffer file-b)) | |
949 (buf-b (or existing-buf | |
950 (find-file-noselect file-b))) | |
54009
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
951 (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
|
952 (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
|
953 (unless existing-buf |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
954 (kill-buffer buf-b)) |
303333d2f1f3
Use require instead of eval-and-compile.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
52401
diff
changeset
|
955 )) |
22957 | 956 |
957 | |
958 (defun hilit-chg-get-diff-info (buf-a file-a buf-b file-b) | |
959 (let ((e nil) x y) ;; e is set by function hilit-chg-get-diff-list-hk | |
960 (ediff-setup buf-a file-a buf-b file-b | |
961 nil nil ; buf-c file-C | |
962 'hilit-chg-get-diff-list-hk | |
963 (list (cons 'ediff-job-name 'something)) | |
964 ) | |
965 (ediff-with-current-buffer e (ediff-really-quit nil)) | |
966 (list x y))) | |
967 | |
968 | |
969 (defun hilit-chg-get-diff-list-hk () | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
970 ;; x and y are dynamically bound by hilit-chg-get-diff-info |
22957 | 971 ;; which calls this function as a hook |
972 (defvar x) ;; placate the byte-compiler | |
973 (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
|
974 (setq e (current-buffer)) |
22957 | 975 (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
|
976 (setq x nil y nil) ;; x and y are bound by hilit-chg-get-diff-info |
22957 | 977 (while (< n ediff-number-of-differences) |
978 (ediff-make-fine-diffs n) | |
979 (setq va (ediff-get-fine-diff-vector n 'A)) | |
980 ;; va is a vector if there are fine differences | |
981 (if va | |
982 (setq a (append va nil)) | |
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
parents:
44740
diff
changeset
|
983 ;; if not, get the unrefined difference |
22957 | 984 (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
|
985 (setq a (list (elt va 0)))) |
22957 | 986 ;; a list a list |
987 (setq p a) | |
988 (while p | |
989 (setq extent (list (overlay-start (car p)) | |
990 (overlay-end (car p)))) | |
991 (setq p (cdr p)) | |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
992 (setq x (append x (list extent) )));; while p |
22957 | 993 ;; |
994 (setq vb (ediff-get-fine-diff-vector n 'B)) | |
995 ;; vb is a vector | |
996 (if vb | |
997 (setq b (append vb nil)) | |
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
parents:
44740
diff
changeset
|
998 ;; if not, get the unrefined difference |
22957 | 999 (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
|
1000 (setq b (list (elt vb 0)))) |
22957 | 1001 ;; b list a list |
1002 (setq p b) | |
1003 (while p | |
1004 (setq extent (list (overlay-start (car p)) | |
1005 (overlay-end (car p)))) | |
1006 (setq p (cdr p)) | |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
1007 (setq y (append y (list extent) ))) |
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
1008 (setq n (1+ n)));; while |
22957 | 1009 ;; ediff-quit doesn't work here. |
1010 ;; No point in returning a value, since this is a hook function. | |
1011 )) | |
1012 | |
1013 ;; ======================= automatic stuff ============== | |
1014 | |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
1015 ;; Global Highlight Changes mode is modeled after Global Font-lock mode. |
22957 | 1016 ;; Three hooks are used to gain control. When Global Changes Mode is |
60902
7160fe3a7ef1
find-file-hooks -> find-file-hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59601
diff
changeset
|
1017 ;; enabled, `find-file-hook' and `change-major-mode-hook' are set. |
7160fe3a7ef1
find-file-hooks -> find-file-hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59601
diff
changeset
|
1018 ;; `find-file-hook' is called when visiting a file, the new mode is |
22957 | 1019 ;; known at this time. |
1020 ;; `change-major-mode-hook' is called when a buffer is changing mode. | |
1021 ;; This could be because of finding a file in which case | |
60902
7160fe3a7ef1
find-file-hooks -> find-file-hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59601
diff
changeset
|
1022 ;; `find-file-hook' has already been called and has done its work. |
22957 | 1023 ;; However, it also catches the case where a new mode is being set by |
1024 ;; the user. However, it is called from `kill-all-variables' and at | |
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
parents:
44740
diff
changeset
|
1025 ;; this time the mode is the old mode, which is not what we want. |
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
parents:
44740
diff
changeset
|
1026 ;; So, our function temporarily sets `post-command-hook' which will |
22957 | 1027 ;; be called after the buffer has been completely set up (with the new |
1028 ;; mode). It then removes the `post-command-hook'. | |
1029 ;; One other wrinkle - every M-x command runs the `change-major-mode-hook' | |
1030 ;; so we ignore this by examining the buffer name. | |
1031 | |
1032 | |
1033 (defun hilit-chg-major-mode-hook () | |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
1034 (add-hook 'post-command-hook 'hilit-chg-post-command-hook)) |
22957 | 1035 |
1036 (defun hilit-chg-post-command-hook () | |
1037 ;; This is called after changing a major mode, but also after each | |
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
parents:
44740
diff
changeset
|
1038 ;; M-x command, in which case the current buffer is a minibuffer. |
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
parents:
44740
diff
changeset
|
1039 ;; In that case, do not act on it here, but don't turn it off |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
1040 ;; either, we will get called here again soon-after. |
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
parents:
44740
diff
changeset
|
1041 ;; Also, don't enable it for other special buffers. |
22957 | 1042 (if (string-match "^[ *]" (buffer-name)) |
1043 nil ;; (message "ignoring this post-command-hook") | |
1044 (remove-hook 'post-command-hook 'hilit-chg-post-command-hook) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
1045 ;; The following check isn't necessary, since |
22957 | 1046 ;; hilit-chg-turn-on-maybe makes this check too. |
1047 (or highlight-changes-mode ;; don't turn it on if it already is | |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
1048 (hilit-chg-turn-on-maybe highlight-changes-global-initial-state)))) |
22957 | 1049 |
1050 (defun hilit-chg-check-global () | |
1051 ;; This is called from the find file hook. | |
1052 (hilit-chg-turn-on-maybe highlight-changes-global-initial-state)) | |
1053 | |
1054 | |
1055 ;;;###autoload | |
1056 (defun global-highlight-changes (&optional arg) | |
1057 "Turn on or off global Highlight Changes mode. | |
1058 | |
1059 When called interactively: | |
1060 - if no prefix, toggle global Highlight Changes mode on or off | |
1061 - if called with a positive prefix (or just C-u) turn it on in active mode | |
68524
2f9b0e4b3a95
(highlight-changes-initial-state, highlight-changes-global-initial-state):
Juanma Barranquero <lekktu@gmail.com>
parents:
64895
diff
changeset
|
1062 - if called with a zero prefix turn it on in passive mode |
22957 | 1063 - if called with a negative prefix turn it off |
1064 | |
1065 When called from a program: | |
1066 - if ARG is nil or omitted, turn it off | |
47259
08b8c2bc2e81
(highlight-changes-colours, highlight-changes-active-string,
Juanma Barranquero <lekktu@gmail.com>
parents:
44740
diff
changeset
|
1067 - if ARG is `active', turn it on in active mode |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
1068 - if ARG is `passive', turn it on in passive mode |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
1069 - otherwise just turn it on |
22957 | 1070 |
1071 When global Highlight Changes mode is enabled, Highlight Changes mode is turned | |
1072 on for future \"suitable\" buffers (and for \"suitable\" existing buffers if | |
1073 variable `highlight-changes-global-changes-existing-buffers' is non-nil). | |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
1074 \"Suitability\" is determined by variable `highlight-changes-global-modes'." |
22957 | 1075 |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
1076 (interactive |
22957 | 1077 (list |
1078 (cond | |
1079 ((null current-prefix-arg) | |
1080 ;; no arg => toggle it on/off | |
1081 (setq global-highlight-changes (not global-highlight-changes))) | |
1082 ;; positive interactive arg - turn it on as active | |
1083 ((> (prefix-numeric-value current-prefix-arg) 0) | |
1084 (setq global-highlight-changes t) | |
1085 'active) | |
1086 ;; zero interactive arg - turn it on as passive | |
1087 ((= (prefix-numeric-value current-prefix-arg) 0) | |
1088 (setq global-highlight-changes t) | |
1089 'passive) | |
1090 ;; negative interactive arg - turn it off | |
1091 (t | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
1092 (setq global-highlight-changes nil) |
22957 | 1093 nil)))) |
1094 | |
1095 (if arg | |
1096 (progn | |
1097 (if (eq arg 'active) | |
1098 (setq highlight-changes-global-initial-state 'active) | |
68738
974d9b214cd3
(hilit-chg-update-all-buffers): Use `mapc' instead of `mapcar'; return nil.
Juanma Barranquero <lekktu@gmail.com>
parents:
68651
diff
changeset
|
1099 (if (eq arg 'passive) |
22957 | 1100 (setq highlight-changes-global-initial-state 'passive))) |
1101 (setq global-highlight-changes t) | |
44740
385762249723
(global-highlight-changes): Capitalize status texts.
Pavel Janík <Pavel@Janik.cz>
parents:
43132
diff
changeset
|
1102 (message "Turning ON Global Highlight Changes mode in %s state" |
22957 | 1103 highlight-changes-global-initial-state) |
60902
7160fe3a7ef1
find-file-hooks -> find-file-hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59601
diff
changeset
|
1104 ;; FIXME: Not sure what this was intended to do. --Stef |
7160fe3a7ef1
find-file-hooks -> find-file-hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59601
diff
changeset
|
1105 ;; (add-hook 'hilit-chg-major-mode-hook 'hilit-chg-major-mode-hook) |
7160fe3a7ef1
find-file-hooks -> find-file-hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59601
diff
changeset
|
1106 (add-hook 'find-file-hook 'hilit-chg-check-global) |
22957 | 1107 (if highlight-changes-global-changes-existing-buffers |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
1108 (hilit-chg-update-all-buffers |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
1109 highlight-changes-global-initial-state))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
1110 |
44740
385762249723
(global-highlight-changes): Capitalize status texts.
Pavel Janík <Pavel@Janik.cz>
parents:
43132
diff
changeset
|
1111 (message "Turning OFF global Highlight Changes mode") |
60902
7160fe3a7ef1
find-file-hooks -> find-file-hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59601
diff
changeset
|
1112 ;; FIXME: Not sure what this was intended to do. --Stef |
7160fe3a7ef1
find-file-hooks -> find-file-hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59601
diff
changeset
|
1113 ;; (remove-hook 'hilit-chg-major-mode-hook 'hilit-chg-major-mode-hook) |
7160fe3a7ef1
find-file-hooks -> find-file-hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59601
diff
changeset
|
1114 (remove-hook 'post-command-hook 'hilit-chg-post-command-hook) |
7160fe3a7ef1
find-file-hooks -> find-file-hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59601
diff
changeset
|
1115 (remove-hook 'find-file-hook 'hilit-chg-check-global) |
22957 | 1116 (if highlight-changes-global-changes-existing-buffers |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
1117 (hilit-chg-update-all-buffers nil)))) |
22957 | 1118 |
1119 | |
1120 (defun hilit-chg-turn-on-maybe (value) | |
1121 "Turn on Highlight Changes mode if it is appropriate for this buffer. | |
1122 | |
1123 A buffer is appropriate for Highlight Changes mode if all these are true: | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
1124 - the buffer is not a special buffer (one whose name begins with |
64587
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
1125 `*' or ` '), |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
1126 - the buffer's mode is suitable as per variable |
64587
e35a761796a9
(highlight-changes-global-initial-state, highlight-compare-buffers,
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
1127 `highlight-changes-global-modes', |
22957 | 1128 - Highlight Changes mode is not already on for this buffer. |
1129 | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
1130 This function is called from `hilit-chg-update-all-buffers' or |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
1131 from `global-highlight-changes' when turning on global Highlight Changes mode." |
22957 | 1132 (or highlight-changes-mode ; do nothing if already on |
1133 (if | |
1134 (cond | |
1135 ((null highlight-changes-global-modes) | |
1136 nil) | |
1137 ((functionp highlight-changes-global-modes) | |
1138 (funcall highlight-changes-global-modes)) | |
1139 ((listp highlight-changes-global-modes) | |
1140 (if (eq (car-safe highlight-changes-global-modes) 'not) | |
1141 (not (memq major-mode (cdr highlight-changes-global-modes))) | |
1142 (memq major-mode highlight-changes-global-modes))) | |
1143 (t | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
1144 (and |
68738
974d9b214cd3
(hilit-chg-update-all-buffers): Use `mapc' instead of `mapcar'; return nil.
Juanma Barranquero <lekktu@gmail.com>
parents:
68651
diff
changeset
|
1145 (not (string-match "^[ *]" (buffer-name))) |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
1146 (buffer-file-name)))) |
22957 | 1147 (progn |
1148 (hilit-chg-set value) | |
30962
b309b17a6025
General cleanup of doc strings, comments and
Gerd Moellmann <gerd@gnu.org>
parents:
30924
diff
changeset
|
1149 (run-hooks 'highlight-changes-enable-hook))))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
1150 |
22957 | 1151 |
1152 (defun hilit-chg-turn-off-maybe () | |
1153 (if highlight-changes-mode | |
1154 (progn | |
1155 (run-hooks 'highlight-changes-disable-hook) | |
1156 (hilit-chg-clear)))) | |
1157 | |
1158 | |
1159 (defun hilit-chg-update-all-buffers (value) | |
68738
974d9b214cd3
(hilit-chg-update-all-buffers): Use `mapc' instead of `mapcar'; return nil.
Juanma Barranquero <lekktu@gmail.com>
parents:
68651
diff
changeset
|
1160 (mapc |
22957 | 1161 (function (lambda (buffer) |
1162 (with-current-buffer buffer | |
1163 (if value | |
1164 (hilit-chg-turn-on-maybe value) | |
1165 (hilit-chg-turn-off-maybe)) | |
1166 ))) | |
68738
974d9b214cd3
(hilit-chg-update-all-buffers): Use `mapc' instead of `mapcar'; return nil.
Juanma Barranquero <lekktu@gmail.com>
parents:
68651
diff
changeset
|
1167 (buffer-list)) |
974d9b214cd3
(hilit-chg-update-all-buffers): Use `mapc' instead of `mapcar'; return nil.
Juanma Barranquero <lekktu@gmail.com>
parents:
68651
diff
changeset
|
1168 nil) |
22957 | 1169 |
64895
bde8cc177550
Add handler to desktop-minor-mode-handlers.
Lars Hansen <larsh@soem.dk>
parents:
64762
diff
changeset
|
1170 ;;;; Desktop support. |
bde8cc177550
Add handler to desktop-minor-mode-handlers.
Lars Hansen <larsh@soem.dk>
parents:
64762
diff
changeset
|
1171 |
bde8cc177550
Add handler to desktop-minor-mode-handlers.
Lars Hansen <larsh@soem.dk>
parents:
64762
diff
changeset
|
1172 ;; 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
|
1173 (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
|
1174 (highlight-changes-mode |
bde8cc177550
Add handler to desktop-minor-mode-handlers.
Lars Hansen <larsh@soem.dk>
parents:
64762
diff
changeset
|
1175 (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
|
1176 |
bde8cc177550
Add handler to desktop-minor-mode-handlers.
Lars Hansen <larsh@soem.dk>
parents:
64762
diff
changeset
|
1177 (add-to-list 'desktop-minor-mode-handlers |
bde8cc177550
Add handler to desktop-minor-mode-handlers.
Lars Hansen <larsh@soem.dk>
parents:
64762
diff
changeset
|
1178 '(highlight-changes-mode . hilit-chg-desktop-restore)) |
bde8cc177550
Add handler to desktop-minor-mode-handlers.
Lars Hansen <larsh@soem.dk>
parents:
64762
diff
changeset
|
1179 |
68752
e065294f485f
Add highlight-changes-mode to desktop-locals-to-save.
Lars Hansen <larsh@soem.dk>
parents:
68738
diff
changeset
|
1180 (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
|
1181 |
22957 | 1182 ;; ===================== debug ================== |
1183 ;; For debug & test use: | |
1184 ;; | |
1185 ;; (defun hilit-chg-debug-show (&optional beg end) | |
1186 ;; (interactive) | |
1187 ;; (message "--- hilit-chg-debug-show ---") | |
1188 ;; (hilit-chg-map-changes '(lambda (prop start end) | |
1189 ;; (message "%d-%d: %s" start end prop) | |
1190 ;; ) | |
1191 ;; beg end | |
1192 ;; )) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47259
diff
changeset
|
1193 ;; |
22957 | 1194 ;; ================== end of debug =============== |
1195 | |
1196 (provide 'hilit-chg) | |
22958
cd50dfa70bb2
Delete the undo-in-progress compatibility code.
Richard M. Stallman <rms@gnu.org>
parents:
22957
diff
changeset
|
1197 |
59601
73b89f6377fc
(highlight-changes-mode): Don't autoload.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54009
diff
changeset
|
1198 ;; arch-tag: de00301d-5bad-44da-aa82-e0e010b0c463 |
22957 | 1199 ;;; hilit-chg.el ends here |