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