Commit | Line | Data |
---|---|---|
8343426b | 1 | ;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff |
b578f267 | 2 | |
ddc90f39 | 3 | ;; Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. |
475f9031 KH |
4 | |
5 | ;; Author: Michael Kifer <kifer@cs.sunysb.edu> | |
6 | ||
7 | ;; This file is part of GNU Emacs. | |
8 | ||
9 | ;; GNU Emacs is free software; you can redistribute it and/or modify | |
10 | ;; it under the terms of the GNU General Public License as published by | |
11 | ;; the Free Software Foundation; either version 2, or (at your option) | |
12 | ;; any later version. | |
13 | ||
14 | ;; GNU Emacs is distributed in the hope that it will be useful, | |
15 | ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 | ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
17 | ;; GNU General Public License for more details. | |
18 | ||
19 | ;; You should have received a copy of the GNU General Public License | |
b578f267 EN |
20 | ;; along with GNU Emacs; see the file COPYING. If not, write to the |
21 | ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
22 | ;; Boston, MA 02111-1307, USA. | |
475f9031 | 23 | |
b578f267 | 24 | ;;; Code: |
475f9031 | 25 | |
bbe6126c MK |
26 | ;; Start compiler pacifier |
27 | (defvar ediff-metajob-name) | |
28 | (defvar ediff-meta-buffer) | |
29 | (defvar pm-color-alist) | |
30 | (defvar ediff-grab-mouse) | |
31 | (defvar ediff-mouse-pixel-position) | |
32 | (defvar ediff-mouse-pixel-threshold) | |
33 | (defvar ediff-whitespace) | |
34 | (defvar ediff-multiframe) | |
ddc90f39 MK |
35 | |
36 | (and noninteractive | |
37 | (eval-when-compile | |
38 | (load "ange-ftp" 'noerror))) | |
bbe6126c MK |
39 | ;; end pacifier |
40 | ||
41d25ad0 | 41 | ;; Is it XEmacs? |
8343426b | 42 | (defconst ediff-xemacs-p (string-match "XEmacs" emacs-version)) |
41d25ad0 KH |
43 | ;; Is it Emacs? |
44 | (defconst ediff-emacs-p (not ediff-xemacs-p)) | |
bbe6126c MK |
45 | |
46 | (defvar ediff-force-faces nil | |
47 | "If t, Ediff will think that it is running on a display that supports faces. | |
48 | This is provided as a temporary relief for users of face-capable displays | |
49 | that Ediff doesn't know about.") | |
50 | ||
41d25ad0 KH |
51 | ;; Are we running as a window application or on a TTY? |
52 | (defsubst ediff-device-type () | |
53 | (if ediff-emacs-p | |
54 | window-system | |
55 | (device-type (selected-device)))) | |
bbe6126c | 56 | |
41d25ad0 | 57 | ;; in XEmacs: device-type is tty on tty and stream in batch. |
4ae69eac MK |
58 | (defun ediff-window-display-p () |
59 | (and (ediff-device-type) (not (memq (ediff-device-type) '(tty pc stream))))) | |
60 | ||
61 | ;; test if supports faces | |
62 | ;; ediff-force-faces is for those devices that support faces, but we don't know | |
63 | ;; this yet | |
64 | (defun ediff-has-face-support-p () | |
65 | (cond ((ediff-window-display-p)) | |
66 | (ediff-force-faces) | |
67 | (ediff-emacs-p (memq (ediff-device-type) '(pc))) | |
68 | (ediff-xemacs-p (memq (ediff-device-type) '(tty pc))))) | |
bf5d92c5 | 69 | |
bbe6126c MK |
70 | |
71 | ;; Defines SYMBOL as an advertised local variable. | |
72 | ;; Performs a defvar, then executes `make-variable-buffer-local' on | |
73 | ;; the variable. Also sets the `permanent-local' property, | |
74 | ;; so that `kill-all-local-variables' (called by major-mode setting | |
75 | ;; commands) won't destroy Ediff control variables. | |
76 | ;; | |
77 | ;; Plagiarised from `emerge-defvar-local' for XEmacs. | |
78 | (defmacro ediff-defvar-local (var value doc) | |
79 | (` (progn | |
80 | (defvar (, var) (, value) (, doc)) | |
81 | (make-variable-buffer-local '(, var)) | |
82 | (put '(, var) 'permanent-local t)))) | |
83 | ||
84 | ||
85 | ||
86 | ;; Variables that control each Ediff session---local to the control buffer. | |
87 | ||
88 | ;; Mode variables | |
89 | ;; The buffer in which the A variant is stored. | |
90 | (ediff-defvar-local ediff-buffer-A nil "") | |
91 | ;; The buffer in which the B variant is stored. | |
92 | (ediff-defvar-local ediff-buffer-B nil "") | |
93 | ;; The buffer in which the C variant is stored. | |
94 | (ediff-defvar-local ediff-buffer-C nil "") | |
95 | ;; Ancestor buffer | |
96 | (ediff-defvar-local ediff-ancestor-buffer nil "") | |
ddc90f39 | 97 | ;; The Ediff control buffer |
bbe6126c | 98 | (ediff-defvar-local ediff-control-buffer nil "") |
475f9031 | 99 | |
e756eb9f MK |
100 | |
101 | ;; Association between buff-type and ediff-buffer-* | |
102 | (defconst ediff-buffer-alist | |
103 | '((?A . ediff-buffer-A) | |
104 | (?B . ediff-buffer-B) | |
105 | (?C . ediff-buffer-C))) | |
106 | ||
475f9031 KH |
107 | ;;; Macros |
108 | (defmacro ediff-odd-p (arg) | |
109 | (` (eq (logand (, arg) 1) 1))) | |
110 | ||
111 | (defmacro ediff-buffer-live-p (buf) | |
112 | (` (and (, buf) (get-buffer (, buf)) (buffer-name (get-buffer (, buf)))))) | |
113 | ||
114 | (defmacro ediff-get-buffer (arg) | |
115 | (` (cond ((eq (, arg) 'A) ediff-buffer-A) | |
116 | ((eq (, arg) 'B) ediff-buffer-B) | |
117 | ((eq (, arg) 'C) ediff-buffer-C) | |
8343426b | 118 | ((eq (, arg) 'Ancestor) ediff-ancestor-buffer) |
475f9031 KH |
119 | ) |
120 | )) | |
121 | ||
122 | (defmacro ediff-get-value-according-to-buffer-type (buf-type list) | |
123 | (` (cond ((eq (, buf-type) 'A) (nth 0 (, list))) | |
124 | ((eq (, buf-type) 'B) (nth 1 (, list))) | |
125 | ((eq (, buf-type) 'C) (nth 2 (, list)))))) | |
126 | ||
127 | (defmacro ediff-char-to-buftype (arg) | |
128 | (` (cond ((memq (, arg) '(?a ?A)) 'A) | |
129 | ((memq (, arg) '(?b ?B)) 'B) | |
130 | ((memq (, arg) '(?c ?C)) 'C) | |
131 | ) | |
132 | )) | |
e756eb9f | 133 | |
985d0dad | 134 | |
e756eb9f MK |
135 | ;; A-list is supposed to be of the form (A . symb) (B . symb)...) |
136 | ;; where the first part of any association is a buffer type and the second is | |
137 | ;; an appropriate symbol. Given buffer-type, this function returns the | |
138 | ;; symbol. This is used to avoid using `intern' | |
139 | (defsubst ediff-get-symbol-from-alist (buf-type alist) | |
140 | (cdr (assoc buf-type alist))) | |
475f9031 | 141 | |
e756eb9f MK |
142 | (defconst ediff-difference-vector-alist |
143 | '((A . ediff-difference-vector-A) | |
144 | (B . ediff-difference-vector-B) | |
145 | (C . ediff-difference-vector-C) | |
146 | (Ancestor . ediff-difference-vector-Ancestor))) | |
147 | ||
475f9031 KH |
148 | (defmacro ediff-get-difference (n buf-type) |
149 | (` (aref | |
150 | (symbol-value | |
e756eb9f MK |
151 | (ediff-get-symbol-from-alist |
152 | (, buf-type) ediff-difference-vector-alist)) | |
153 | (, n)))) | |
475f9031 | 154 | |
ddc90f39 | 155 | ;; Tell if it has been previously determined that the region has |
475f9031 KH |
156 | ;; no diffs other than the white space and newlines |
157 | ;; The argument, N, is the diff region number used by Ediff to index the | |
158 | ;; diff vector. It is 1 less than the number seen by the user. | |
ddc90f39 MK |
159 | ;; Returns: |
160 | ;; t if the diffs are whitespace in all buffers | |
161 | ;; 'A (in 3-buf comparison only) if there are only whitespace | |
162 | ;; diffs in bufs B and C | |
163 | ;; 'B (in 3-buf comparison only) if there are only whitespace | |
164 | ;; diffs in bufs A and C | |
165 | ;; 'C (in 3-buf comparison only) if there are only whitespace | |
166 | ;; diffs in bufs A and B | |
475f9031 KH |
167 | ;; |
168 | ;; A difference vector has the form: | |
169 | ;; [diff diff diff ...] | |
170 | ;; where each diff has the form: | |
171 | ;; [overlay fine-diff-vector no-fine-diffs-flag] | |
172 | ;; fine-diff-vector is a vector [fine-diff fine-diff fine-diff ...] | |
173 | (defmacro ediff-no-fine-diffs-p (n) | |
174 | (` (aref (ediff-get-difference (, n) 'A) 2))) | |
175 | ||
176 | (defmacro ediff-get-diff-overlay-from-diff-record (diff-rec) | |
177 | (` (aref (, diff-rec) 0))) | |
178 | ||
179 | (defmacro ediff-get-diff-overlay (n buf-type) | |
180 | (` (ediff-get-diff-overlay-from-diff-record | |
181 | (ediff-get-difference (, n) (, buf-type))))) | |
182 | ||
183 | (defmacro ediff-get-fine-diff-vector-from-diff-record (diff-rec) | |
184 | (` (aref (, diff-rec) 1))) | |
185 | ||
186 | (defmacro ediff-set-fine-diff-vector (n buf-type fine-vec) | |
187 | (` (aset (ediff-get-difference (, n) (, buf-type)) 1 (, fine-vec)))) | |
188 | ||
189 | (defmacro ediff-get-state-of-diff (n buf-type) | |
190 | (` (if (ediff-buffer-live-p ediff-buffer-C) | |
191 | (aref (ediff-get-difference (, n) (, buf-type)) 3)))) | |
192 | (defmacro ediff-set-state-of-diff (n buf-type val) | |
193 | (` (aset (ediff-get-difference (, n) (, buf-type)) 3 (, val)))) | |
194 | (defmacro ediff-get-state-of-merge (n) | |
8343426b MK |
195 | (` (if ediff-state-of-merge |
196 | (aref (aref ediff-state-of-merge (, n)) 0)))) | |
197 | (defmacro ediff-get-state-of-ancestor (n) | |
198 | (` (if ediff-state-of-merge | |
199 | (aref (aref ediff-state-of-merge (, n)) 1)))) | |
475f9031 | 200 | (defmacro ediff-set-state-of-merge (n val) |
8343426b MK |
201 | (` (if ediff-state-of-merge |
202 | (aset (aref ediff-state-of-merge (, n)) 0 (, val))))) | |
475f9031 KH |
203 | |
204 | ;; if flag is t, puts a mark on diff region saying that | |
205 | ;; the differences are in white space only. If flag is nil, | |
206 | ;; the region is marked as essential (i.e., differences are | |
207 | ;; not just in the white space and newlines.) | |
208 | (defmacro ediff-mark-diff-as-space-only (n flag) | |
209 | (` (aset (ediff-get-difference (, n) 'A) 2 (, flag)))) | |
210 | ||
211 | (defmacro ediff-get-fine-diff-vector (n buf-type) | |
212 | (` (ediff-get-fine-diff-vector-from-diff-record | |
213 | (ediff-get-difference (, n) (, buf-type))))) | |
214 | ||
e756eb9f MK |
215 | ;; Macro to switch to BUFFER, evaluate BODY, returns to original buffer. |
216 | ;; Doesn't save the point and mark. | |
217 | ;; This is `with-current-buffer' with the added test for live buffers." | |
218 | (defmacro ediff-with-current-buffer (buffer &rest body) | |
219 | (` (if (ediff-buffer-live-p (, buffer)) | |
220 | (save-current-buffer | |
221 | (set-buffer (, buffer)) | |
222 | (,@ body)) | |
223 | (or (eq this-command 'ediff-quit) | |
224 | (error ediff-KILLED-VITAL-BUFFER)) | |
225 | ))) | |
226 | ||
475f9031 | 227 | |
8343426b MK |
228 | (defsubst ediff-multiframe-setup-p () |
229 | (and (ediff-window-display-p) ediff-multiframe)) | |
475f9031 KH |
230 | |
231 | (defmacro ediff-narrow-control-frame-p () | |
232 | (` (and (ediff-multiframe-setup-p) | |
233 | (equal ediff-help-message ediff-brief-message-string)))) | |
234 | ||
235 | (defmacro ediff-3way-comparison-job () | |
236 | (` (memq | |
237 | ediff-job-name | |
238 | '(ediff-files3 ediff-buffers3)))) | |
239 | (ediff-defvar-local ediff-3way-comparison-job nil "") | |
240 | ||
241 | (defmacro ediff-merge-job () | |
242 | (` (memq | |
243 | ediff-job-name | |
244 | '(ediff-merge-files | |
245 | ediff-merge-buffers | |
246 | ediff-merge-files-with-ancestor | |
247 | ediff-merge-buffers-with-ancestor | |
248 | ediff-merge-revisions | |
249 | ediff-merge-revisions-with-ancestor)))) | |
250 | (ediff-defvar-local ediff-merge-job nil "") | |
251 | ||
252 | (defmacro ediff-merge-with-ancestor-job () | |
253 | (` (memq | |
254 | ediff-job-name | |
255 | '(ediff-merge-files-with-ancestor | |
256 | ediff-merge-buffers-with-ancestor | |
257 | ediff-merge-revisions-with-ancestor)))) | |
258 | (ediff-defvar-local ediff-merge-with-ancestor-job nil "") | |
259 | ||
260 | (defmacro ediff-3way-job () | |
261 | (` (or ediff-3way-comparison-job ediff-merge-job))) | |
262 | (ediff-defvar-local ediff-3way-job nil "") | |
263 | ||
264 | ;; A diff3 job is like a 3way job, but ediff-merge doesn't require the use | |
265 | ;; of diff3. | |
266 | (defmacro ediff-diff3-job () | |
267 | (` (or ediff-3way-comparison-job | |
268 | ediff-merge-with-ancestor-job))) | |
269 | (ediff-defvar-local ediff-diff3-job nil "") | |
270 | ||
41d25ad0 KH |
271 | (defmacro ediff-windows-job () |
272 | (` (memq ediff-job-name '(ediff-windows-wordwise ediff-windows-linewise)))) | |
273 | (ediff-defvar-local ediff-windows-job nil "") | |
274 | ||
475f9031 | 275 | (defmacro ediff-word-mode-job () |
41d25ad0 | 276 | (` (memq ediff-job-name '(ediff-windows-wordwise ediff-regions-wordwise)))) |
475f9031 KH |
277 | (ediff-defvar-local ediff-word-mode-job nil "") |
278 | ||
41d25ad0 KH |
279 | (defmacro ediff-narrow-job () |
280 | (` (memq ediff-job-name '(ediff-windows-wordwise | |
281 | ediff-regions-wordwise | |
282 | ediff-windows-linewise | |
283 | ediff-regions-linewise)))) | |
284 | (ediff-defvar-local ediff-narrow-job nil "") | |
285 | ||
8343426b MK |
286 | ;; Note: ediff-merge-directory-revisions-with-ancestor is not treated as an |
287 | ;; ancestor metajob, since it behaves differently. | |
288 | (defsubst ediff-ancestor-metajob (&optional metajob) | |
289 | (memq (or metajob ediff-metajob-name) | |
290 | '(ediff-merge-directories-with-ancestor | |
291 | ediff-merge-filegroups-with-ancestor))) | |
292 | (defsubst ediff-revision-metajob (&optional metajob) | |
293 | (memq (or metajob ediff-metajob-name) | |
294 | '(ediff-directory-revisions | |
295 | ediff-merge-directory-revisions | |
296 | ediff-merge-directory-revisions-with-ancestor))) | |
bbe6126c MK |
297 | (defsubst ediff-patch-metajob (&optional metajob) |
298 | (memq (or metajob ediff-metajob-name) | |
299 | '(ediff-multifile-patch))) | |
300 | ;; metajob involving only one group of files, such as multipatch or directory | |
301 | ;; revision | |
302 | (defsubst ediff-one-filegroup-metajob (&optional metajob) | |
8343426b | 303 | (or (ediff-revision-metajob metajob) |
bbe6126c | 304 | (ediff-patch-metajob metajob) |
8343426b MK |
305 | ;; add more here |
306 | )) | |
307 | (defsubst ediff-collect-diffs-metajob (&optional metajob) | |
4ae69eac MK |
308 | (memq (or metajob ediff-metajob-name) |
309 | '(ediff-directories | |
310 | ediff-directory-revisions | |
311 | ediff-merge-directories | |
312 | ediff-merge-directories-with-ancestor | |
313 | ediff-merge-directory-revisions | |
314 | ediff-merge-directory-revisions-with-ancestor | |
315 | ;; add more here | |
316 | ))) | |
92c51e07 MK |
317 | (defsubst ediff-merge-metajob (&optional metajob) |
318 | (memq (or metajob ediff-metajob-name) | |
319 | '(ediff-merge-directories | |
320 | ediff-merge-directories-with-ancestor | |
321 | ediff-merge-directory-revisions | |
322 | ediff-merge-directory-revisions-with-ancestor | |
323 | ediff-merge-filegroups-with-ancestor | |
324 | ;; add more here | |
325 | ))) | |
4ae69eac | 326 | |
8343426b MK |
327 | (defsubst ediff-metajob3 (&optional metajob) |
328 | (memq (or metajob ediff-metajob-name) | |
329 | '(ediff-merge-directories-with-ancestor | |
330 | ediff-merge-filegroups-with-ancestor | |
331 | ediff-directories3 | |
332 | ediff-filegroups3))) | |
333 | (defsubst ediff-comparison-metajob3 (&optional metajob) | |
334 | (memq (or metajob ediff-metajob-name) | |
335 | '(ediff-directories3 ediff-filegroups3))) | |
336 | ||
bf5d92c5 MK |
337 | ;; with no argument, checks if we are in ediff-control-buffer |
338 | ;; with argument, checks if we are in ediff-meta-buffer | |
339 | (defun ediff-in-control-buffer-p (&optional meta-buf-p) | |
340 | (and (boundp 'ediff-control-buffer) | |
341 | (eq (if meta-buf-p ediff-meta-buffer ediff-control-buffer) | |
342 | (current-buffer)))) | |
343 | ||
344 | (defsubst ediff-barf-if-not-control-buffer (&optional meta-buf-p) | |
345 | (or (ediff-in-control-buffer-p meta-buf-p) | |
8343426b MK |
346 | (error "%S: This command runs in Ediff Control Buffer only!" |
347 | this-command))) | |
348 | ||
475f9031 KH |
349 | ;; Hook variables |
350 | ||
1e70790f | 351 | (defcustom ediff-before-setup-windows-hook nil |
8343426b | 352 | "*Hooks to run before Ediff sets its window configuration. |
475f9031 | 353 | This can be used to save the previous window config, which can be restored |
1e70790f MK |
354 | on ediff-quit or ediff-suspend." |
355 | :type 'hook | |
356 | :group 'ediff) | |
357 | (defcustom ediff-after-setup-windows-hook nil | |
8343426b | 358 | "*Hooks to run after Ediff sets its window configuration. |
1e70790f MK |
359 | This can be used to set up control window or icon in a desired place." |
360 | :type 'hook | |
361 | :group 'ediff) | |
362 | (defcustom ediff-before-setup-control-frame-hook nil | |
475f9031 KH |
363 | "*Hooks run before setting up the frame to display Ediff Control Panel. |
364 | Can be used to change control frame parameters to position it where it | |
1e70790f MK |
365 | is desirable." |
366 | :type 'hook | |
367 | :group 'ediff) | |
368 | (defcustom ediff-after-setup-control-frame-hook nil | |
475f9031 | 369 | "*Hooks run after setting up the frame to display Ediff Control Panel. |
1e70790f MK |
370 | Can be used to move the frame where it is desired." |
371 | :type 'hook | |
372 | :group 'ediff) | |
373 | (defcustom ediff-startup-hook nil | |
374 | "*Hooks to run in the control buffer after Ediff has been set up." | |
375 | :type 'hook | |
376 | :group 'ediff) | |
377 | (defcustom ediff-select-hook nil | |
378 | "*Hooks to run after a difference has been selected." | |
379 | :type 'hook | |
380 | :group 'ediff) | |
381 | (defcustom ediff-unselect-hook nil | |
382 | "*Hooks to run after a difference has been unselected." | |
383 | :type 'hook | |
384 | :group 'ediff) | |
385 | (defcustom ediff-prepare-buffer-hook nil | |
386 | "*Hooks called after buffers A, B, and C are set up." | |
387 | :type 'hook | |
388 | :group 'ediff) | |
389 | (defcustom ediff-load-hook nil | |
390 | "*Hook run after Ediff is loaded. Can be used to change defaults." | |
391 | :type 'hook | |
392 | :group 'ediff) | |
475f9031 | 393 | |
1e70790f | 394 | (defcustom ediff-mode-hook nil |
475f9031 KH |
395 | "*Hook run just after ediff-mode is set up in the control buffer. |
396 | This is done before any windows or frames are created. One can use it to | |
1e70790f MK |
397 | set local variables that determine how the display looks like." |
398 | :type 'hook | |
399 | :group 'ediff) | |
400 | (defcustom ediff-keymap-setup-hook nil | |
401 | "*Hook run just after the default bindings in Ediff keymap are set up." | |
402 | :type 'hook | |
403 | :group 'ediff) | |
475f9031 | 404 | |
1e70790f MK |
405 | (defcustom ediff-display-help-hook nil |
406 | "*Hooks run after preparing the help message." | |
407 | :type 'hook | |
408 | :group 'ediff) | |
409 | ||
410 | (defcustom ediff-suspend-hook (list 'ediff-default-suspend-function) | |
411 | "*Hooks to run in the Ediff control buffer when Ediff is suspended." | |
412 | :type 'hook | |
413 | :group 'ediff) | |
414 | (defcustom ediff-quit-hook (list 'ediff-cleanup-mess) | |
415 | "*Hooks to run in the Ediff control buffer after finishing Ediff." | |
416 | :type 'hook | |
417 | :group 'ediff) | |
418 | (defcustom ediff-cleanup-hook nil | |
41d25ad0 KH |
419 | "*Hooks to run on exiting Ediff but before killing the control buffer. |
420 | This is a place to do various cleanups, such as deleting the variant buffers. | |
1e70790f MK |
421 | Ediff provides a function, `ediff-janitor', as one such possible hook." |
422 | :type 'hook | |
423 | :group 'ediff) | |
475f9031 | 424 | |
4ae69eac MK |
425 | ;; Error messages |
426 | (defconst ediff-KILLED-VITAL-BUFFER | |
427 | "You have killed a vital Ediff buffer---you must leave Ediff now!") | |
428 | (defconst ediff-NO-DIFFERENCES | |
bbe6126c MK |
429 | "Sorry, comparison of identical variants is not what I am made for...") |
430 | (defconst ediff-BAD-DIFF-NUMBER | |
431 | ;; %S stands for this-command, %d - diff number, %d - max diff | |
432 | "%S: Bad diff region number, %d. Valid numbers are 1 to %d") | |
92c51e07 MK |
433 | (defconst ediff-BAD-INFO (format " |
434 | *** The Info file for Ediff, a part of the standard distribution | |
435 | *** of %sEmacs, does not seem to be properly installed. | |
436 | *** | |
437 | *** Please contact your system administrator. " | |
438 | (if ediff-xemacs-p "X" ""))) | |
475f9031 KH |
439 | |
440 | ;; Selective browsing | |
441 | ||
442 | (ediff-defvar-local ediff-skip-diff-region-function 'ediff-show-all-diffs | |
443 | "Function that determines the next/previous diff region to show. | |
444 | Should return t for regions to be ignored and nil otherwise. | |
445 | This function gets a region number as an argument. The region number | |
446 | is the one used internally by Ediff. It is 1 less than the number seen | |
447 | by the user.") | |
448 | ||
8343426b MK |
449 | (ediff-defvar-local ediff-hide-regexp-matches-function |
450 | 'ediff-hide-regexp-matches | |
451 | "Function to use in determining which regions to hide. | |
452 | See the documentation string of `ediff-hide-regexp-matches' for details.") | |
453 | (ediff-defvar-local ediff-focus-on-regexp-matches-function | |
454 | 'ediff-focus-on-regexp-matches | |
455 | "Function to use in determining which regions to focus on. | |
456 | See the documentation string of `ediff-focus-on-regexp-matches' for details.") | |
457 | ||
475f9031 KH |
458 | ;; Regexp that determines buf A regions to focus on when skipping to diff |
459 | (ediff-defvar-local ediff-regexp-focus-A "" "") | |
460 | ;; Regexp that determines buf B regions to focus on when skipping to diff | |
461 | (ediff-defvar-local ediff-regexp-focus-B "" "") | |
462 | ;; Regexp that determines buf C regions to focus on when skipping to diff | |
463 | (ediff-defvar-local ediff-regexp-focus-C "" "") | |
464 | ;; connective that determines whether to focus regions that match both or | |
465 | ;; one of the regexps | |
466 | (ediff-defvar-local ediff-focus-regexp-connective 'and "") | |
467 | ||
468 | ;; Regexp that determines buf A regions to ignore when skipping to diff | |
469 | (ediff-defvar-local ediff-regexp-hide-A "" "") | |
470 | ;; Regexp that determines buf B regions to ignore when skipping to diff | |
471 | (ediff-defvar-local ediff-regexp-hide-B "" "") | |
472 | ;; Regexp that determines buf C regions to ignore when skipping to diff | |
473 | (ediff-defvar-local ediff-regexp-hide-C "" "") | |
474 | ;; connective that determines whether to hide regions that match both or | |
475 | ;; one of the regexps | |
476 | (ediff-defvar-local ediff-hide-regexp-connective 'and "") | |
477 | ||
478 | ||
1e70790f MK |
479 | ;;; Copying difference regions between buffers. |
480 | ||
481 | ;; A list of killed diffs. | |
482 | ;; A diff is saved here if it is replaced by a diff | |
483 | ;; from another buffer. This alist has the form: | |
484 | ;; \((num (buff-object . diff) (buff-object . diff) (buff-object . diff)) ...), | |
485 | ;; where some buffer-objects may be missing. | |
486 | (ediff-defvar-local ediff-killed-diffs-alist nil "") | |
475f9031 KH |
487 | |
488 | ||
489 | ;; Highlighting | |
1e70790f MK |
490 | (defcustom ediff-before-flag-bol (if ediff-xemacs-p (make-glyph "->>") "->>") |
491 | "*Flag placed before a highlighted block of differences, if block starts at beginning of a line." | |
492 | :type 'string | |
493 | :tag "Region before-flag at beginning of line" | |
494 | :group 'ediff) | |
495 | ||
496 | (defcustom ediff-after-flag-eol (if ediff-xemacs-p (make-glyph "<<-") "<<-") | |
497 | "*Flag placed after a highlighted block of differences, if block ends at end of a line." | |
498 | :type 'string | |
499 | :tag "Region after-flag at end of line" | |
500 | :group 'ediff) | |
501 | ||
502 | (defcustom ediff-before-flag-mol (if ediff-xemacs-p (make-glyph "->>") "->>") | |
503 | "*Flag placed before a highlighted block of differences, if block starts in mid-line." | |
504 | :type 'string | |
505 | :tag "Region before-flag in the middle of line" | |
506 | :group 'ediff) | |
507 | (defcustom ediff-after-flag-mol (if ediff-xemacs-p (make-glyph "<<-") "<<-") | |
508 | "*Flag placed after a highlighted block of differences, if block ends in mid-line." | |
509 | :type 'string | |
510 | :tag "Region after-flag in the middle of line" | |
511 | :group 'ediff) | |
475f9031 | 512 | |
475f9031 KH |
513 | |
514 | (ediff-defvar-local ediff-use-faces t | |
4ae69eac MK |
515 | "If t, differences are highlighted using faces, if device supports faces. |
516 | If nil, differences are highlighted using ASCII flags, ediff-before-flag | |
475f9031 KH |
517 | and ediff-after-flag. On a non-window system, differences are always |
518 | highlighted using ASCII flags. | |
519 | This variable can be set either in .emacs or toggled interactively. | |
520 | Use `setq-default' if setting it in .emacs") | |
521 | ||
475f9031 | 522 | ;; this indicates that diff regions are word-size, so fine diffs are |
41d25ad0 | 523 | ;; permanently nixed; used in ediff-windows-wordwise and ediff-regions-wordwise |
475f9031 | 524 | (ediff-defvar-local ediff-word-mode nil "") |
8343426b | 525 | ;; Name of the job (ediff-files, ediff-windows, etc.) |
475f9031 KH |
526 | (ediff-defvar-local ediff-job-name nil "") |
527 | ||
528 | ;; Narrowing and ediff-region/windows support | |
529 | ;; This is a list (overlay-A overlay-B overlay-C) | |
530 | ;; If set, Ediff compares only those parts of buffers A/B/C that lie within | |
531 | ;; the bounds of these overlays. | |
532 | (ediff-defvar-local ediff-narrow-bounds nil "") | |
533 | ||
534 | ;; List (overlay-A overlay-B overlay-C), where each overlay spans the | |
535 | ;; entire corresponding buffer. | |
536 | (ediff-defvar-local ediff-wide-bounds nil "") | |
537 | ||
538 | ;; Current visibility boundaries in buffers A, B, and C. | |
539 | ;; This is also a list of overlays. When the user toggles narrow/widen, | |
540 | ;; this list changes from ediff-wide-bounds to ediff-narrow-bounds. | |
541 | ;; and back. | |
542 | (ediff-defvar-local ediff-visible-bounds nil "") | |
543 | ||
544 | (ediff-defvar-local ediff-start-narrowed t | |
41d25ad0 | 545 | "Non-nil means start narrowed, if doing ediff-windows-* or ediff-regions-*") |
475f9031 KH |
546 | (ediff-defvar-local ediff-quit-widened t |
547 | "*Non-nil means: when finished, Ediff widens buffers A/B. | |
548 | Actually, Ediff restores the scope of visibility that existed at startup.") | |
1e70790f MK |
549 | |
550 | (defcustom ediff-keep-variants t | |
551 | "*Nil means that non-modified variant buffers should be removed at the end of the session after some interrogation. | |
ceb0ea8b | 552 | Supplying a prefix argument to the quit command `q' temporarily reverses the |
1e70790f MK |
553 | meaning of this variable." |
554 | :type 'boolean | |
555 | :group 'ediff) | |
475f9031 KH |
556 | |
557 | (ediff-defvar-local ediff-highlight-all-diffs t | |
558 | "If nil, only the selected differences are highlighted. | |
559 | This variable can be set either in .emacs or toggled interactively, using | |
560 | ediff-toggle-hilit. Use `setq-default' to set it.") | |
561 | ||
562 | ;; A var local to each control panel buffer. Indicates highlighting style | |
563 | ;; in effect for this buffer: `face', `ascii', nil -- temporarily | |
564 | ;; unhighlighted, `off' -- turned off \(on a dumb terminal only\). | |
565 | (ediff-defvar-local ediff-highlighting-style nil "") | |
566 | ||
475f9031 KH |
567 | |
568 | ;; The suffix of the control buffer name. | |
569 | (ediff-defvar-local ediff-control-buffer-suffix nil "") | |
570 | ;; Same as ediff-control-buffer-suffix, but without <,>. | |
571 | ;; It's a number rather than string. | |
572 | (ediff-defvar-local ediff-control-buffer-number nil "") | |
573 | ||
574 | ||
475f9031 | 575 | ;; The original values of ediff-protected-variables for buffer A |
41d25ad0 | 576 | (ediff-defvar-local ediff-buffer-values-orig-A nil "") |
475f9031 | 577 | ;; The original values of ediff-protected-variables for buffer B |
41d25ad0 | 578 | (ediff-defvar-local ediff-buffer-values-orig-B nil "") |
475f9031 | 579 | ;; The original values of ediff-protected-variables for buffer C |
41d25ad0 | 580 | (ediff-defvar-local ediff-buffer-values-orig-C nil "") |
8343426b MK |
581 | ;; The original values of ediff-protected-variables for buffer Ancestor |
582 | (ediff-defvar-local ediff-buffer-values-orig-Ancestor nil "") | |
1e70790f | 583 | |
e756eb9f MK |
584 | ;; association between buff-type and ediff-buffer-values-orig-* |
585 | (defconst ediff-buffer-values-orig-alist | |
586 | '((A . ediff-buffer-values-orig-A) | |
587 | (B . ediff-buffer-values-orig-B) | |
588 | (C . ediff-buffer-values-orig-C) | |
589 | (Ancestor . ediff-buffer-values-orig-Ancestor))) | |
590 | ||
475f9031 | 591 | ;; Buffer-local variables to be saved then restored during Ediff sessions |
92c51e07 MK |
592 | (defconst ediff-protected-variables '( |
593 | ;;buffer-read-only | |
475f9031 KH |
594 | mode-line-format)) |
595 | ||
475f9031 KH |
596 | ;; Vector of differences between the variants. Each difference is |
597 | ;; represented by a vector of two overlays plus a vector of fine diffs, | |
598 | ;; plus a no-fine-diffs flag. The first overlay spans the | |
599 | ;; difference region in the A buffer and the second overlays the diff in | |
600 | ;; the B buffer. If a difference section is empty, the corresponding | |
601 | ;; overlay's endpoints coincide. | |
602 | ;; | |
603 | ;; The precise form of a difference vector for one buffer is: | |
604 | ;; [diff diff diff ...] | |
605 | ;; where each diff has the form: | |
8343426b | 606 | ;; [diff-overlay fine-diff-vector no-fine-diffs-flag state-of-difference] |
475f9031 KH |
607 | ;; fine-diff-vector is a vector [fine-diff-overlay fine-diff-overlay ...] |
608 | ;; no-fine-diffs-flag says if there are fine differences. | |
609 | ;; state-of-difference is A, B, C, or nil, indicating which buffer is | |
610 | ;; different from the other two (used only in 3-way jobs. | |
475f9031 KH |
611 | (ediff-defvar-local ediff-difference-vector-A nil "") |
612 | (ediff-defvar-local ediff-difference-vector-B nil "") | |
613 | (ediff-defvar-local ediff-difference-vector-C nil "") | |
8343426b | 614 | (ediff-defvar-local ediff-difference-vector-Ancestor nil "") |
e756eb9f MK |
615 | ;; A-list of diff vector types associated with buffer types |
616 | (defconst ediff-difference-vector-alist | |
617 | '((A . ediff-difference-vector-A) | |
618 | (B . ediff-difference-vector-B) | |
619 | (C . ediff-difference-vector-C) | |
620 | (Ancestor . ediff-difference-vector-Ancestor))) | |
8343426b MK |
621 | |
622 | ;; [ status status status ...] | |
623 | ;; Each status: [state-of-merge state-of-ancestor] | |
624 | ;; state-of-merge is default-A, default-B, prefer-A, or prefer-B. It | |
625 | ;; indicates the way a diff region was created in buffer C. | |
626 | ;; state-of-ancestor says if the corresponding region in ancestor buffer is | |
627 | ;; empty. | |
628 | (ediff-defvar-local ediff-state-of-merge nil "") | |
475f9031 KH |
629 | |
630 | ;; The difference that is currently selected. | |
631 | (ediff-defvar-local ediff-current-difference -1 "") | |
632 | ;; Number of differences found. | |
633 | (ediff-defvar-local ediff-number-of-differences nil "") | |
634 | ||
635 | ;; Buffer containing the output of diff, which is used by Ediff to step | |
636 | ;; through files. | |
637 | (ediff-defvar-local ediff-diff-buffer nil "") | |
638 | ;; Like ediff-diff-buffer, but contains context diff. It is not used by | |
639 | ;; Ediff, but it is saved in a file, if user requests so. | |
640 | (ediff-defvar-local ediff-custom-diff-buffer nil "") | |
641 | ;; Buffer used for diff-style fine differences between regions. | |
642 | (ediff-defvar-local ediff-fine-diff-buffer nil "") | |
643 | ;; Temporary buffer used for computing fine differences. | |
644 | (defconst ediff-tmp-buffer " *ediff-tmp*" "") | |
645 | ;; Buffer used for messages | |
646 | (defconst ediff-msg-buffer " *ediff-message*" "") | |
647 | ;; Buffer containing the output of diff when diff returns errors. | |
648 | (ediff-defvar-local ediff-error-buffer nil "") | |
649 | ;; Buffer to display debug info | |
650 | (ediff-defvar-local ediff-debug-buffer "*ediff-debug*" "") | |
651 | ||
8343426b MK |
652 | ;; List of ediff control panels associated with each buffer A/B/C/Ancestor. |
653 | ;; Not used any more, but may be needed in the future. | |
654 | (ediff-defvar-local ediff-this-buffer-ediff-sessions nil "") | |
475f9031 KH |
655 | |
656 | ;; to be deleted in due time | |
657 | ;; List of difference overlays disturbed by working with the current diff. | |
658 | (defvar ediff-disturbed-overlays nil "") | |
659 | ||
660 | ;; Priority of non-selected overlays. | |
661 | (defvar ediff-shadow-overlay-priority 100 "") | |
662 | ||
1e70790f | 663 | (defcustom ediff-version-control-package 'vc |
8343426b | 664 | "Version control package used. |
4ae69eac MK |
665 | Currently, Ediff supports vc.el, rcs.el, pcl-cvs.el, and generic-sc.el. The |
666 | standard Emacs interface to RCS, CVS, SCCS, etc., is vc.el. However, some | |
667 | people find the other two packages more convenient. Set this variable to the | |
1e70790f MK |
668 | appropriate symbol: `rcs', `pcl-cvs', or `generic-sc' if you so desire." |
669 | :type 'symbol | |
670 | :group 'ediff) | |
8343426b | 671 | |
475f9031 KH |
672 | |
673 | (if ediff-xemacs-p | |
674 | (progn | |
675 | (fset 'ediff-read-event (symbol-function 'next-command-event)) | |
676 | (fset 'ediff-overlayp (symbol-function 'extentp)) | |
677 | (fset 'ediff-make-overlay (symbol-function 'make-extent)) | |
4ae69eac | 678 | (fset 'ediff-delete-overlay (symbol-function 'delete-extent))) |
475f9031 KH |
679 | (fset 'ediff-read-event (symbol-function 'read-event)) |
680 | (fset 'ediff-overlayp (symbol-function 'overlayp)) | |
681 | (fset 'ediff-make-overlay (symbol-function 'make-overlay)) | |
4ae69eac | 682 | (fset 'ediff-delete-overlay (symbol-function 'delete-overlay))) |
475f9031 | 683 | |
41d25ad0 KH |
684 | ;; Check the current version against the major and minor version numbers |
685 | ;; using op: cur-vers op major.minor If emacs-major-version or | |
686 | ;; emacs-minor-version are not defined, we assume that the current version | |
687 | ;; is hopelessly outdated. We assume that emacs-major-version and | |
688 | ;; emacs-minor-version are defined. Otherwise, for Emacs/XEmacs 19, if the | |
689 | ;; current minor version is < 10 (xemacs) or < 23 (emacs) the return value | |
690 | ;; will be nil (when op is =, >, or >=) and t (when op is <, <=), which may be | |
691 | ;; incorrect. However, this gives correct result in our cases, since we are | |
692 | ;; testing for sufficiently high Emacs versions. | |
693 | (defun ediff-check-version (op major minor &optional type-of-emacs) | |
694 | (if (and (boundp 'emacs-major-version) (boundp 'emacs-minor-version)) | |
695 | (and (cond ((eq type-of-emacs 'xemacs) ediff-xemacs-p) | |
696 | ((eq type-of-emacs 'emacs) ediff-emacs-p) | |
697 | (t t)) | |
698 | (cond ((eq op '=) (and (= emacs-minor-version minor) | |
699 | (= emacs-major-version major))) | |
700 | ((memq op '(> >= < <=)) | |
701 | (and (or (funcall op emacs-major-version major) | |
702 | (= emacs-major-version major)) | |
703 | (if (= emacs-major-version major) | |
704 | (funcall op emacs-minor-version minor) | |
705 | t))) | |
706 | (t | |
707 | (error "%S: Invalid op in ediff-check-version" op)))) | |
708 | (cond ((memq op '(= > >=)) nil) | |
709 | ((memq op '(< <=)) t)))) | |
710 | ||
8343426b | 711 | |
8343426b | 712 | |
475f9031 KH |
713 | ;; A fix for NeXT Step |
714 | ;; Should probably be eliminated in later versions. | |
41d25ad0 | 715 | (if (and (ediff-window-display-p) (eq (ediff-device-type) 'ns)) |
475f9031 KH |
716 | (progn |
717 | (fset 'x-display-color-p (symbol-function 'ns-display-color-p)) | |
718 | (fset 'x-color-defined-p (symbol-function 'ns-color-defined-p)) | |
719 | (fset 'x-display-pixel-height (symbol-function 'ns-display-pixel-height)) | |
720 | (fset 'x-display-pixel-width (symbol-function 'ns-display-pixel-width)) | |
721 | )) | |
41d25ad0 | 722 | |
8343426b | 723 | |
41d25ad0 KH |
724 | (defsubst ediff-color-display-p () |
725 | (if ediff-emacs-p | |
726 | (x-display-color-p) | |
727 | (eq (device-class (selected-device)) 'color))) | |
8343426b | 728 | |
475f9031 | 729 | |
4ae69eac | 730 | (if (ediff-has-face-support-p) |
41d25ad0 KH |
731 | (if ediff-xemacs-p |
732 | (progn | |
41d25ad0 KH |
733 | (fset 'ediff-valid-color-p (symbol-function 'valid-color-name-p)) |
734 | (fset 'ediff-get-face (symbol-function 'get-face))) | |
735 | ;; Temporary fix for OS/2 port of Emacs | |
736 | ;; pm-win.el in PM-Emacs should be fixed. | |
41d25ad0 KH |
737 | (if (eq (ediff-device-type) 'pm) |
738 | (fset 'ediff-valid-color-p | |
739 | (function (lambda (color) (assoc color pm-color-alist)))) | |
740 | (fset 'ediff-valid-color-p (symbol-function 'x-color-defined-p))) | |
741 | (fset 'ediff-get-face (symbol-function 'internal-get-face)))) | |
4ae69eac MK |
742 | |
743 | (if (ediff-window-display-p) | |
744 | (if ediff-xemacs-p | |
745 | (progn | |
746 | (fset 'ediff-display-pixel-width | |
747 | (symbol-function 'device-pixel-width)) | |
748 | (fset 'ediff-display-pixel-height | |
749 | (symbol-function 'device-pixel-height))) | |
750 | (fset 'ediff-display-pixel-width | |
751 | (symbol-function 'x-display-pixel-width)) | |
752 | (fset 'ediff-display-pixel-height | |
753 | (symbol-function 'x-display-pixel-height)))) | |
475f9031 | 754 | |
e756eb9f MK |
755 | ;; A-list of current-diff-overlay symbols asssociated with buf types |
756 | (defconst ediff-current-diff-overlay-alist | |
757 | '((A . ediff-current-diff-overlay-A) | |
758 | (B . ediff-current-diff-overlay-B) | |
759 | (C . ediff-current-diff-overlay-C) | |
760 | (Ancestor . ediff-current-diff-overlay-Ancestor))) | |
761 | ||
762 | ;; A-list of current-diff-face-* symbols asssociated with buf types | |
763 | (defconst ediff-current-diff-face-alist | |
764 | '((A . ediff-current-diff-face-A) | |
765 | (B . ediff-current-diff-face-B) | |
766 | (C . ediff-current-diff-face-C) | |
767 | (Ancestor . ediff-current-diff-face-Ancestor))) | |
768 | ||
475f9031 | 769 | |
8343426b | 770 | (defun ediff-make-current-diff-overlay (type) |
4ae69eac | 771 | (if (ediff-has-face-support-p) |
e756eb9f MK |
772 | (let ((overlay (ediff-get-symbol-from-alist |
773 | type ediff-current-diff-overlay-alist)) | |
8343426b MK |
774 | (buffer (ediff-get-buffer type)) |
775 | (face (face-name | |
776 | (symbol-value | |
e756eb9f MK |
777 | (ediff-get-symbol-from-alist |
778 | type ediff-current-diff-face-alist))))) | |
8343426b MK |
779 | (set overlay |
780 | (ediff-make-bullet-proof-overlay (point-max) (point-max) buffer)) | |
781 | (ediff-set-overlay-face (symbol-value overlay) face) | |
782 | (ediff-overlay-put (symbol-value overlay) 'ediff ediff-control-buffer)) | |
783 | )) | |
784 | ||
785 | (defun ediff-set-overlay-face (extent face) | |
786 | (ediff-overlay-put extent 'face face) | |
787 | (ediff-overlay-put extent 'help-echo 'ediff-region-help-echo)) | |
788 | ||
789 | ;; This does nothing in Emacs, since overlays there have no help-echo property | |
790 | (defun ediff-region-help-echo (extent) | |
791 | (let ((is-current (ediff-overlay-get extent 'ediff)) | |
792 | (face (ediff-overlay-get extent 'face)) | |
793 | (diff-num (ediff-overlay-get extent 'ediff-diff-num)) | |
bbe6126c | 794 | face-help) |
8343426b MK |
795 | |
796 | ;; This happens only for refinement overlays | |
797 | (setq face-help (and face (get face 'ediff-help-echo))) | |
798 | ||
bbe6126c MK |
799 | (cond ((and is-current diff-num) ; current diff region |
800 | (format "Difference region %S -- current" (1+ diff-num))) | |
801 | (face-help) ; refinement of current diff region | |
802 | (diff-num ; non-current | |
803 | (format "Difference region %S -- non-current" (1+ diff-num))) | |
804 | (t "")) ; none | |
805 | )) | |
8343426b | 806 | |
985d0dad MK |
807 | ;;(defun ediff-set-face (ground face color) |
808 | ;; "Set face foreground/background." | |
809 | ;; (if (ediff-has-face-support-p) | |
810 | ;; (if (ediff-valid-color-p color) | |
811 | ;; (if (eq ground 'foreground) | |
812 | ;; (set-face-foreground face color) | |
813 | ;; (set-face-background face color)) | |
814 | ;; (cond ((memq face | |
815 | ;; '(ediff-current-diff-face-A | |
816 | ;; ediff-current-diff-face-B | |
817 | ;; ediff-current-diff-face-C | |
818 | ;; ediff-current-diff-face-Ancestor)) | |
819 | ;; (copy-face 'highlight face)) | |
820 | ;; ((memq face | |
821 | ;; '(ediff-fine-diff-face-A | |
822 | ;; ediff-fine-diff-face-B | |
823 | ;; ediff-fine-diff-face-C | |
824 | ;; ediff-fine-diff-face-Ancestor)) | |
825 | ;; (copy-face 'secondary-selection face) | |
826 | ;; (set-face-underline-p face t)) | |
827 | ;; ((memq face | |
828 | ;; '(ediff-even-diff-face-A | |
829 | ;; ediff-odd-diff-face-A | |
830 | ;; ediff-even-diff-face-B ediff-odd-diff-face-B | |
831 | ;; ediff-even-diff-face-C ediff-odd-diff-face-C | |
832 | ;; ediff-even-diff-face-Ancestor | |
833 | ;; ediff-odd-diff-face-Ancestor)) | |
834 | ;; (copy-face 'secondary-selection face)))) | |
835 | ;; )) | |
36d57fa9 | 836 | |
92c51e07 MK |
837 | (defun ediff-set-face-pixmap (face pixmap) |
838 | "Set face pixmap on a monochrome display." | |
839 | (if (and (ediff-window-display-p) (not (ediff-color-display-p))) | |
840 | (condition-case nil | |
841 | (set-face-background-pixmap face pixmap) | |
842 | (error | |
843 | (message "Pixmap not found for %S: %s" (face-name face) pixmap) | |
844 | (sit-for 1))))) | |
845 | ||
4ae69eac MK |
846 | (defun ediff-hide-face (face) |
847 | (if (and (ediff-has-face-support-p) ediff-emacs-p) | |
848 | (add-to-list 'facemenu-unlisted-faces face))) | |
849 | ||
985d0dad MK |
850 | (defgroup ediff-highlighting nil |
851 | "Hilighting of difference regions in Ediff" | |
852 | :prefix "ediff-" | |
853 | :group 'ediff) | |
475f9031 | 854 | |
985d0dad MK |
855 | ;;(defvar ediff-current-diff-face-A |
856 | ;; (if (ediff-has-face-support-p) | |
857 | ;; (progn | |
858 | ;; (make-face 'ediff-current-diff-face-A) | |
859 | ;; (or (face-differs-from-default-p 'ediff-current-diff-face-A) | |
860 | ;; (cond ((ediff-color-display-p) | |
861 | ;; (ediff-set-face | |
862 | ;; 'foreground 'ediff-current-diff-face-A "firebrick") | |
863 | ;; (ediff-set-face | |
864 | ;; 'background 'ediff-current-diff-face-A "pale green")) | |
865 | ;; (t | |
866 | ;; (if ediff-xemacs-p | |
867 | ;; (copy-face 'modeline 'ediff-current-diff-face-A) | |
868 | ;; (copy-face 'highlight 'ediff-current-diff-face-A)) | |
869 | ;; ))) | |
870 | ;; 'ediff-current-diff-face-A)) | |
871 | ;; "Face for highlighting the selected difference in buffer A.") | |
872 | ||
873 | (defface ediff-current-diff-face-A | |
874 | '((((class color)) (:foreground "firebrick" :background "pale green")) | |
875 | (t (:inverse-video t))) | |
876 | "Face for highlighting the selected difference in buffer A." | |
877 | :group 'ediff-highlighting) | |
878 | ;; An internal variable. Ediff takes the face from here. When unhighlighting, | |
879 | ;; this variable is set to nil, then again to the appropriate face. | |
8e41a31c MK |
880 | (defvar ediff-current-diff-face-A 'ediff-current-diff-face-A |
881 | "Face for highlighting the selected difference in buffer A. | |
882 | DO NOT CHANGE this variable. Instead, use the customization | |
883 | widget to customize the actual face object `ediff-current-diff-face-A' | |
884 | this variable represents.") | |
985d0dad MK |
885 | (ediff-hide-face 'ediff-current-diff-face-A) |
886 | ;; Until custom.el for XEmacs starts supporting :inverse-video we do this. | |
887 | ;; This means that some user customization may be trashed. | |
888 | (if (and ediff-xemacs-p | |
889 | (ediff-has-face-support-p) | |
890 | (not (ediff-color-display-p))) | |
891 | (copy-face 'modeline 'ediff-current-diff-face-A)) | |
892 | ||
893 | ||
894 | ||
895 | ;;(defvar ediff-current-diff-face-B | |
896 | ;; (if (ediff-has-face-support-p) | |
897 | ;; (progn | |
898 | ;; (make-face 'ediff-current-diff-face-B) | |
899 | ;; (or (face-differs-from-default-p 'ediff-current-diff-face-B) | |
900 | ;; (cond ((ediff-color-display-p) | |
901 | ;; (ediff-set-face | |
902 | ;; 'foreground 'ediff-current-diff-face-B "DarkOrchid") | |
903 | ;; (ediff-set-face | |
904 | ;; 'background 'ediff-current-diff-face-B "Yellow")) | |
905 | ;; (t | |
906 | ;; (if ediff-xemacs-p | |
907 | ;; (copy-face 'modeline 'ediff-current-diff-face-B) | |
908 | ;; (copy-face 'highlight 'ediff-current-diff-face-B)) | |
909 | ;; ))) | |
910 | ;; 'ediff-current-diff-face-B)) | |
911 | ;; "Face for highlighting the selected difference in buffer B.") | |
475f9031 | 912 | |
985d0dad MK |
913 | (defface ediff-current-diff-face-B |
914 | '((((class color)) (:foreground "DarkOrchid" :background "Yellow")) | |
915 | (t (:inverse-video t))) | |
916 | "Face for highlighting the selected difference in buffer B." | |
917 | :group 'ediff-highlighting) | |
918 | ;; An internal variable. Ediff takes the face from here. When unhighlighting, | |
919 | ;; this variable is set to nil, then again to the appropriate face. | |
8e41a31c MK |
920 | (defvar ediff-current-diff-face-B 'ediff-current-diff-face-B |
921 | "Face for highlighting the selected difference in buffer B. | |
922 | this variable. Instead, use the customization | |
923 | widget to customize the actual face `ediff-current-diff-face-B' | |
924 | this variable represents.") | |
985d0dad MK |
925 | (ediff-hide-face 'ediff-current-diff-face-B) |
926 | ;; Until custom.el for XEmacs starts supporting :inverse-video we do this. | |
927 | ;; This means that some user customization may be trashed. | |
928 | (if (and ediff-xemacs-p | |
929 | (ediff-has-face-support-p) | |
930 | (not (ediff-color-display-p))) | |
931 | (copy-face 'modeline 'ediff-current-diff-face-B)) | |
932 | ||
933 | ;;(defvar ediff-current-diff-face-C | |
934 | ;; (if (ediff-has-face-support-p) | |
935 | ;; (progn | |
936 | ;; (make-face 'ediff-current-diff-face-C) | |
937 | ;; (or (face-differs-from-default-p 'ediff-current-diff-face-C) | |
938 | ;; (cond ((ediff-color-display-p) | |
939 | ;; (ediff-set-face | |
940 | ;; 'foreground 'ediff-current-diff-face-C "Navy") | |
941 | ;; (ediff-set-face | |
942 | ;; 'background 'ediff-current-diff-face-C "Pink")) | |
943 | ;; (t | |
944 | ;; (if ediff-xemacs-p | |
945 | ;; (copy-face 'modeline 'ediff-current-diff-face-C) | |
946 | ;; (copy-face 'highlight 'ediff-current-diff-face-C)) | |
947 | ;; ))) | |
948 | ;; 'ediff-current-diff-face-C)) | |
949 | ;; "Face for highlighting the selected difference in buffer C.") | |
950 | ||
951 | (defface ediff-current-diff-face-C | |
952 | '((((class color)) (:foreground "Navy" :background "Pink")) | |
953 | (t (:inverse-video t))) | |
954 | "Face for highlighting the selected difference in buffer C." | |
955 | :group 'ediff-highlighting) | |
956 | ;; An internal variable. Ediff takes the face from here. When unhighlighting, | |
957 | ;; this variable is set to nil, then again to the appropriate face. | |
8e41a31c MK |
958 | (defvar ediff-current-diff-face-C 'ediff-current-diff-face-C |
959 | "Face for highlighting the selected difference in buffer C. | |
960 | DO NOT CHANGE this variable. Instead, use the customization | |
961 | widget to customize the actual face object `ediff-current-diff-face-C' | |
962 | this variable represents.") | |
985d0dad MK |
963 | (ediff-hide-face 'ediff-current-diff-face-C) |
964 | ;; Until custom.el for XEmacs starts supporting :inverse-video we do this. | |
965 | ;; This means that some user customization may be trashed. | |
966 | (if (and ediff-xemacs-p | |
967 | (ediff-has-face-support-p) | |
968 | (not (ediff-color-display-p))) | |
969 | (copy-face 'modeline 'ediff-current-diff-face-C)) | |
970 | ||
971 | ;;(defvar ediff-current-diff-face-Ancestor | |
972 | ;; (if (ediff-has-face-support-p) | |
973 | ;; (progn | |
974 | ;; (make-face 'ediff-current-diff-face-Ancestor) | |
975 | ;; (or (face-differs-from-default-p 'ediff-current-diff-face-Ancestor) | |
976 | ;; (copy-face | |
977 | ;; 'ediff-current-diff-face-C 'ediff-current-diff-face-Ancestor)) | |
978 | ;; 'ediff-current-diff-face-Ancestor)) | |
979 | ;; "Face for highlighting the selected difference in the ancestor buffer.") | |
980 | ||
981 | (defface ediff-current-diff-face-Ancestor | |
982 | '((((class color)) (:foreground "Black" :background "VioletRed")) | |
983 | (t (:inverse-video t))) | |
984 | "Face for highlighting the selected difference in buffer Ancestor." | |
985 | :group 'ediff-highlighting) | |
986 | ;; An internal variable. Ediff takes the face from here. When unhighlighting, | |
987 | ;; this variable is set to nil, then again to the appropriate face. | |
8e41a31c MK |
988 | (defvar ediff-current-diff-face-Ancestor 'ediff-current-diff-face-Ancestor |
989 | "Face for highlighting the selected difference in buffer Ancestor. | |
990 | DO NOT CHANGE this variable. Instead, use the customization | |
991 | widget to customize the actual face object `ediff-current-diff-face-Ancestor' | |
992 | this variable represents.") | |
985d0dad MK |
993 | (ediff-hide-face 'ediff-current-diff-face-Ancestor) |
994 | ;; Until custom.el for XEmacs starts supporting :inverse-video we do this. | |
995 | ;; This means that some user customization may be trashed. | |
996 | (if (and ediff-xemacs-p | |
997 | (ediff-has-face-support-p) | |
998 | (not (ediff-color-display-p))) | |
999 | (copy-face 'modeline 'ediff-current-diff-face-Ancestor)) | |
1000 | ||
1001 | ;;(defvar ediff-fine-diff-pixmap "gray3" | |
1002 | ;; "Pixmap to use for highlighting fine differences.") | |
1003 | ;;(defvar ediff-odd-diff-pixmap "gray1" | |
1004 | ;; "Pixmap to use for highlighting odd differences.") | |
1005 | ;;(defvar ediff-even-diff-pixmap "Stipple" | |
1006 | ;; "Pixmap to use for highlighting even differences.") | |
1007 | ||
1008 | ;;(defvar ediff-fine-diff-face-A | |
1009 | ;; (if (ediff-has-face-support-p) | |
1010 | ;; (progn | |
1011 | ;; (make-face 'ediff-fine-diff-face-A) | |
1012 | ;; (or (face-differs-from-default-p 'ediff-fine-diff-face-A) | |
1013 | ;; (cond ((ediff-color-display-p) | |
1014 | ;; (ediff-set-face 'foreground 'ediff-fine-diff-face-A | |
1015 | ;; "Navy") | |
1016 | ;; (ediff-set-face 'background 'ediff-fine-diff-face-A | |
1017 | ;; "sky blue")) | |
1018 | ;; (t | |
1019 | ;; (set-face-underline-p 'ediff-fine-diff-face-A t) | |
1020 | ;; (ediff-set-face-pixmap 'ediff-fine-diff-face-A | |
1021 | ;; ediff-fine-diff-pixmap) | |
1022 | ;; ))) | |
1023 | ;; 'ediff-fine-diff-face-A)) | |
1024 | ;; "Face for highlighting the refinement of the selected diff in buffer A.") | |
1025 | ||
1026 | ||
1027 | (defface ediff-fine-diff-face-A | |
1028 | '((((class color)) (:foreground "Navy" :background "sky blue")) | |
1029 | (t (:underline t :stipple "gray3"))) | |
1030 | "Face for highlighting the refinement of the selected diff in buffer A." | |
1031 | :group 'ediff-highlighting) | |
1032 | ;; An internal variable. Ediff takes the face from here. When unhighlighting, | |
1033 | ;; this variable is set to nil, then again to the appropriate face. | |
8e41a31c MK |
1034 | (defvar ediff-fine-diff-face-A 'ediff-fine-diff-face-A |
1035 | "Face for highlighting the fine differences in buffer A. | |
1036 | DO NOT CHANGE this variable. Instead, use the customization | |
1037 | widget to customize the actual face object `ediff-fine-diff-face-A' | |
1038 | this variable represents.") | |
985d0dad MK |
1039 | (ediff-hide-face 'ediff-fine-diff-face-A) |
1040 | ;; Until custom.el for XEmacs starts supporting :stipple we do this. | |
1041 | ;; This means that some use customization may be trashed. | |
1042 | (if (and ediff-xemacs-p | |
1043 | (ediff-has-face-support-p) | |
1044 | (not (ediff-color-display-p))) | |
1045 | (ediff-set-face-pixmap 'ediff-fine-diff-face-A "gray3")) | |
1046 | ||
1047 | ;;(defvar ediff-fine-diff-face-B | |
1048 | ;; (if (ediff-has-face-support-p) | |
1049 | ;; (progn | |
1050 | ;; (make-face 'ediff-fine-diff-face-B) | |
1051 | ;; (or (face-differs-from-default-p 'ediff-fine-diff-face-B) | |
1052 | ;; (cond ((ediff-color-display-p) | |
1053 | ;; (ediff-set-face 'foreground 'ediff-fine-diff-face-B "Black") | |
1054 | ;; (ediff-set-face 'background 'ediff-fine-diff-face-B "cyan")) | |
1055 | ;; (t | |
1056 | ;; (set-face-underline-p 'ediff-fine-diff-face-B t) | |
1057 | ;; (ediff-set-face-pixmap 'ediff-fine-diff-face-B | |
1058 | ;; ediff-fine-diff-pixmap) | |
1059 | ;; ))) | |
1060 | ;; 'ediff-fine-diff-face-B)) | |
1061 | ;; "Face for highlighting the refinement of the selected diff in buffer B.") | |
1062 | ||
1063 | (defface ediff-fine-diff-face-B | |
1064 | '((((class color)) (:foreground "Black" :background "cyan")) | |
1065 | (t (:underline t :stipple "gray3"))) | |
1066 | "Face for highlighting the refinement of the selected diff in buffer B." | |
1067 | :group 'ediff-highlighting) | |
1068 | ;; An internal variable. Ediff takes the face from here. When unhighlighting, | |
1069 | ;; this variable is set to nil, then again to the appropriate face. | |
8e41a31c MK |
1070 | (defvar ediff-fine-diff-face-B 'ediff-fine-diff-face-B |
1071 | "Face for highlighting the fine differences in buffer B. | |
1072 | DO NOT CHANGE this variable. Instead, use the customization | |
1073 | widget to customize the actual face object `ediff-fine-diff-face-B' | |
1074 | this variable represents.") | |
985d0dad MK |
1075 | (ediff-hide-face 'ediff-fine-diff-face-B) |
1076 | ;; Until custom.el for XEmacs starts supporting :stipple we do this. | |
1077 | ;; This means that some use customization may be trashed. | |
1078 | (if (and ediff-xemacs-p | |
1079 | (ediff-has-face-support-p) | |
1080 | (not (ediff-color-display-p))) | |
1081 | (ediff-set-face-pixmap 'ediff-fine-diff-face-B "gray3")) | |
475f9031 | 1082 | |
985d0dad MK |
1083 | ;;(defvar ediff-fine-diff-face-C |
1084 | ;; (if (ediff-has-face-support-p) | |
1085 | ;; (progn | |
1086 | ;; (make-face 'ediff-fine-diff-face-C) | |
1087 | ;; (or (face-differs-from-default-p 'ediff-fine-diff-face-C) | |
1088 | ;; (cond ((ediff-color-display-p) | |
1089 | ;; (ediff-set-face 'foreground 'ediff-fine-diff-face-C "black") | |
1090 | ;; (ediff-set-face | |
1091 | ;; 'background 'ediff-fine-diff-face-C "Turquoise")) | |
1092 | ;; (t | |
1093 | ;; (set-face-underline-p 'ediff-fine-diff-face-C t) | |
1094 | ;; (ediff-set-face-pixmap 'ediff-fine-diff-face-C | |
1095 | ;; ediff-fine-diff-pixmap) | |
1096 | ;; ))) | |
1097 | ;; 'ediff-fine-diff-face-C)) | |
1098 | ;; "Face for highlighting the refinement of the selected diff in buffer C.") | |
1099 | ||
1100 | (defface ediff-fine-diff-face-C | |
1101 | '((((class color)) (:foreground "Black" :background "Turquoise")) | |
1102 | (t (:underline t :stipple "gray3"))) | |
1103 | "Face for highlighting the refinement of the selected diff in buffer C." | |
1104 | :group 'ediff-highlighting) | |
1105 | ;; An internal variable. Ediff takes the face from here. When unhighlighting, | |
1106 | ;; this variable is set to nil, then again to the appropriate face. | |
8e41a31c MK |
1107 | (defvar ediff-fine-diff-face-C 'ediff-fine-diff-face-C |
1108 | "Face for highlighting the fine differences in buffer C. | |
1109 | DO NOT CHANGE this variable. Instead, use the customization | |
1110 | widget to customize the actual face object `ediff-fine-diff-face-C' | |
1111 | this variable represents.") | |
985d0dad MK |
1112 | (ediff-hide-face 'ediff-fine-diff-face-C) |
1113 | ;; Until custom.el for XEmacs starts supporting :stipple we do this. | |
1114 | ;; This means that some use customization may be trashed. | |
1115 | (if (and ediff-xemacs-p | |
1116 | (ediff-has-face-support-p) | |
1117 | (not (ediff-color-display-p))) | |
1118 | (ediff-set-face-pixmap 'ediff-fine-diff-face-C "gray3")) | |
1119 | ||
1120 | ;;(defvar ediff-fine-diff-face-Ancestor | |
1121 | ;; (if (ediff-has-face-support-p) | |
1122 | ;; (progn | |
1123 | ;; (make-face 'ediff-fine-diff-face-Ancestor) | |
1124 | ;; (ediff-hide-face 'ediff-fine-diff-face-Ancestor) | |
1125 | ;; (or (face-differs-from-default-p 'ediff-fine-diff-face-Ancestor) | |
1126 | ;; (progn | |
1127 | ;; (copy-face | |
1128 | ;; 'ediff-fine-diff-face-C 'ediff-fine-diff-face-Ancestor) | |
1129 | ;; (ediff-set-face-pixmap 'ediff-fine-diff-face-Ancestor | |
1130 | ;; ediff-fine-diff-pixmap)) | |
1131 | ;; ))) | |
1132 | ;; "Face highlighting refinements of the selected diff in ancestor buffer. | |
1133 | ;;Presently, this is not used, as difference regions are not refined in the | |
1134 | ;;ancestor buffer.") | |
1135 | ||
1136 | (defface ediff-fine-diff-face-Ancestor | |
1137 | '((((class color)) (:foreground "Black" :background "Green")) | |
1138 | (t (:underline t :stipple "gray3"))) | |
1139 | "Face for highlighting the refinement of the selected diff in the ancestor buffer. | |
1140 | At present, this face is not used and no fine differences are computed for the | |
1141 | ancestor buffer." | |
1142 | :group 'ediff-highlighting) | |
1143 | ;; An internal variable. Ediff takes the face from here. When unhighlighting, | |
1144 | ;; this variable is set to nil, then again to the appropriate face. | |
8e41a31c MK |
1145 | (defvar ediff-fine-diff-face-Ancestor 'ediff-fine-diff-face-Ancestor |
1146 | "Face for highlighting the fine differences in buffer Ancestor. | |
1147 | DO NOT CHANGE this variable. Instead, use the customization | |
1148 | widget to customize the actual face object `ediff-fine-diff-face-Ancestor' | |
1149 | this variable represents.") | |
985d0dad MK |
1150 | (ediff-hide-face 'ediff-fine-diff-face-Ancestor) |
1151 | ;; Until custom.el for XEmacs starts supporting :stipple we do this. | |
1152 | ;; This means that some use customization may be trashed. | |
1153 | (if (and ediff-xemacs-p | |
1154 | (ediff-has-face-support-p) | |
1155 | (not (ediff-color-display-p))) | |
1156 | (ediff-set-face-pixmap | |
1157 | 'ediff-fine-diff-face-Ancestor "gray3")) | |
1158 | ||
1159 | ;;(defvar ediff-even-diff-face-A | |
1160 | ;; (if (ediff-has-face-support-p) | |
1161 | ;; (progn | |
1162 | ;; (make-face 'ediff-even-diff-face-A) | |
1163 | ;; (or (face-differs-from-default-p 'ediff-even-diff-face-A) | |
1164 | ;; (cond ((ediff-color-display-p) | |
1165 | ;; (ediff-set-face | |
1166 | ;; 'foreground 'ediff-even-diff-face-A "black") | |
1167 | ;; (ediff-set-face | |
1168 | ;; 'background 'ediff-even-diff-face-A "light grey")) | |
1169 | ;; (t | |
1170 | ;; (copy-face 'italic 'ediff-even-diff-face-A) | |
1171 | ;; (ediff-set-face-pixmap 'ediff-even-diff-face-A | |
1172 | ;; ediff-even-diff-pixmap) | |
1173 | ;; ))) | |
1174 | ;; 'ediff-even-diff-face-A)) | |
1175 | ;; "Face used for highlighting even-numbered differences in buffer A.") | |
1176 | ||
1177 | (defface ediff-even-diff-face-A | |
1178 | '((((class color)) (:foreground "Black" :background "light grey")) | |
1179 | (t (:italic t :stipple "Stipple"))) | |
1180 | "Face for highlighting even-numbered non-current differences in buffer A." | |
1181 | :group 'ediff-highlighting) | |
1182 | ;; An internal variable. Ediff takes the face from here. When unhighlighting, | |
1183 | ;; this variable is set to nil, then again to the appropriate face. | |
8e41a31c MK |
1184 | (defvar ediff-even-diff-face-A 'ediff-even-diff-face-A |
1185 | "Face for highlighting even-numbered non-current differences in buffer A. | |
1186 | DO NOT CHANGE this variable. Instead, use the customization | |
1187 | widget to customize the actual face object `ediff-even-diff-face-A' | |
1188 | this variable represents.") | |
985d0dad MK |
1189 | (ediff-hide-face 'ediff-even-diff-face-A) |
1190 | ;; Until custom.el for XEmacs starts supporting :stipple we do this. | |
1191 | ;; This means that some use customization may be trashed. | |
1192 | (if (and ediff-xemacs-p | |
1193 | (ediff-has-face-support-p) | |
1194 | (not (ediff-color-display-p))) | |
1195 | (ediff-set-face-pixmap 'ediff-even-diff-face-A "Stipple")) | |
475f9031 | 1196 | |
985d0dad MK |
1197 | ;;(defvar ediff-even-diff-face-B |
1198 | ;; (if (ediff-has-face-support-p) | |
1199 | ;; (progn | |
1200 | ;; (make-face 'ediff-even-diff-face-B) | |
1201 | ;; (or (face-differs-from-default-p 'ediff-even-diff-face-B) | |
1202 | ;; (cond ((ediff-color-display-p) | |
1203 | ;; (ediff-set-face | |
1204 | ;; 'foreground 'ediff-even-diff-face-B "White") | |
1205 | ;; (ediff-set-face | |
1206 | ;; 'background 'ediff-even-diff-face-B "Gray")) | |
1207 | ;; (t | |
1208 | ;; (copy-face 'italic 'ediff-even-diff-face-B) | |
1209 | ;; (ediff-set-face-pixmap 'ediff-even-diff-face-B | |
1210 | ;; ediff-even-diff-pixmap) | |
1211 | ;; ))) | |
1212 | ;; 'ediff-even-diff-face-B)) | |
1213 | ;; "Face used for highlighting even-numbered differences in buffer B.") | |
1214 | ||
1215 | (defface ediff-even-diff-face-B | |
1216 | '((((class color)) (:foreground "White" :background "Grey")) | |
1217 | (t (:italic t :stipple "Stipple"))) | |
1218 | "Face for highlighting even-numbered non-current differences in buffer B." | |
1219 | :group 'ediff-highlighting) | |
1220 | ;; An internal variable. Ediff takes the face from here. When unhighlighting, | |
1221 | ;; this variable is set to nil, then again to the appropriate face. | |
8e41a31c MK |
1222 | (defvar ediff-even-diff-face-B 'ediff-even-diff-face-B |
1223 | "Face for highlighting even-numbered non-current differences in buffer B. | |
1224 | DO NOT CHANGE this variable. Instead, use the customization | |
1225 | widget to customize the actual face object `ediff-even-diff-face-B' | |
1226 | this variable represents.") | |
985d0dad MK |
1227 | (ediff-hide-face 'ediff-even-diff-face-B) |
1228 | ;; Until custom.el for XEmacs starts supporting :stipple we do this. | |
1229 | ;; This means that some use customization may be trashed. | |
1230 | (if (and ediff-xemacs-p | |
1231 | (ediff-has-face-support-p) | |
1232 | (not (ediff-color-display-p))) | |
1233 | (ediff-set-face-pixmap 'ediff-even-diff-face-B "Stipple")) | |
475f9031 | 1234 | |
985d0dad MK |
1235 | ;;(defvar ediff-even-diff-face-C |
1236 | ;; (if (ediff-has-face-support-p) | |
1237 | ;; (progn | |
1238 | ;; (make-face 'ediff-even-diff-face-C) | |
1239 | ;; (ediff-hide-face 'ediff-even-diff-face-C) | |
1240 | ;; (or (face-differs-from-default-p 'ediff-even-diff-face-C) | |
1241 | ;; (progn | |
1242 | ;; (copy-face 'ediff-even-diff-face-A 'ediff-even-diff-face-C) | |
1243 | ;; (ediff-set-face-pixmap 'ediff-even-diff-face-C | |
1244 | ;; ediff-even-diff-pixmap))) | |
1245 | ;; 'ediff-even-diff-face-C)) | |
1246 | ;; "Face used for highlighting even-numbered differences in buffer C.") | |
1247 | ||
1248 | (defface ediff-even-diff-face-C | |
1249 | '((((class color)) (:foreground "Black" :background "light grey")) | |
1250 | (t (:italic t :stipple "Stipple"))) | |
1251 | "Face for highlighting even-numbered non-current differences in buffer C." | |
1252 | :group 'ediff-highlighting) | |
1253 | ;; An internal variable. Ediff takes the face from here. When unhighlighting, | |
1254 | ;; this variable is set to nil, then again to the appropriate face. | |
8e41a31c MK |
1255 | (defvar ediff-even-diff-face-C 'ediff-even-diff-face-C |
1256 | "Face for highlighting even-numbered non-current differences in buffer C. | |
1257 | DO NOT CHANGE this variable. Instead, use the customization | |
1258 | widget to customize the actual face object `ediff-even-diff-face-C' | |
1259 | this variable represents.") | |
985d0dad MK |
1260 | (ediff-hide-face 'ediff-even-diff-face-C) |
1261 | ;; Until custom.el for XEmacs starts supporting :stipple we do this. | |
1262 | ;; This means that some use customization may be trashed. | |
1263 | (if (and ediff-xemacs-p | |
1264 | (ediff-has-face-support-p) | |
1265 | (not (ediff-color-display-p))) | |
1266 | (ediff-set-face-pixmap 'ediff-even-diff-face-C "Stipple")) | |
1267 | ||
1268 | ;;(defvar ediff-even-diff-face-Ancestor | |
1269 | ;; (if (ediff-has-face-support-p) | |
1270 | ;; (progn | |
1271 | ;; (make-face 'ediff-even-diff-face-Ancestor) | |
1272 | ;; (ediff-hide-face 'ediff-even-diff-face-Ancestor) | |
1273 | ;; (or (face-differs-from-default-p 'ediff-even-diff-face-Ancestor) | |
1274 | ;; (progn | |
1275 | ;; (copy-face | |
1276 | ;; 'ediff-even-diff-face-C 'ediff-even-diff-face-Ancestor) | |
1277 | ;; (ediff-set-face-pixmap 'ediff-even-diff-face-Ancestor | |
1278 | ;; ediff-even-diff-pixmap))) | |
1279 | ;; 'ediff-even-diff-face-Ancestor)) | |
1280 | ;; "Face highlighting even-numbered differences in the ancestor buffer.") | |
1281 | ||
1282 | (defface ediff-even-diff-face-Ancestor | |
1283 | '((((class color)) (:foreground "White" :background "Grey")) | |
1284 | (t (:italic t :stipple "Stipple"))) | |
1285 | "Face for highlighting even-numbered non-current differences in the ancestor buffer." | |
1286 | :group 'ediff-highlighting) | |
1287 | ;; An internal variable. Ediff takes the face from here. When unhighlighting, | |
1288 | ;; this variable is set to nil, then again to the appropriate face. | |
8e41a31c MK |
1289 | (defvar ediff-even-diff-face-Ancestor 'ediff-even-diff-face-Ancestor |
1290 | "Face for highlighting even-numbered non-current differences in buffer Ancestor. | |
1291 | DO NOT CHANGE this variable. Instead, use the customization | |
1292 | widget to customize the actual face object `ediff-even-diff-face-Ancestor' | |
1293 | this variable represents.") | |
985d0dad MK |
1294 | (ediff-hide-face 'ediff-even-diff-face-Ancestor) |
1295 | ;; Until custom.el for XEmacs starts supporting :stipple we do this. | |
1296 | ;; This means that some use customization may be trashed. | |
1297 | (if (and ediff-xemacs-p | |
1298 | (ediff-has-face-support-p) | |
1299 | (not (ediff-color-display-p))) | |
1300 | (ediff-set-face-pixmap | |
1301 | 'ediff-even-diff-face-Ancestor "Stipple")) | |
e756eb9f MK |
1302 | |
1303 | ;; Association between buffer types and even-diff-face symbols | |
1304 | (defconst ediff-even-diff-face-alist | |
1305 | '((A . ediff-even-diff-face-A) | |
1306 | (B . ediff-even-diff-face-B) | |
1307 | (C . ediff-even-diff-face-C) | |
1308 | (Ancestor . ediff-even-diff-face-Ancestor))) | |
1309 | ||
985d0dad MK |
1310 | ;;(defvar ediff-odd-diff-face-A |
1311 | ;; (if (ediff-has-face-support-p) | |
1312 | ;; (progn | |
1313 | ;; (make-face 'ediff-odd-diff-face-A) | |
1314 | ;; (or (face-differs-from-default-p 'ediff-odd-diff-face-A) | |
1315 | ;; (cond ((ediff-color-display-p) | |
1316 | ;; (ediff-set-face | |
1317 | ;; 'foreground 'ediff-odd-diff-face-A "White") | |
1318 | ;; (ediff-set-face | |
1319 | ;; 'background 'ediff-odd-diff-face-A "Gray")) | |
1320 | ;; (t | |
1321 | ;; (copy-face 'italic 'ediff-odd-diff-face-A) | |
1322 | ;; (ediff-set-face-pixmap 'ediff-odd-diff-face-A | |
1323 | ;; ediff-odd-diff-pixmap) | |
1324 | ;; ))) | |
1325 | ;; 'ediff-odd-diff-face-A)) | |
1326 | ;; "Face used for highlighting odd-numbered differences in buffer A.") | |
1327 | ||
1328 | (defface ediff-odd-diff-face-A | |
1329 | '((((class color)) (:foreground "White" :background "Grey")) | |
1330 | (t (:italic t :stipple "gray1"))) | |
1331 | "Face for highlighting odd-numbered non-current differences in buffer A." | |
1332 | :group 'ediff-highlighting) | |
1333 | ;; An internal variable. Ediff takes the face from here. When unhighlighting, | |
1334 | ;; this variable is set to nil, then again to the appropriate face. | |
8e41a31c MK |
1335 | (defvar ediff-odd-diff-face-A 'ediff-odd-diff-face-A |
1336 | "Face for highlighting odd-numbered non-current differences in buffer A. | |
1337 | DO NOT CHANGE this variable. Instead, use the customization | |
1338 | widget to customize the actual face object `ediff-odd-diff-face-A' | |
1339 | this variable represents.") | |
985d0dad MK |
1340 | (ediff-hide-face 'ediff-odd-diff-face-A) |
1341 | ;; Until custom.el for XEmacs starts supporting :stipple we do this. | |
1342 | ;; This means that some use customization may be trashed. | |
1343 | (if (and ediff-xemacs-p | |
1344 | (ediff-has-face-support-p) | |
1345 | (not (ediff-color-display-p))) | |
1346 | (ediff-set-face-pixmap 'ediff-odd-diff-face-A "gray1")) | |
475f9031 | 1347 | |
985d0dad MK |
1348 | ;;(defvar ediff-odd-diff-face-B |
1349 | ;; (if (ediff-has-face-support-p) | |
1350 | ;; (progn | |
1351 | ;; (make-face 'ediff-odd-diff-face-B) | |
1352 | ;; (ediff-hide-face 'ediff-odd-diff-face-B) | |
1353 | ;; (or (face-differs-from-default-p 'ediff-odd-diff-face-B) | |
1354 | ;; (cond ((ediff-color-display-p) | |
1355 | ;; (ediff-set-face | |
1356 | ;; 'foreground 'ediff-odd-diff-face-B "Black") | |
1357 | ;; (ediff-set-face | |
1358 | ;; 'background 'ediff-odd-diff-face-B "light grey")) | |
1359 | ;; (t | |
1360 | ;; (copy-face 'italic 'ediff-odd-diff-face-B) | |
1361 | ;; (ediff-set-face-pixmap 'ediff-odd-diff-face-B | |
1362 | ;; ediff-odd-diff-pixmap) | |
1363 | ;; ))) | |
1364 | ;; 'ediff-odd-diff-face-B)) | |
1365 | ;; "Face used for highlighting odd-numbered differences in buffer B.") | |
1366 | ||
1367 | (defface ediff-odd-diff-face-B | |
1368 | '((((class color)) (:foreground "Black" :background "light grey")) | |
1369 | (t (:italic t :stipple "gray1"))) | |
1370 | "Face for highlighting odd-numbered non-current differences in buffer B." | |
1371 | :group 'ediff-highlighting) | |
1372 | ;; An internal variable. Ediff takes the face from here. When unhighlighting, | |
1373 | ;; this variable is set to nil, then again to the appropriate face. | |
8e41a31c MK |
1374 | (defvar ediff-odd-diff-face-B 'ediff-odd-diff-face-B |
1375 | "Face for highlighting odd-numbered non-current differences in buffer B. | |
1376 | DO NOT CHANGE this variable. Instead, use the customization | |
1377 | widget to customize the actual face object `ediff-odd-diff-face-B' | |
1378 | this variable represents.") | |
985d0dad MK |
1379 | (ediff-hide-face 'ediff-odd-diff-face-B) |
1380 | ;; Until custom.el for XEmacs starts supporting :stipple we do this. | |
1381 | ;; This means that some use customization may be trashed. | |
1382 | (if (and ediff-xemacs-p | |
1383 | (ediff-has-face-support-p) | |
1384 | (not (ediff-color-display-p))) | |
1385 | (ediff-set-face-pixmap 'ediff-odd-diff-face-B "gray1")) | |
475f9031 | 1386 | |
985d0dad MK |
1387 | ;;(defvar ediff-odd-diff-face-C |
1388 | ;; (if (ediff-has-face-support-p) | |
1389 | ;; (progn | |
1390 | ;; (make-face 'ediff-odd-diff-face-C) | |
1391 | ;; (or (face-differs-from-default-p 'ediff-odd-diff-face-C) | |
1392 | ;; (progn | |
1393 | ;; (copy-face 'ediff-odd-diff-face-A 'ediff-odd-diff-face-C) | |
1394 | ;; (ediff-set-face-pixmap 'ediff-odd-diff-face-C | |
1395 | ;; ediff-odd-diff-pixmap))) | |
1396 | ;; 'ediff-odd-diff-face-C)) | |
1397 | ;; "Face used for highlighting odd-numbered differences in buffer C.") | |
1398 | ||
1399 | (defface ediff-odd-diff-face-C | |
1400 | '((((class color)) (:foreground "White" :background "Grey")) | |
1401 | (t (:italic t :stipple "gray1"))) | |
1402 | "Face for highlighting odd-numbered non-current differences in buffer C." | |
1403 | :group 'ediff-highlighting) | |
1404 | ;; An internal variable. Ediff takes the face from here. When unhighlighting, | |
1405 | ;; this variable is set to nil, then again to the appropriate face. | |
8e41a31c MK |
1406 | (defvar ediff-odd-diff-face-C 'ediff-odd-diff-face-C |
1407 | "Face for highlighting odd-numbered non-current differences in buffer C. | |
1408 | DO NOT CHANGE this variable. Instead, use the customization | |
1409 | widget to customize the actual face object `ediff-odd-diff-face-C' | |
1410 | this variable represents.") | |
985d0dad MK |
1411 | (ediff-hide-face 'ediff-odd-diff-face-C) |
1412 | ;; Until custom.el for XEmacs starts supporting :stipple we do this. | |
1413 | ;; This means that some use customization may be trashed. | |
1414 | (if (and ediff-xemacs-p | |
1415 | (ediff-has-face-support-p) | |
1416 | (not (ediff-color-display-p))) | |
1417 | (ediff-set-face-pixmap 'ediff-odd-diff-face-C "gray1")) | |
1418 | ||
1419 | ;;(defvar ediff-odd-diff-face-Ancestor | |
1420 | ;; (if (ediff-has-face-support-p) | |
1421 | ;; (progn | |
1422 | ;; (make-face 'ediff-odd-diff-face-Ancestor) | |
1423 | ;; (or (face-differs-from-default-p 'ediff-odd-diff-face-Ancestor) | |
1424 | ;; (progn | |
1425 | ;; (copy-face 'ediff-odd-diff-face-C 'ediff-odd-diff-face-Ancestor) | |
1426 | ;; (ediff-set-face-pixmap 'ediff-odd-diff-face-Ancestor | |
1427 | ;; ediff-odd-diff-pixmap))) | |
1428 | ;; 'ediff-odd-diff-face-Ancestor)) | |
1429 | ;; "Face used for highlighting even-numbered differences in the ancestor buffer.") | |
1430 | ||
1431 | (defface ediff-odd-diff-face-Ancestor | |
1432 | '((((class color)) (:foreground "Black" :background "light grey")) | |
1433 | (t (:italic t :stipple "gray1"))) | |
1434 | "Face for highlighting odd-numbered non-current differences in the ancestor buffer." | |
1435 | :group 'ediff-highlighting) | |
1436 | ;; An internal variable. Ediff takes the face from here. When unhighlighting, | |
1437 | ;; this variable is set to nil, then again to the appropriate face. | |
8e41a31c MK |
1438 | (defvar ediff-odd-diff-face-Ancestor 'ediff-odd-diff-face-Ancestor |
1439 | "Face for highlighting odd-numbered non-current differences in buffer Ancestor. | |
1440 | DO NOT CHANGE this variable. Instead, use the customization | |
1441 | widget to customize the actual face object `ediff-odd-diff-face-Ancestor' | |
1442 | this variable represents.") | |
985d0dad MK |
1443 | (ediff-hide-face 'ediff-odd-diff-face-Ancestor) |
1444 | ;; Until custom.el for XEmacs starts supporting :stipple we do this. | |
1445 | ;; This means that some use customization may be trashed. | |
1446 | (if (and ediff-xemacs-p | |
1447 | (ediff-has-face-support-p) | |
1448 | (not (ediff-color-display-p))) | |
1449 | (ediff-set-face-pixmap 'ediff-odd-diff-face-Ancestor "gray1")) | |
8343426b | 1450 | |
e756eb9f MK |
1451 | ;; Association between buffer types and odd-diff-face symbols |
1452 | (defconst ediff-odd-diff-face-alist | |
1453 | '((A . ediff-odd-diff-face-A) | |
1454 | (B . ediff-odd-diff-face-B) | |
1455 | (C . ediff-odd-diff-face-C) | |
1456 | (Ancestor . ediff-odd-diff-face-Ancestor))) | |
1457 | ||
1458 | ;; A-list of fine-diff face symbols associated with buffer types | |
1459 | (defconst ediff-fine-diff-face-alist | |
1460 | '((A . ediff-fine-diff-face-A) | |
1461 | (B . ediff-fine-diff-face-B) | |
1462 | (C . ediff-fine-diff-face-C) | |
1463 | (Ancestor . ediff-fine-diff-face-Ancestor))) | |
1464 | ||
8343426b MK |
1465 | ;; Help echo |
1466 | (put 'ediff-fine-diff-face-A 'ediff-help-echo | |
1467 | "A `refinement' of the current difference region") | |
1468 | (put 'ediff-fine-diff-face-B 'ediff-help-echo | |
1469 | "A `refinement' of the current difference region") | |
1470 | (put 'ediff-fine-diff-face-C 'ediff-help-echo | |
1471 | "A `refinement' of the current difference region") | |
1472 | (put 'ediff-fine-diff-face-Ancestor 'ediff-help-echo | |
1473 | "A `refinement' of the current difference region") | |
1474 | ||
475f9031 KH |
1475 | |
1476 | ;;; Overlays | |
1477 | ||
8343426b MK |
1478 | (ediff-defvar-local ediff-current-diff-overlay-A nil |
1479 | "Overlay for the current difference region in buffer A.") | |
1480 | (ediff-defvar-local ediff-current-diff-overlay-B nil | |
1481 | "Overlay for the current difference region in buffer B.") | |
1482 | (ediff-defvar-local ediff-current-diff-overlay-C nil | |
1483 | "Overlay for the current difference region in buffer C.") | |
1484 | (ediff-defvar-local ediff-current-diff-overlay-Ancestor nil | |
1485 | "Overlay for the current difference region in the ancestor buffer.") | |
e756eb9f | 1486 | |
8343426b MK |
1487 | ;; Compute priority of ediff overlay. |
1488 | (defun ediff-highest-priority (start end buffer) | |
1489 | (let ((pos (max 1 (1- start))) | |
1490 | ovr-list) | |
1491 | (if ediff-xemacs-p | |
1492 | (1+ ediff-shadow-overlay-priority) | |
e756eb9f | 1493 | (ediff-with-current-buffer buffer |
8343426b MK |
1494 | (while (< pos (min (point-max) (1+ end))) |
1495 | (setq ovr-list (append (overlays-at pos) ovr-list)) | |
1496 | (setq pos (next-overlay-change pos))) | |
1497 | (1+ (apply '+ | |
1498 | (mapcar (function | |
1499 | (lambda (ovr) | |
1500 | (if ovr | |
1501 | (or (ediff-overlay-get ovr 'priority) 0) | |
1502 | 0))) | |
1503 | ovr-list) | |
1504 | )) | |
1505 | )))) | |
475f9031 KH |
1506 | |
1507 | ||
1508 | (defvar ediff-toggle-read-only-function nil | |
1509 | "*Specifies the function to be used to toggle read-only. | |
1510 | If nil, Ediff tries to deduce the function from the binding of C-x C-q. | |
1511 | Normally, this is the `toggle-read-only' function, but, if version | |
1512 | control is used, it could be `vc-toggle-read-only' or `rcs-toggle-read-only'.") | |
1513 | ||
1e70790f MK |
1514 | (defcustom ediff-make-buffers-readonly-at-startup nil |
1515 | "*Make all variant buffers read-only when Ediff starts up. | |
1516 | This property can be toggled interactively." | |
1517 | :type 'boolean | |
1518 | :group 'ediff) | |
1519 | ||
475f9031 KH |
1520 | |
1521 | ;;; Misc | |
1522 | ||
475f9031 KH |
1523 | ;; if nil, this silences some messages |
1524 | (defconst ediff-verbose-p t) | |
92c51e07 MK |
1525 | |
1526 | (ediff-defvar-local ediff-autostore-merges 'group-jobs-only | |
1527 | "*Save the results of merge jobs automatically. | |
1528 | Nil means don't save automatically. t means always save. Anything but nil or t | |
1529 | means save automatically only if the merge job is part of a group of jobs, such | |
1530 | as `ediff-merge-directory' or `ediff-merge-directory-revisions'.") | |
1531 | ||
1532 | ;; file where the result of the merge is to be saved. used internally | |
1533 | (ediff-defvar-local ediff-merge-store-file nil "") | |
475f9031 | 1534 | |
1e70790f | 1535 | (defcustom ediff-no-emacs-help-in-control-buffer nil |
475f9031 | 1536 | "*Non-nil means C-h should not invoke Emacs help in control buffer. |
1e70790f MK |
1537 | Instead, C-h would jump to previous difference." |
1538 | :type 'boolean | |
1539 | :group 'ediff) | |
475f9031 KH |
1540 | |
1541 | (defvar ediff-temp-file-prefix | |
1542 | (let ((env (or (getenv "TMPDIR") | |
1543 | (getenv "TMP") | |
1544 | (getenv "TEMP"))) | |
1545 | d) | |
1546 | (setq d (if (and env (> (length env) 0)) | |
1547 | env | |
4ae69eac MK |
1548 | (cond ((memq system-type '(vax-vms axp-vms)) "SYS$SCRATCH:") |
1549 | ((eq system-type 'ms-dos) "c:/") | |
1550 | (t "/tmp")))) | |
475f9031 KH |
1551 | ;; The following is to make sure we get something to which we can |
1552 | ;; add directory levels on VMS. | |
1553 | (setq d (file-name-as-directory (directory-file-name d))) | |
475f9031 KH |
1554 | ) |
1555 | "*Prefix to put on Ediff temporary file names. | |
1556 | Do not start with `~/' or `~user-name/'.") | |
1557 | ||
1558 | (defvar ediff-temp-file-mode 384 ; u=rw only | |
1559 | "*Mode for Ediff temporary files.") | |
1560 | ||
1561 | ;; Metacharacters that have to be protected from the shell when executing | |
1562 | ;; a diff/diff3 command. | |
1563 | (defvar ediff-metachars "[ \t\n!\"#$&'()*;<=>?[\\^`{|~]" | |
1564 | "Characters that must be quoted with \\ when used in a shell command line. | |
1565 | More precisely, a regexp to match any one such character.") | |
1566 | ||
4ae69eac MK |
1567 | ;; needed to simulate frame-char-width in XEmacs. |
1568 | (defvar ediff-H-glyph (if ediff-xemacs-p (make-glyph "H"))) | |
1569 | ||
475f9031 | 1570 | |
1e70790f MK |
1571 | ;; Temporary file used for refining difference regions in buffer A. |
1572 | (ediff-defvar-local ediff-temp-file-A nil "") | |
1573 | ;; Temporary file used for refining difference regions in buffer B. | |
1574 | (ediff-defvar-local ediff-temp-file-B nil "") | |
1575 | ;; Temporary file used for refining difference regions in buffer C. | |
1576 | (ediff-defvar-local ediff-temp-file-C nil "") | |
1577 | ||
475f9031 KH |
1578 | |
1579 | ;;; In-line functions | |
1580 | ||
ddc90f39 MK |
1581 | (or (fboundp 'ediff-file-remote-p) ; user supplied his own function: use it |
1582 | (defun ediff-file-remote-p (file-name) | |
1583 | (car (cond ((featurep 'efs-auto) (efs-ftp-path file-name)) | |
1584 | ((fboundp 'file-remote-p) (file-remote-p file-name)) | |
1585 | (t (require 'ange-ftp) | |
1586 | ;; Can happen only in Emacs, since XEmacs has file-remote-p | |
1587 | (ange-ftp-ftp-name file-name)))))) | |
475f9031 | 1588 | |
475f9031 KH |
1589 | |
1590 | (defsubst ediff-frame-unsplittable-p (frame) | |
41d25ad0 | 1591 | (cdr (assq 'unsplittable (frame-parameters frame)))) |
475f9031 KH |
1592 | |
1593 | (defsubst ediff-get-next-window (wind prev-wind) | |
1594 | (or (window-live-p wind) | |
1595 | (setq wind (if prev-wind | |
1596 | (next-window wind) | |
1597 | (selected-window))))) | |
1598 | ||
475f9031 KH |
1599 | |
1600 | (defsubst ediff-kill-buffer-carefully (buf) | |
1601 | "Kill buffer BUF if it exists." | |
1602 | (if (ediff-buffer-live-p buf) | |
1603 | (kill-buffer (get-buffer buf)))) | |
92c51e07 | 1604 | |
ddc90f39 MK |
1605 | (defsubst ediff-background-face (buf-type dif-num) |
1606 | ;; The value of dif-num is always 1- the one that user sees. | |
1607 | ;; This is why even face is used when dif-num is odd. | |
e756eb9f MK |
1608 | (ediff-get-symbol-from-alist |
1609 | buf-type (if (ediff-odd-p dif-num) | |
1610 | ediff-even-diff-face-alist | |
1611 | ediff-odd-diff-face-alist) | |
1612 | )) | |
ddc90f39 | 1613 | |
92c51e07 MK |
1614 | |
1615 | ;; activate faces on diff regions in buffer | |
1616 | (defun ediff-paint-background-regions-in-one-buffer (buf-type unhighlight) | |
1617 | (let ((diff-vector | |
e756eb9f MK |
1618 | (eval (ediff-get-symbol-from-alist |
1619 | buf-type ediff-difference-vector-alist))) | |
92c51e07 MK |
1620 | overl diff-num) |
1621 | (mapcar (function | |
1622 | (lambda (rec) | |
1623 | (setq overl (ediff-get-diff-overlay-from-diff-record rec) | |
1624 | diff-num (ediff-overlay-get overl 'ediff-diff-num)) | |
ddc90f39 MK |
1625 | (if (ediff-overlay-buffer overl) |
1626 | ;; only if overlay is alive | |
1627 | (ediff-set-overlay-face | |
1628 | overl | |
1629 | (if (not unhighlight) | |
1630 | (ediff-background-face buf-type diff-num)))) | |
1631 | )) | |
92c51e07 MK |
1632 | diff-vector))) |
1633 | ||
1634 | ||
1635 | ;; activate faces on diff regions in all buffers | |
1636 | (defun ediff-paint-background-regions (&optional unhighlight) | |
1637 | (ediff-paint-background-regions-in-one-buffer | |
1638 | 'A unhighlight) | |
1639 | (ediff-paint-background-regions-in-one-buffer | |
1640 | 'B unhighlight) | |
1641 | (ediff-paint-background-regions-in-one-buffer | |
1642 | 'C unhighlight) | |
1643 | (ediff-paint-background-regions-in-one-buffer | |
1644 | 'Ancestor unhighlight)) | |
1645 | ||
1646 | (defun ediff-highlight-diff-in-one-buffer (n buf-type) | |
1647 | (if (ediff-buffer-live-p (ediff-get-buffer buf-type)) | |
1648 | (let* ((buff (ediff-get-buffer buf-type)) | |
e756eb9f | 1649 | (last (ediff-with-current-buffer buff (point-max))) |
92c51e07 MK |
1650 | (begin (ediff-get-diff-posn buf-type 'beg n)) |
1651 | (end (ediff-get-diff-posn buf-type 'end n)) | |
1652 | (xtra (if (equal begin end) 1 0)) | |
1653 | (end-hilit (min last (+ end xtra))) | |
1654 | (current-diff-overlay | |
1655 | (symbol-value | |
e756eb9f MK |
1656 | (ediff-get-symbol-from-alist |
1657 | buf-type ediff-current-diff-overlay-alist)))) | |
92c51e07 MK |
1658 | |
1659 | (if ediff-xemacs-p | |
1660 | (ediff-move-overlay current-diff-overlay begin end-hilit) | |
1661 | (ediff-move-overlay current-diff-overlay begin end-hilit buff)) | |
1662 | (ediff-overlay-put current-diff-overlay 'priority | |
1663 | (ediff-highest-priority begin end-hilit buff)) | |
1664 | (ediff-overlay-put current-diff-overlay 'ediff-diff-num n) | |
1665 | ||
1666 | ;; unhighlight the background overlay for diff n so it won't | |
1667 | ;; interfere with the current diff overlay | |
1668 | (ediff-set-overlay-face (ediff-get-diff-overlay n buf-type) nil) | |
1669 | ))) | |
1670 | ||
1671 | ||
1672 | (defun ediff-unhighlight-diff-in-one-buffer (buf-type) | |
1673 | (if (ediff-buffer-live-p (ediff-get-buffer buf-type)) | |
1674 | (let ((current-diff-overlay | |
1675 | (symbol-value | |
e756eb9f MK |
1676 | (ediff-get-symbol-from-alist |
1677 | buf-type ediff-current-diff-overlay-alist))) | |
92c51e07 MK |
1678 | (overlay |
1679 | (ediff-get-diff-overlay ediff-current-difference buf-type)) | |
1680 | ) | |
1681 | ||
1682 | (ediff-move-overlay current-diff-overlay 1 1) | |
1683 | ||
1684 | ;; rehighlight the overlay in the background of the | |
1685 | ;; current difference region | |
1686 | (ediff-set-overlay-face | |
1687 | overlay | |
1688 | (if (and (ediff-has-face-support-p) | |
1689 | ediff-use-faces ediff-highlight-all-diffs) | |
1690 | (ediff-background-face buf-type ediff-current-difference))) | |
1691 | ))) | |
1692 | ||
1693 | (defun ediff-unhighlight-diffs-totally-in-one-buffer (buf-type) | |
1694 | (ediff-unselect-and-select-difference -1) | |
1695 | (if (and (ediff-has-face-support-p) ediff-use-faces) | |
1696 | (let* ((inhibit-quit t) | |
1697 | (current-diff-overlay-var | |
e756eb9f MK |
1698 | (ediff-get-symbol-from-alist |
1699 | buf-type ediff-current-diff-overlay-alist)) | |
92c51e07 MK |
1700 | (current-diff-overlay (symbol-value current-diff-overlay-var))) |
1701 | (ediff-paint-background-regions 'unhighlight) | |
1702 | (if (ediff-overlayp current-diff-overlay) | |
1703 | (ediff-delete-overlay current-diff-overlay)) | |
1704 | (set current-diff-overlay-var nil) | |
1705 | ))) | |
475f9031 KH |
1706 | |
1707 | ||
1708 | (defsubst ediff-highlight-diff (n) | |
1709 | "Put face on diff N. Invoked for X displays only." | |
1710 | (ediff-highlight-diff-in-one-buffer n 'A) | |
1711 | (ediff-highlight-diff-in-one-buffer n 'B) | |
8343426b MK |
1712 | (ediff-highlight-diff-in-one-buffer n 'C) |
1713 | (ediff-highlight-diff-in-one-buffer n 'Ancestor) | |
1714 | ) | |
475f9031 KH |
1715 | |
1716 | ||
1717 | (defsubst ediff-unhighlight-diff () | |
1718 | "Remove overlays from buffers A, B, and C." | |
1719 | (ediff-unhighlight-diff-in-one-buffer 'A) | |
1720 | (ediff-unhighlight-diff-in-one-buffer 'B) | |
8343426b MK |
1721 | (ediff-unhighlight-diff-in-one-buffer 'C) |
1722 | (ediff-unhighlight-diff-in-one-buffer 'Ancestor) | |
1723 | ) | |
475f9031 KH |
1724 | |
1725 | ;; delete highlighting overlays, restore faces to their original form | |
1726 | (defsubst ediff-unhighlight-diffs-totally () | |
1727 | (ediff-unhighlight-diffs-totally-in-one-buffer 'A) | |
1728 | (ediff-unhighlight-diffs-totally-in-one-buffer 'B) | |
8343426b MK |
1729 | (ediff-unhighlight-diffs-totally-in-one-buffer 'C) |
1730 | (ediff-unhighlight-diffs-totally-in-one-buffer 'Ancestor) | |
1731 | ) | |
1732 | ||
475f9031 KH |
1733 | |
1734 | ;; arg is a record for a given diff in a difference vector | |
1735 | ;; this record is itself a vector | |
1736 | (defsubst ediff-clear-fine-diff-vector (diff-record) | |
1737 | (if diff-record | |
1738 | (mapcar 'ediff-delete-overlay | |
1739 | (ediff-get-fine-diff-vector-from-diff-record diff-record)))) | |
1740 | ||
1741 | (defsubst ediff-clear-fine-differences-in-one-buffer (n buf-type) | |
1742 | (ediff-clear-fine-diff-vector (ediff-get-difference n buf-type)) | |
1743 | (ediff-set-fine-diff-vector n buf-type nil)) | |
1744 | ||
1745 | (defsubst ediff-clear-fine-differences (n) | |
1746 | (ediff-clear-fine-differences-in-one-buffer n 'A) | |
1747 | (ediff-clear-fine-differences-in-one-buffer n 'B) | |
1748 | (if ediff-3way-job | |
1749 | (ediff-clear-fine-differences-in-one-buffer n 'C))) | |
1750 | ||
1751 | ||
1752 | (defsubst ediff-convert-fine-diffs-to-overlays (diff-list region-num) | |
1753 | (ediff-set-fine-overlays-in-one-buffer 'A diff-list region-num) | |
1754 | (ediff-set-fine-overlays-in-one-buffer 'B diff-list region-num) | |
1755 | (if ediff-3way-job | |
1756 | (ediff-set-fine-overlays-in-one-buffer 'C diff-list region-num) | |
1757 | )) | |
1758 | ||
1759 | (defsubst ediff-mouse-event-p (event) | |
1760 | (if ediff-xemacs-p | |
1761 | (button-event-p event) | |
1762 | (string-match "mouse" (format "%S" (event-basic-type event))) | |
1763 | )) | |
8343426b MK |
1764 | |
1765 | ||
1766 | (defsubst ediff-key-press-event-p (event) | |
1767 | (if ediff-xemacs-p | |
1768 | (key-press-event-p event) | |
1769 | (or (char-or-string-p event) (symbolp event)))) | |
1770 | ||
1771 | (defun ediff-event-point (event) | |
1772 | (cond ((ediff-mouse-event-p event) | |
1773 | (if ediff-xemacs-p | |
1774 | (event-point event) | |
1775 | (posn-point (event-start event)))) | |
1776 | ((ediff-key-press-event-p event) | |
1777 | (point)) | |
4ae69eac | 1778 | (t (error)))) |
8343426b MK |
1779 | |
1780 | (defun ediff-event-buffer (event) | |
1781 | (cond ((ediff-mouse-event-p event) | |
1782 | (if ediff-xemacs-p | |
1783 | (event-buffer event) | |
1784 | (window-buffer (posn-window (event-start event))))) | |
1785 | ((ediff-key-press-event-p event) | |
1786 | (current-buffer)) | |
4ae69eac | 1787 | (t (error)))) |
8343426b | 1788 | |
475f9031 KH |
1789 | |
1790 | (defsubst ediff-frame-iconified-p (frame) | |
41d25ad0 | 1791 | (if (and (ediff-window-display-p) (frame-live-p frame)) |
475f9031 | 1792 | (if ediff-xemacs-p |
41d25ad0 | 1793 | (frame-iconified-p frame) |
475f9031 KH |
1794 | (eq (frame-visible-p frame) 'icon)))) |
1795 | ||
1796 | (defsubst ediff-window-visible-p (wind) | |
41d25ad0 | 1797 | ;; under TTY, window-live-p also means window is visible |
475f9031 | 1798 | (and (window-live-p wind) |
41d25ad0 KH |
1799 | (or (not (ediff-window-display-p)) |
1800 | (frame-visible-p (window-frame wind))))) | |
475f9031 KH |
1801 | |
1802 | ||
1803 | (defsubst ediff-frame-char-width (frame) | |
1804 | (if ediff-xemacs-p | |
41d25ad0 | 1805 | (/ (frame-pixel-width frame) (frame-width frame)) |
475f9031 KH |
1806 | (frame-char-width frame))) |
1807 | ||
8343426b MK |
1808 | (defun ediff-reset-mouse (&optional frame do-not-grab-mouse) |
1809 | (or frame (setq frame (selected-frame))) | |
41d25ad0 | 1810 | (if (ediff-window-display-p) |
8343426b MK |
1811 | (let ((frame-or-wind frame)) |
1812 | (if ediff-xemacs-p | |
1813 | (setq frame-or-wind (frame-selected-window frame))) | |
1814 | (or do-not-grab-mouse | |
1815 | ;; don't set mouse if the user said to never do this | |
1816 | (not ediff-grab-mouse) | |
1817 | ;; Don't grab on quit, if the user doesn't want to. | |
1818 | ;; If ediff-grab-mouse = t, then mouse won't be grabbed for | |
1819 | ;; sessions that are not part of a group (this is done in | |
1820 | ;; ediff-recenter). The condition below affects only terminating | |
ceb0ea8b | 1821 | ;; sessions in session groups (in which case mouse is warped into |
8343426b MK |
1822 | ;; a meta buffer). |
1823 | (and (eq ediff-grab-mouse 'maybe) | |
1824 | (memq this-command '(ediff-quit ediff-update-diffs))) | |
1825 | (set-mouse-position frame-or-wind 1 0)) | |
1826 | ))) | |
1827 | ||
1828 | (defsubst ediff-spy-after-mouse () | |
1829 | (setq ediff-mouse-pixel-position (mouse-pixel-position))) | |
1830 | ||
4ae69eac MK |
1831 | ;; It is not easy to find out when the user grabs the mouse, since emacs and |
1832 | ;; xemacs behave differently when mouse is not in any frame. Also, this is | |
1833 | ;; sensitive to when the user grabbed mouse. Not used for now. | |
8343426b MK |
1834 | (defun ediff-user-grabbed-mouse () |
1835 | (if ediff-mouse-pixel-position | |
1836 | (cond ((not (eq (car ediff-mouse-pixel-position) | |
1837 | (car (mouse-pixel-position))))) | |
1838 | ((and (car (cdr ediff-mouse-pixel-position)) | |
1839 | (car (cdr (mouse-pixel-position))) | |
1840 | (cdr (cdr ediff-mouse-pixel-position)) | |
1841 | (cdr (cdr (mouse-pixel-position)))) | |
1842 | (not (and (< (abs (- (car (cdr ediff-mouse-pixel-position)) | |
1843 | (car (cdr (mouse-pixel-position))))) | |
ceb0ea8b | 1844 | ediff-mouse-pixel-threshold) |
8343426b MK |
1845 | (< (abs (- (cdr (cdr ediff-mouse-pixel-position)) |
1846 | (cdr (cdr (mouse-pixel-position))))) | |
ceb0ea8b | 1847 | ediff-mouse-pixel-threshold)))) |
8343426b | 1848 | (t nil)))) |
41d25ad0 | 1849 | |
475f9031 KH |
1850 | (defsubst ediff-frame-char-height (frame) |
1851 | (if ediff-xemacs-p | |
4ae69eac | 1852 | (glyph-height ediff-H-glyph (selected-window frame)) |
475f9031 KH |
1853 | (frame-char-height frame))) |
1854 | ||
92c51e07 | 1855 | ;; Some overlay functions |
475f9031 | 1856 | |
ddc90f39 MK |
1857 | (defsubst ediff-overlay-start (overl) |
1858 | (if (ediff-overlayp overl) | |
1859 | (if ediff-emacs-p | |
1860 | (overlay-start overl) | |
1861 | (extent-start-position overl)))) | |
1862 | ||
1863 | (defsubst ediff-overlay-end (overl) | |
1864 | (if (ediff-overlayp overl) | |
1865 | (if ediff-emacs-p | |
1866 | (overlay-end overl) | |
1867 | (extent-end-position overl)))) | |
1868 | ||
475f9031 KH |
1869 | (defsubst ediff-empty-overlay-p (overl) |
1870 | (= (ediff-overlay-start overl) (ediff-overlay-end overl))) | |
4ae69eac MK |
1871 | |
1872 | ;; like overlay-buffer in Emacs. In XEmacs, returns nil if the extent is | |
1873 | ;; dead. Otherwise, works like extent-buffer | |
1874 | (defun ediff-overlay-buffer (overl) | |
1875 | (if ediff-emacs-p | |
1876 | (overlay-buffer overl) | |
bbe6126c | 1877 | (and (extent-live-p overl) (extent-object overl)))) |
4ae69eac MK |
1878 | |
1879 | ;; like overlay-get in Emacs. In XEmacs, returns nil if the extent is | |
1880 | ;; dead. Otherwise, like extent-property | |
1881 | (defun ediff-overlay-get (overl property) | |
1882 | (if ediff-emacs-p | |
1883 | (overlay-get overl property) | |
1884 | (and (extent-live-p overl) (extent-property overl property)))) | |
92c51e07 MK |
1885 | |
1886 | ||
1887 | ;; These two functions are here because XEmacs refuses to | |
1888 | ;; handle overlays whose buffers were deleted. | |
1889 | (defun ediff-move-overlay (overlay beg end &optional buffer) | |
1890 | "Calls `move-overlay' in Emacs and `set-extent-endpoints' in Lemacs. | |
1891 | Checks if overlay's buffer exists before actually doing the move." | |
1892 | (let ((buf (and overlay (ediff-overlay-buffer overlay)))) | |
1893 | (if (ediff-buffer-live-p buf) | |
1894 | (if ediff-xemacs-p | |
1895 | (set-extent-endpoints overlay beg end) | |
1896 | (move-overlay overlay beg end buffer)) | |
1897 | ;; buffer's dead | |
1898 | (if overlay | |
1899 | (ediff-delete-overlay overlay))))) | |
1900 | ||
1901 | (defun ediff-overlay-put (overlay prop value) | |
1902 | "Calls `overlay-put' or `set-extent-property' depending on Emacs version. | |
1903 | Checks if overlay's buffer exists." | |
1904 | (if (ediff-buffer-live-p (ediff-overlay-buffer overlay)) | |
1905 | (if ediff-xemacs-p | |
1906 | (set-extent-property overlay prop value) | |
1907 | (overlay-put overlay prop value)) | |
1908 | (ediff-delete-overlay overlay))) | |
1909 | ||
1910 | ;; Some diff region tests | |
475f9031 KH |
1911 | |
1912 | ;; t if diff region is empty. | |
1913 | ;; In case of buffer C, t also if it is not a 3way | |
1914 | ;; comparison job (merging jobs return t as well). | |
1915 | (defun ediff-empty-diff-region-p (n buf-type) | |
1916 | (if (eq buf-type 'C) | |
1917 | (or (not ediff-3way-comparison-job) | |
1918 | (= (ediff-get-diff-posn 'C 'beg n) | |
1919 | (ediff-get-diff-posn 'C 'end n))) | |
1920 | (= (ediff-get-diff-posn buf-type 'beg n) | |
1921 | (ediff-get-diff-posn buf-type 'end n)))) | |
1922 | ||
1923 | ;; Test if diff region is white space only. | |
1924 | ;; If 2-way job and buf-type = C, then returns t. | |
1925 | (defun ediff-whitespace-diff-region-p (n buf-type) | |
1926 | (or (and (eq buf-type 'C) (not ediff-3way-job)) | |
8343426b | 1927 | (ediff-empty-diff-region-p n buf-type) |
475f9031 KH |
1928 | (let ((beg (ediff-get-diff-posn buf-type 'beg n)) |
1929 | (end (ediff-get-diff-posn buf-type 'end n))) | |
e756eb9f | 1930 | (ediff-with-current-buffer (ediff-get-buffer buf-type) |
475f9031 KH |
1931 | (save-excursion |
1932 | (goto-char beg) | |
1933 | (skip-chars-forward ediff-whitespace) | |
1934 | (>= (point) end)))))) | |
1935 | ||
1936 | ;; temporarily uses DIR to abbreviate file name | |
1937 | ;; if DIR is nil, use default-directory | |
4ae69eac | 1938 | (defun ediff-abbreviate-file-name (file &optional dir) |
8343426b MK |
1939 | (cond ((stringp dir) |
1940 | (let ((directory-abbrev-alist (list (cons dir "")))) | |
1941 | (abbreviate-file-name file))) | |
1942 | (ediff-emacs-p (abbreviate-file-name file)) | |
1943 | (t ; XEmacs requires addl argument | |
1944 | (abbreviate-file-name file t)))) | |
1945 | ||
1946 | ;; Takes a directory and returns the parent directory. | |
1947 | ;; does nothing to `/'. If the ARG is a regular file, | |
1948 | ;; strip the file AND the last dir. | |
1949 | (defun ediff-strip-last-dir (dir) | |
1950 | (if (not (stringp dir)) (setq dir default-directory)) | |
1951 | (setq dir (expand-file-name dir)) | |
1952 | (or (file-directory-p dir) (setq dir (file-name-directory dir))) | |
1953 | (let* ((pos (1- (length dir))) | |
1954 | (last-char (aref dir pos))) | |
1955 | (if (and (> pos 0) (= last-char ?/)) | |
1956 | (setq dir (substring dir 0 pos))) | |
1957 | (ediff-abbreviate-file-name (file-name-directory dir)))) | |
1958 | ||
1959 | (defun ediff-truncate-string-left (str newlen) | |
1960 | ;; leave space for ... on the left | |
1961 | (let ((len (length str)) | |
1962 | substr) | |
1963 | (if (<= len newlen) | |
1964 | str | |
1965 | (setq newlen (max 0 (- newlen 3))) | |
1966 | (setq substr (substring str (max 0 (- len 1 newlen)))) | |
1967 | (concat "..." substr)))) | |
1968 | ||
1969 | (defun ediff-abbrev-jobname (jobname) | |
1970 | (cond ((eq jobname 'ediff-directories) | |
1971 | "Compare two directories") | |
1972 | ((eq jobname 'ediff-files) | |
1973 | "Compare two files") | |
1974 | ((eq jobname 'ediff-buffers) | |
1975 | "Compare two buffers") | |
1976 | ((eq jobname 'ediff-directories3) | |
1977 | "Compare three directories") | |
1978 | ((eq jobname 'ediff-files3) | |
1979 | "Compare three files") | |
1980 | ((eq jobname 'ediff-buffers3) | |
1981 | "Compare three buffers") | |
1982 | ((eq jobname 'ediff-revision) | |
1983 | "Compare file with a version") | |
1984 | ((eq jobname 'ediff-directory-revisions) | |
1985 | "Compare dir files with versions") | |
1986 | ((eq jobname 'ediff-merge-directory-revisions) | |
1987 | "Merge dir files with versions") | |
1988 | ((eq jobname 'ediff-merge-directory-revisions-with-ancestor) | |
1989 | "Merge dir versions via ancestors") | |
1990 | (t | |
1991 | (let* ((str (substring (symbol-name jobname) 6)) | |
1992 | (len (length str)) | |
1993 | (pos 0)) | |
1994 | (while (< pos len) | |
1995 | (if (= pos 0) | |
1996 | (aset str pos (upcase (aref str pos)))) | |
1997 | (if (= (aref str pos) ?-) | |
1998 | (aset str pos ?\ )) | |
1999 | (setq pos (1+ pos))) | |
2000 | str)))) | |
2001 | ||
2002 | ||
475f9031 KH |
2003 | |
2004 | (defsubst ediff-get-region-contents (n buf-type ctrl-buf &optional start end) | |
e756eb9f MK |
2005 | (ediff-with-current-buffer |
2006 | (ediff-with-current-buffer ctrl-buf (ediff-get-buffer buf-type)) | |
475f9031 KH |
2007 | (buffer-substring |
2008 | (or start (ediff-get-diff-posn buf-type 'beg n ctrl-buf)) | |
2009 | (or end (ediff-get-diff-posn buf-type 'end n ctrl-buf))))) | |
2010 | ||
2011 | ;; If ediff modified mode line, strip the modification | |
2012 | (defsubst ediff-strip-mode-line-format () | |
8343426b | 2013 | (if (member (car mode-line-format) '(" A: " " B: " " C: " " Ancestor: ")) |
475f9031 KH |
2014 | (setq mode-line-format (nth 2 mode-line-format)))) |
2015 | ||
2016 | ;; Verify that we have a difference selected. | |
2017 | (defsubst ediff-valid-difference-p (&optional n) | |
2018 | (or n (setq n ediff-current-difference)) | |
2019 | (and (>= n 0) (< n ediff-number-of-differences))) | |
2020 | ||
2021 | (defsubst ediff-show-all-diffs (n) | |
2022 | "Don't skip difference regions." | |
2023 | nil) | |
8343426b MK |
2024 | |
2025 | (defsubst Xor (a b) | |
2026 | (or (and a (not b)) (and (not a) b))) | |
009650b3 MK |
2027 | |
2028 | (defsubst ediff-message-if-verbose (string &rest args) | |
2029 | (if ediff-verbose-p | |
2030 | (apply 'message string args))) | |
4ae69eac | 2031 | |
bbe6126c | 2032 | (defun ediff-file-attributes (filename attr-number) |
ddc90f39 MK |
2033 | (if (ediff-file-remote-p filename) |
2034 | -1 | |
2035 | (nth attr-number (file-attributes filename)))) | |
2036 | ||
bbe6126c MK |
2037 | (defsubst ediff-file-size (filename) |
2038 | (ediff-file-attributes filename 7)) | |
2039 | (defsubst ediff-file-modtime (filename) | |
2040 | (ediff-file-attributes filename 5)) | |
2041 | ||
2042 | ||
92c51e07 | 2043 | (defun ediff-convert-standard-filename (fname) |
ddc90f39 | 2044 | (if (fboundp 'convert-standard-filename) |
92c51e07 | 2045 | (convert-standard-filename fname) |
92c51e07 | 2046 | fname)) |
bbe6126c MK |
2047 | |
2048 | ||
92c51e07 MK |
2049 | ;;; Local Variables: |
2050 | ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) | |
e756eb9f MK |
2051 | ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) |
2052 | ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) | |
92c51e07 | 2053 | ;;; End: |
475f9031 KH |
2054 | |
2055 | (provide 'ediff-init) | |
2056 | ||
2057 | ||
2058 | ;;; ediff-init.el ends here |