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