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