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