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