1 ;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff
3 ;; Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
7 ;; This file is part of GNU Emacs.
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)
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.
19 ;; You should have received a copy of the GNU General Public License
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.
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
)
38 (load "ange-ftp" 'noerror
)))
42 (defconst ediff-xemacs-p
(string-match "XEmacs" emacs-version
))
44 (defconst ediff-emacs-p
(not ediff-xemacs-p
))
46 (defvar ediff-force-faces nil
47 "If t, Ediff will think that it is running on a display that supports faces.
48 This is provided as a temporary relief for users of face-capable displays
49 that Ediff doesn't know about.")
51 ;; Are we running as a window application or on a TTY?
52 (defsubst ediff-device-type
()
55 (device-type (selected-device))))
57 ;; in XEmacs: device-type is tty on tty and stream in batch.
58 (defun ediff-window-display-p ()
59 (and (ediff-device-type) (not (memq (ediff-device-type) '(tty pc stream
)))))
61 ;; test if supports faces
62 ;; ediff-force-faces is for those devices that support faces, but we don't know
64 (defun ediff-has-face-support-p ()
65 (cond ((ediff-window-display-p))
67 (ediff-emacs-p (memq (ediff-device-type) '(pc)))
68 (ediff-xemacs-p (memq (ediff-device-type) '(tty pc
)))))
71 ;; Defines SYMBOL as an advertised local variable.
72 ;; Performs a defvar, then executes `make-variable-buffer-local' on
73 ;; the variable. Also sets the `permanent-local' property,
74 ;; so that `kill-all-local-variables' (called by major-mode setting
75 ;; commands) won't destroy Ediff control variables.
77 ;; Plagiarised from `emerge-defvar-local' for XEmacs.
78 (defmacro ediff-defvar-local
(var value doc
)
80 (defvar (, var
) (, value
) (, doc
))
81 (make-variable-buffer-local '(, var
))
82 (put '(, var
) 'permanent-local t
))))
86 ;; Variables that control each Ediff session---local to the control buffer.
89 ;; The buffer in which the A variant is stored.
90 (ediff-defvar-local ediff-buffer-A nil
"")
91 ;; The buffer in which the B variant is stored.
92 (ediff-defvar-local ediff-buffer-B nil
"")
93 ;; The buffer in which the C variant is stored.
94 (ediff-defvar-local ediff-buffer-C nil
"")
96 (ediff-defvar-local ediff-ancestor-buffer nil
"")
97 ;; The Ediff control buffer
98 (ediff-defvar-local ediff-control-buffer nil
"")
101 ;; Association between buff-type and ediff-buffer-*
102 (defconst ediff-buffer-alist
103 '((?A . ediff-buffer-A
)
104 (?B . ediff-buffer-B
)
105 (?C . ediff-buffer-C
)))
108 (defmacro ediff-odd-p
(arg)
109 (` (eq (logand (, arg
) 1) 1)))
111 (defmacro ediff-buffer-live-p
(buf)
112 (` (and (, buf
) (get-buffer (, buf
)) (buffer-name (get-buffer (, buf
))))))
114 (defmacro ediff-get-buffer
(arg)
115 (` (cond ((eq (, arg
) 'A
) ediff-buffer-A
)
116 ((eq (, arg
) 'B
) ediff-buffer-B
)
117 ((eq (, arg
) 'C
) ediff-buffer-C
)
118 ((eq (, arg
) 'Ancestor
) ediff-ancestor-buffer
)
122 (defmacro ediff-get-value-according-to-buffer-type
(buf-type list
)
123 (` (cond ((eq (, buf-type
) 'A
) (nth 0 (, list
)))
124 ((eq (, buf-type
) 'B
) (nth 1 (, list
)))
125 ((eq (, buf-type
) 'C
) (nth 2 (, list
))))))
127 (defmacro ediff-char-to-buftype
(arg)
128 (` (cond ((memq (, arg
) '(?a ?A
)) 'A
)
129 ((memq (, arg
) '(?b ?B
)) 'B
)
130 ((memq (, arg
) '(?c ?C
)) 'C
)
135 ;; A-list is supposed to be of the form (A . symb) (B . symb)...)
136 ;; where the first part of any association is a buffer type and the second is
137 ;; an appropriate symbol. Given buffer-type, this function returns the
138 ;; symbol. This is used to avoid using `intern'
139 (defsubst ediff-get-symbol-from-alist
(buf-type alist
)
140 (cdr (assoc buf-type alist
)))
142 (defconst ediff-difference-vector-alist
143 '((A . ediff-difference-vector-A
)
144 (B . ediff-difference-vector-B
)
145 (C . ediff-difference-vector-C
)
146 (Ancestor . ediff-difference-vector-Ancestor
)))
148 (defmacro ediff-get-difference
(n buf-type
)
151 (ediff-get-symbol-from-alist
152 (, buf-type
) ediff-difference-vector-alist
))
155 ;; Tell if it has been previously determined that the region has
156 ;; no diffs other than the white space and newlines
157 ;; The argument, N, is the diff region number used by Ediff to index the
158 ;; diff vector. It is 1 less than the number seen by the user.
160 ;; t if the diffs are whitespace in all buffers
161 ;; 'A (in 3-buf comparison only) if there are only whitespace
162 ;; diffs in bufs B and C
163 ;; 'B (in 3-buf comparison only) if there are only whitespace
164 ;; diffs in bufs A and C
165 ;; 'C (in 3-buf comparison only) if there are only whitespace
166 ;; diffs in bufs A and B
168 ;; A difference vector has the form:
169 ;; [diff diff diff ...]
170 ;; where each diff has the form:
171 ;; [overlay fine-diff-vector no-fine-diffs-flag]
172 ;; fine-diff-vector is a vector [fine-diff fine-diff fine-diff ...]
173 (defmacro ediff-no-fine-diffs-p
(n)
174 (` (aref (ediff-get-difference (, n
) 'A
) 2)))
176 (defmacro ediff-get-diff-overlay-from-diff-record
(diff-rec)
177 (` (aref (, diff-rec
) 0)))
179 (defmacro ediff-get-diff-overlay
(n buf-type
)
180 (` (ediff-get-diff-overlay-from-diff-record
181 (ediff-get-difference (, n
) (, buf-type
)))))
183 (defmacro ediff-get-fine-diff-vector-from-diff-record
(diff-rec)
184 (` (aref (, diff-rec
) 1)))
186 (defmacro ediff-set-fine-diff-vector
(n buf-type fine-vec
)
187 (` (aset (ediff-get-difference (, n
) (, buf-type
)) 1 (, fine-vec
))))
189 (defmacro ediff-get-state-of-diff
(n buf-type
)
190 (` (if (ediff-buffer-live-p ediff-buffer-C
)
191 (aref (ediff-get-difference (, n
) (, buf-type
)) 3))))
192 (defmacro ediff-set-state-of-diff
(n buf-type val
)
193 (` (aset (ediff-get-difference (, n
) (, buf-type
)) 3 (, val
))))
194 (defmacro ediff-get-state-of-merge
(n)
195 (` (if ediff-state-of-merge
196 (aref (aref ediff-state-of-merge
(, n
)) 0))))
197 (defmacro ediff-get-state-of-ancestor
(n)
198 (` (if ediff-state-of-merge
199 (aref (aref ediff-state-of-merge
(, n
)) 1))))
200 (defmacro ediff-set-state-of-merge
(n val
)
201 (` (if ediff-state-of-merge
202 (aset (aref ediff-state-of-merge
(, n
)) 0 (, val
)))))
204 ;; if flag is t, puts a mark on diff region saying that
205 ;; the differences are in white space only. If flag is nil,
206 ;; the region is marked as essential (i.e., differences are
207 ;; not just in the white space and newlines.)
208 (defmacro ediff-mark-diff-as-space-only
(n flag
)
209 (` (aset (ediff-get-difference (, n
) 'A
) 2 (, flag
))))
211 (defmacro ediff-get-fine-diff-vector
(n buf-type
)
212 (` (ediff-get-fine-diff-vector-from-diff-record
213 (ediff-get-difference (, n
) (, buf-type
)))))
215 ;; Macro to switch to BUFFER, evaluate BODY, returns to original buffer.
216 ;; Doesn't save the point and mark.
217 ;; This is `with-current-buffer' with the added test for live buffers."
218 (defmacro ediff-with-current-buffer
(buffer &rest body
)
219 (` (if (ediff-buffer-live-p (, buffer
))
221 (set-buffer (, buffer
))
223 (or (eq this-command
'ediff-quit
)
224 (error ediff-KILLED-VITAL-BUFFER
))
228 (defsubst ediff-multiframe-setup-p
()
229 (and (ediff-window-display-p) ediff-multiframe
))
231 (defmacro ediff-narrow-control-frame-p
()
232 (` (and (ediff-multiframe-setup-p)
233 (equal ediff-help-message ediff-brief-message-string
))))
235 (defmacro ediff-3way-comparison-job
()
238 '(ediff-files3 ediff-buffers3
))))
239 (ediff-defvar-local ediff-3way-comparison-job nil
"")
241 (defmacro ediff-merge-job
()
246 ediff-merge-files-with-ancestor
247 ediff-merge-buffers-with-ancestor
248 ediff-merge-revisions
249 ediff-merge-revisions-with-ancestor
))))
250 (ediff-defvar-local ediff-merge-job nil
"")
252 (defmacro ediff-merge-with-ancestor-job
()
255 '(ediff-merge-files-with-ancestor
256 ediff-merge-buffers-with-ancestor
257 ediff-merge-revisions-with-ancestor
))))
258 (ediff-defvar-local ediff-merge-with-ancestor-job nil
"")
260 (defmacro ediff-3way-job
()
261 (` (or ediff-3way-comparison-job ediff-merge-job
)))
262 (ediff-defvar-local ediff-3way-job nil
"")
264 ;; A diff3 job is like a 3way job, but ediff-merge doesn't require the use
266 (defmacro ediff-diff3-job
()
267 (` (or ediff-3way-comparison-job
268 ediff-merge-with-ancestor-job
)))
269 (ediff-defvar-local ediff-diff3-job nil
"")
271 (defmacro ediff-windows-job
()
272 (` (memq ediff-job-name
'(ediff-windows-wordwise ediff-windows-linewise
))))
273 (ediff-defvar-local ediff-windows-job nil
"")
275 (defmacro ediff-word-mode-job
()
276 (` (memq ediff-job-name
'(ediff-windows-wordwise ediff-regions-wordwise
))))
277 (ediff-defvar-local ediff-word-mode-job nil
"")
279 (defmacro ediff-narrow-job
()
280 (` (memq ediff-job-name
'(ediff-windows-wordwise
281 ediff-regions-wordwise
282 ediff-windows-linewise
283 ediff-regions-linewise
))))
284 (ediff-defvar-local ediff-narrow-job nil
"")
286 ;; Note: ediff-merge-directory-revisions-with-ancestor is not treated as an
287 ;; ancestor metajob, since it behaves differently.
288 (defsubst ediff-ancestor-metajob
(&optional metajob
)
289 (memq (or metajob ediff-metajob-name
)
290 '(ediff-merge-directories-with-ancestor
291 ediff-merge-filegroups-with-ancestor
)))
292 (defsubst ediff-revision-metajob
(&optional metajob
)
293 (memq (or metajob ediff-metajob-name
)
294 '(ediff-directory-revisions
295 ediff-merge-directory-revisions
296 ediff-merge-directory-revisions-with-ancestor
)))
297 (defsubst ediff-patch-metajob
(&optional metajob
)
298 (memq (or metajob ediff-metajob-name
)
299 '(ediff-multifile-patch)))
300 ;; metajob involving only one group of files, such as multipatch or directory
302 (defsubst ediff-one-filegroup-metajob
(&optional metajob
)
303 (or (ediff-revision-metajob metajob
)
304 (ediff-patch-metajob metajob
)
307 (defsubst ediff-collect-diffs-metajob
(&optional metajob
)
308 (memq (or metajob ediff-metajob-name
)
310 ediff-directory-revisions
311 ediff-merge-directories
312 ediff-merge-directories-with-ancestor
313 ediff-merge-directory-revisions
314 ediff-merge-directory-revisions-with-ancestor
317 (defsubst ediff-merge-metajob
(&optional metajob
)
318 (memq (or metajob ediff-metajob-name
)
319 '(ediff-merge-directories
320 ediff-merge-directories-with-ancestor
321 ediff-merge-directory-revisions
322 ediff-merge-directory-revisions-with-ancestor
323 ediff-merge-filegroups-with-ancestor
327 (defsubst ediff-metajob3
(&optional metajob
)
328 (memq (or metajob ediff-metajob-name
)
329 '(ediff-merge-directories-with-ancestor
330 ediff-merge-filegroups-with-ancestor
333 (defsubst ediff-comparison-metajob3
(&optional metajob
)
334 (memq (or metajob ediff-metajob-name
)
335 '(ediff-directories3 ediff-filegroups3
)))
337 ;; with no argument, checks if we are in ediff-control-buffer
338 ;; with argument, checks if we are in ediff-meta-buffer
339 (defun ediff-in-control-buffer-p (&optional meta-buf-p
)
340 (and (boundp 'ediff-control-buffer
)
341 (eq (if meta-buf-p ediff-meta-buffer ediff-control-buffer
)
344 (defsubst ediff-barf-if-not-control-buffer
(&optional meta-buf-p
)
345 (or (ediff-in-control-buffer-p meta-buf-p
)
346 (error "%S: This command runs in Ediff Control Buffer only!"
349 (defgroup ediff-highlighting nil
350 "Hilighting of difference regions in Ediff"
354 (defgroup ediff-merge nil
359 (defgroup ediff-hook nil
360 "Hooks called by Ediff"
366 (defcustom ediff-before-setup-windows-hook nil
367 "*Hooks to run before Ediff sets its window configuration.
368 This can be used to save the previous window config, which can be restored
369 on ediff-quit or ediff-suspend."
372 (defcustom ediff-after-setup-windows-hook nil
373 "*Hooks to run after Ediff sets its window configuration.
374 This can be used to set up control window or icon in a desired place."
377 (defcustom ediff-before-setup-control-frame-hook nil
378 "*Hooks run before setting up the frame to display Ediff Control Panel.
379 Can be used to change control frame parameters to position it where it
383 (defcustom ediff-after-setup-control-frame-hook nil
384 "*Hooks run after setting up the frame to display Ediff Control Panel.
385 Can be used to move the frame where it is desired."
388 (defcustom ediff-startup-hook nil
389 "*Hooks to run in the control buffer after Ediff has been set up."
392 (defcustom ediff-select-hook nil
393 "*Hooks to run after a difference has been selected."
396 (defcustom ediff-unselect-hook nil
397 "*Hooks to run after a difference has been unselected."
400 (defcustom ediff-prepare-buffer-hook nil
401 "*Hooks called after buffers A, B, and C are set up."
404 (defcustom ediff-load-hook nil
405 "*Hook run after Ediff is loaded. Can be used to change defaults."
409 (defcustom ediff-mode-hook nil
410 "*Hook run just after ediff-mode is set up in the control buffer.
411 This is done before any windows or frames are created. One can use it to
412 set local variables that determine how the display looks like."
415 (defcustom ediff-keymap-setup-hook nil
416 "*Hook run just after the default bindings in Ediff keymap are set up."
420 (defcustom ediff-display-help-hook nil
421 "*Hooks run after preparing the help message."
425 (defcustom ediff-suspend-hook
(list 'ediff-default-suspend-function
)
426 "*Hooks to run in the Ediff control buffer when Ediff is suspended."
429 (defcustom ediff-quit-hook
(list 'ediff-cleanup-mess
)
430 "*Hooks to run in the Ediff control buffer after finishing Ediff."
433 (defcustom ediff-cleanup-hook nil
434 "*Hooks to run on exiting Ediff but before killing the control buffer.
435 This is a place to do various cleanups, such as deleting the variant buffers.
436 Ediff provides a function, `ediff-janitor', as one such possible hook."
441 (defconst ediff-KILLED-VITAL-BUFFER
442 "You have killed a vital Ediff buffer---you must leave Ediff now!")
443 (defconst ediff-NO-DIFFERENCES
444 "Sorry, comparison of identical variants is not what I am made for...")
445 (defconst ediff-BAD-DIFF-NUMBER
446 ;; %S stands for this-command, %d - diff number, %d - max diff
447 "%S: Bad diff region number, %d. Valid numbers are 1 to %d")
448 (defconst ediff-BAD-INFO
(format "
449 *** The Info file for Ediff, a part of the standard distribution
450 *** of %sEmacs, does not seem to be properly installed.
452 *** Please contact your system administrator. "
453 (if ediff-xemacs-p
"X" "")))
455 ;; Selective browsing
457 (ediff-defvar-local ediff-skip-diff-region-function
'ediff-show-all-diffs
458 "Function that determines the next/previous diff region to show.
459 Should return t for regions to be ignored and nil otherwise.
460 This function gets a region number as an argument. The region number
461 is the one used internally by Ediff. It is 1 less than the number seen
464 (ediff-defvar-local ediff-hide-regexp-matches-function
465 'ediff-hide-regexp-matches
466 "Function to use in determining which regions to hide.
467 See the documentation string of `ediff-hide-regexp-matches' for details.")
468 (ediff-defvar-local ediff-focus-on-regexp-matches-function
469 'ediff-focus-on-regexp-matches
470 "Function to use in determining which regions to focus on.
471 See the documentation string of `ediff-focus-on-regexp-matches' for details.")
473 ;; Regexp that determines buf A regions to focus on when skipping to diff
474 (ediff-defvar-local ediff-regexp-focus-A
"" "")
475 ;; Regexp that determines buf B regions to focus on when skipping to diff
476 (ediff-defvar-local ediff-regexp-focus-B
"" "")
477 ;; Regexp that determines buf C regions to focus on when skipping to diff
478 (ediff-defvar-local ediff-regexp-focus-C
"" "")
479 ;; connective that determines whether to focus regions that match both or
480 ;; one of the regexps
481 (ediff-defvar-local ediff-focus-regexp-connective
'and
"")
483 ;; Regexp that determines buf A regions to ignore when skipping to diff
484 (ediff-defvar-local ediff-regexp-hide-A
"" "")
485 ;; Regexp that determines buf B regions to ignore when skipping to diff
486 (ediff-defvar-local ediff-regexp-hide-B
"" "")
487 ;; Regexp that determines buf C regions to ignore when skipping to diff
488 (ediff-defvar-local ediff-regexp-hide-C
"" "")
489 ;; connective that determines whether to hide regions that match both or
490 ;; one of the regexps
491 (ediff-defvar-local ediff-hide-regexp-connective
'and
"")
494 ;;; Copying difference regions between buffers.
496 ;; A list of killed diffs.
497 ;; A diff is saved here if it is replaced by a diff
498 ;; from another buffer. This alist has the form:
499 ;; \((num (buff-object . diff) (buff-object . diff) (buff-object . diff)) ...),
500 ;; where some buffer-objects may be missing.
501 (ediff-defvar-local ediff-killed-diffs-alist nil
"")
505 (defcustom ediff-before-flag-bol
(if ediff-xemacs-p
(make-glyph "->>") "->>")
506 "*Flag placed before a highlighted block of differences, if block starts at beginning of a line."
508 :tag
"Region before-flag at beginning of line"
511 (defcustom ediff-after-flag-eol
(if ediff-xemacs-p
(make-glyph "<<-") "<<-")
512 "*Flag placed after a highlighted block of differences, if block ends at end of a line."
514 :tag
"Region after-flag at end of line"
517 (defcustom ediff-before-flag-mol
(if ediff-xemacs-p
(make-glyph "->>") "->>")
518 "*Flag placed before a highlighted block of differences, if block starts in mid-line."
520 :tag
"Region before-flag in the middle of line"
522 (defcustom ediff-after-flag-mol
(if ediff-xemacs-p
(make-glyph "<<-") "<<-")
523 "*Flag placed after a highlighted block of differences, if block ends in mid-line."
525 :tag
"Region after-flag in the middle of line"
529 (ediff-defvar-local ediff-use-faces t
530 "If t, differences are highlighted using faces, if device supports faces.
531 If nil, differences are highlighted using ASCII flags, ediff-before-flag
532 and ediff-after-flag. On a non-window system, differences are always
533 highlighted using ASCII flags.
534 This variable can be set either in .emacs or toggled interactively.
535 Use `setq-default' if setting it in .emacs")
537 ;; this indicates that diff regions are word-size, so fine diffs are
538 ;; permanently nixed; used in ediff-windows-wordwise and ediff-regions-wordwise
539 (ediff-defvar-local ediff-word-mode nil
"")
540 ;; Name of the job (ediff-files, ediff-windows, etc.)
541 (ediff-defvar-local ediff-job-name nil
"")
543 ;; Narrowing and ediff-region/windows support
544 ;; This is a list (overlay-A overlay-B overlay-C)
545 ;; If set, Ediff compares only those parts of buffers A/B/C that lie within
546 ;; the bounds of these overlays.
547 (ediff-defvar-local ediff-narrow-bounds nil
"")
549 ;; List (overlay-A overlay-B overlay-C), where each overlay spans the
550 ;; entire corresponding buffer.
551 (ediff-defvar-local ediff-wide-bounds nil
"")
553 ;; Current visibility boundaries in buffers A, B, and C.
554 ;; This is also a list of overlays. When the user toggles narrow/widen,
555 ;; this list changes from ediff-wide-bounds to ediff-narrow-bounds.
557 (ediff-defvar-local ediff-visible-bounds nil
"")
559 (ediff-defvar-local ediff-start-narrowed t
560 "Non-nil means start narrowed, if doing ediff-windows-* or ediff-regions-*")
561 (ediff-defvar-local ediff-quit-widened t
562 "*Non-nil means: when finished, Ediff widens buffers A/B.
563 Actually, Ediff restores the scope of visibility that existed at startup.")
565 (defcustom ediff-keep-variants t
566 "*Nil means that non-modified variant buffers should be removed at the end of the session after some interrogation.
567 Supplying a prefix argument to the quit command `q' temporarily reverses the
568 meaning of this variable."
572 (ediff-defvar-local ediff-highlight-all-diffs t
573 "If nil, only the selected differences are highlighted.
574 This variable can be set either in .emacs or toggled interactively, using
575 ediff-toggle-hilit. Use `setq-default' to set it.")
577 ;; A var local to each control panel buffer. Indicates highlighting style
578 ;; in effect for this buffer: `face', `ascii', nil -- temporarily
579 ;; unhighlighted, `off' -- turned off \(on a dumb terminal only\).
580 (ediff-defvar-local ediff-highlighting-style nil
"")
583 ;; The suffix of the control buffer name.
584 (ediff-defvar-local ediff-control-buffer-suffix nil
"")
585 ;; Same as ediff-control-buffer-suffix, but without <,>.
586 ;; It's a number rather than string.
587 (ediff-defvar-local ediff-control-buffer-number nil
"")
590 ;; The original values of ediff-protected-variables for buffer A
591 (ediff-defvar-local ediff-buffer-values-orig-A nil
"")
592 ;; The original values of ediff-protected-variables for buffer B
593 (ediff-defvar-local ediff-buffer-values-orig-B nil
"")
594 ;; The original values of ediff-protected-variables for buffer C
595 (ediff-defvar-local ediff-buffer-values-orig-C nil
"")
596 ;; The original values of ediff-protected-variables for buffer Ancestor
597 (ediff-defvar-local ediff-buffer-values-orig-Ancestor nil
"")
599 ;; association between buff-type and ediff-buffer-values-orig-*
600 (defconst ediff-buffer-values-orig-alist
601 '((A . ediff-buffer-values-orig-A
)
602 (B . ediff-buffer-values-orig-B
)
603 (C . ediff-buffer-values-orig-C
)
604 (Ancestor . ediff-buffer-values-orig-Ancestor
)))
606 ;; Buffer-local variables to be saved then restored during Ediff sessions
607 (defconst ediff-protected-variables
'(
611 ;; Vector of differences between the variants. Each difference is
612 ;; represented by a vector of two overlays plus a vector of fine diffs,
613 ;; plus a no-fine-diffs flag. The first overlay spans the
614 ;; difference region in the A buffer and the second overlays the diff in
615 ;; the B buffer. If a difference section is empty, the corresponding
616 ;; overlay's endpoints coincide.
618 ;; The precise form of a difference vector for one buffer is:
619 ;; [diff diff diff ...]
620 ;; where each diff has the form:
621 ;; [diff-overlay fine-diff-vector no-fine-diffs-flag state-of-difference]
622 ;; fine-diff-vector is a vector [fine-diff-overlay fine-diff-overlay ...]
623 ;; no-fine-diffs-flag says if there are fine differences.
624 ;; state-of-difference is A, B, C, or nil, indicating which buffer is
625 ;; different from the other two (used only in 3-way jobs.
626 (ediff-defvar-local ediff-difference-vector-A nil
"")
627 (ediff-defvar-local ediff-difference-vector-B nil
"")
628 (ediff-defvar-local ediff-difference-vector-C nil
"")
629 (ediff-defvar-local ediff-difference-vector-Ancestor nil
"")
630 ;; A-list of diff vector types associated with buffer types
631 (defconst ediff-difference-vector-alist
632 '((A . ediff-difference-vector-A
)
633 (B . ediff-difference-vector-B
)
634 (C . ediff-difference-vector-C
)
635 (Ancestor . ediff-difference-vector-Ancestor
)))
637 ;; [ status status status ...]
638 ;; Each status: [state-of-merge state-of-ancestor]
639 ;; state-of-merge is default-A, default-B, prefer-A, or prefer-B. It
640 ;; indicates the way a diff region was created in buffer C.
641 ;; state-of-ancestor says if the corresponding region in ancestor buffer is
643 (ediff-defvar-local ediff-state-of-merge nil
"")
645 ;; The difference that is currently selected.
646 (ediff-defvar-local ediff-current-difference -
1 "")
647 ;; Number of differences found.
648 (ediff-defvar-local ediff-number-of-differences nil
"")
650 ;; Buffer containing the output of diff, which is used by Ediff to step
652 (ediff-defvar-local ediff-diff-buffer nil
"")
653 ;; Like ediff-diff-buffer, but contains context diff. It is not used by
654 ;; Ediff, but it is saved in a file, if user requests so.
655 (ediff-defvar-local ediff-custom-diff-buffer nil
"")
656 ;; Buffer used for diff-style fine differences between regions.
657 (ediff-defvar-local ediff-fine-diff-buffer nil
"")
658 ;; Temporary buffer used for computing fine differences.
659 (defconst ediff-tmp-buffer
" *ediff-tmp*" "")
660 ;; Buffer used for messages
661 (defconst ediff-msg-buffer
" *ediff-message*" "")
662 ;; Buffer containing the output of diff when diff returns errors.
663 (ediff-defvar-local ediff-error-buffer nil
"")
664 ;; Buffer to display debug info
665 (ediff-defvar-local ediff-debug-buffer
"*ediff-debug*" "")
667 ;; List of ediff control panels associated with each buffer A/B/C/Ancestor.
668 ;; Not used any more, but may be needed in the future.
669 (ediff-defvar-local ediff-this-buffer-ediff-sessions nil
"")
671 ;; to be deleted in due time
672 ;; List of difference overlays disturbed by working with the current diff.
673 (defvar ediff-disturbed-overlays nil
"")
675 ;; Priority of non-selected overlays.
676 (defvar ediff-shadow-overlay-priority
100 "")
678 (defcustom ediff-version-control-package
'vc
679 "Version control package used.
680 Currently, Ediff supports vc.el, rcs.el, pcl-cvs.el, and generic-sc.el. The
681 standard Emacs interface to RCS, CVS, SCCS, etc., is vc.el. However, some
682 people find the other two packages more convenient. Set this variable to the
683 appropriate symbol: `rcs', `pcl-cvs', or `generic-sc' if you so desire."
690 (fset 'ediff-read-event
(symbol-function 'next-command-event
))
691 (fset 'ediff-overlayp
(symbol-function 'extentp
))
692 (fset 'ediff-make-overlay
(symbol-function 'make-extent
))
693 (fset 'ediff-delete-overlay
(symbol-function 'delete-extent
)))
694 (fset 'ediff-read-event
(symbol-function 'read-event
))
695 (fset 'ediff-overlayp
(symbol-function 'overlayp
))
696 (fset 'ediff-make-overlay
(symbol-function 'make-overlay
))
697 (fset 'ediff-delete-overlay
(symbol-function 'delete-overlay
)))
699 ;; Check the current version against the major and minor version numbers
700 ;; using op: cur-vers op major.minor If emacs-major-version or
701 ;; emacs-minor-version are not defined, we assume that the current version
702 ;; is hopelessly outdated. We assume that emacs-major-version and
703 ;; emacs-minor-version are defined. Otherwise, for Emacs/XEmacs 19, if the
704 ;; current minor version is < 10 (xemacs) or < 23 (emacs) the return value
705 ;; will be nil (when op is =, >, or >=) and t (when op is <, <=), which may be
706 ;; incorrect. However, this gives correct result in our cases, since we are
707 ;; testing for sufficiently high Emacs versions.
708 (defun ediff-check-version (op major minor
&optional type-of-emacs
)
709 (if (and (boundp 'emacs-major-version
) (boundp 'emacs-minor-version
))
710 (and (cond ((eq type-of-emacs
'xemacs
) ediff-xemacs-p
)
711 ((eq type-of-emacs
'emacs
) ediff-emacs-p
)
713 (cond ((eq op
'=) (and (= emacs-minor-version minor
)
714 (= emacs-major-version major
)))
715 ((memq op
'(> >= < <=))
716 (and (or (funcall op emacs-major-version major
)
717 (= emacs-major-version major
))
718 (if (= emacs-major-version major
)
719 (funcall op emacs-minor-version minor
)
722 (error "%S: Invalid op in ediff-check-version" op
))))
723 (cond ((memq op
'(= > >=)) nil
)
724 ((memq op
'(< <=)) t
))))
728 ;; A fix for NeXT Step
729 ;; Should probably be eliminated in later versions.
730 (if (and (ediff-window-display-p) (eq (ediff-device-type) 'ns
))
732 (fset 'x-display-color-p
(symbol-function 'ns-display-color-p
))
733 (fset 'x-color-defined-p
(symbol-function 'ns-color-defined-p
))
734 (fset 'x-display-pixel-height
(symbol-function 'ns-display-pixel-height
))
735 (fset 'x-display-pixel-width
(symbol-function 'ns-display-pixel-width
))
739 (defsubst ediff-color-display-p
()
742 (eq (device-class (selected-device)) 'color
)))
745 (if (ediff-has-face-support-p)
748 (fset 'ediff-valid-color-p
(symbol-function 'valid-color-name-p
))
749 (fset 'ediff-get-face
(symbol-function 'get-face
)))
750 ;; Temporary fix for OS/2 port of Emacs
751 ;; pm-win.el in PM-Emacs should be fixed.
752 (if (eq (ediff-device-type) 'pm
)
753 (fset 'ediff-valid-color-p
754 (function (lambda (color) (assoc color pm-color-alist
))))
755 (fset 'ediff-valid-color-p
(symbol-function 'x-color-defined-p
)))
756 (fset 'ediff-get-face
(symbol-function 'internal-get-face
))))
758 (if (ediff-window-display-p)
761 (fset 'ediff-display-pixel-width
762 (symbol-function 'device-pixel-width
))
763 (fset 'ediff-display-pixel-height
764 (symbol-function 'device-pixel-height
)))
765 (fset 'ediff-display-pixel-width
766 (symbol-function 'x-display-pixel-width
))
767 (fset 'ediff-display-pixel-height
768 (symbol-function 'x-display-pixel-height
))))
770 ;; A-list of current-diff-overlay symbols asssociated with buf types
771 (defconst ediff-current-diff-overlay-alist
772 '((A . ediff-current-diff-overlay-A
)
773 (B . ediff-current-diff-overlay-B
)
774 (C . ediff-current-diff-overlay-C
)
775 (Ancestor . ediff-current-diff-overlay-Ancestor
)))
777 ;; A-list of current-diff-face-* symbols asssociated with buf types
778 (defconst ediff-current-diff-face-alist
779 '((A . ediff-current-diff-face-A
)
780 (B . ediff-current-diff-face-B
)
781 (C . ediff-current-diff-face-C
)
782 (Ancestor . ediff-current-diff-face-Ancestor
)))
785 (defun ediff-make-current-diff-overlay (type)
786 (if (ediff-has-face-support-p)
787 (let ((overlay (ediff-get-symbol-from-alist
788 type ediff-current-diff-overlay-alist
))
789 (buffer (ediff-get-buffer type
))
792 (ediff-get-symbol-from-alist
793 type ediff-current-diff-face-alist
)))))
795 (ediff-make-bullet-proof-overlay (point-max) (point-max) buffer
))
796 (ediff-set-overlay-face (symbol-value overlay
) face
)
797 (ediff-overlay-put (symbol-value overlay
) 'ediff ediff-control-buffer
))
800 (defun ediff-set-overlay-face (extent face
)
801 (ediff-overlay-put extent
'face face
)
802 (ediff-overlay-put extent
'help-echo
'ediff-region-help-echo
))
804 ;; This does nothing in Emacs, since overlays there have no help-echo property
805 (defun ediff-region-help-echo (extent)
806 (let ((is-current (ediff-overlay-get extent
'ediff
))
807 (face (ediff-overlay-get extent
'face
))
808 (diff-num (ediff-overlay-get extent
'ediff-diff-num
))
811 ;; This happens only for refinement overlays
812 (setq face-help
(and face
(get face
'ediff-help-echo
)))
814 (cond ((and is-current diff-num
) ; current diff region
815 (format "Difference region %S -- current" (1+ diff-num
)))
816 (face-help) ; refinement of current diff region
817 (diff-num ; non-current
818 (format "Difference region %S -- non-current" (1+ diff-num
)))
822 ;;(defun ediff-set-face (ground face color)
823 ;; "Set face foreground/background."
824 ;; (if (ediff-has-face-support-p)
825 ;; (if (ediff-valid-color-p color)
826 ;; (if (eq ground 'foreground)
827 ;; (set-face-foreground face color)
828 ;; (set-face-background face color))
830 ;; '(ediff-current-diff-face-A
831 ;; ediff-current-diff-face-B
832 ;; ediff-current-diff-face-C
833 ;; ediff-current-diff-face-Ancestor))
834 ;; (copy-face 'highlight face))
836 ;; '(ediff-fine-diff-face-A
837 ;; ediff-fine-diff-face-B
838 ;; ediff-fine-diff-face-C
839 ;; ediff-fine-diff-face-Ancestor))
840 ;; (copy-face 'secondary-selection face)
841 ;; (set-face-underline-p face t))
843 ;; '(ediff-even-diff-face-A
844 ;; ediff-odd-diff-face-A
845 ;; ediff-even-diff-face-B ediff-odd-diff-face-B
846 ;; ediff-even-diff-face-C ediff-odd-diff-face-C
847 ;; ediff-even-diff-face-Ancestor
848 ;; ediff-odd-diff-face-Ancestor))
849 ;; (copy-face 'secondary-selection face))))
852 (defun ediff-set-face-pixmap (face pixmap
)
853 "Set face pixmap on a monochrome display."
854 (if (and (ediff-window-display-p) (not (ediff-color-display-p)))
856 (set-face-background-pixmap face pixmap
)
858 (message "Pixmap not found for %S: %s" (face-name face
) pixmap
)
861 (defun ediff-hide-face (face)
862 (if (and (ediff-has-face-support-p) ediff-emacs-p
)
863 (add-to-list 'facemenu-unlisted-faces face
)))
866 ;;(defvar ediff-current-diff-face-A
867 ;; (if (ediff-has-face-support-p)
869 ;; (make-face 'ediff-current-diff-face-A)
870 ;; (or (face-differs-from-default-p 'ediff-current-diff-face-A)
871 ;; (cond ((ediff-color-display-p)
873 ;; 'foreground 'ediff-current-diff-face-A "firebrick")
875 ;; 'background 'ediff-current-diff-face-A "pale green"))
877 ;; (if ediff-xemacs-p
878 ;; (copy-face 'modeline 'ediff-current-diff-face-A)
879 ;; (copy-face 'highlight 'ediff-current-diff-face-A))
881 ;; 'ediff-current-diff-face-A))
882 ;; "Face for highlighting the selected difference in buffer A.")
884 (defface ediff-current-diff-face-A
885 '((((class color
)) (:foreground
"firebrick" :background
"pale green"))
886 (t (:inverse-video t
)))
887 "Face for highlighting the selected difference in buffer A."
888 :group
'ediff-highlighting
)
889 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
890 ;; this variable is set to nil, then again to the appropriate face.
891 (defvar ediff-current-diff-face-A
'ediff-current-diff-face-A
892 "Face for highlighting the selected difference in buffer A.
893 DO NOT CHANGE this variable. Instead, use the customization
894 widget to customize the actual face object `ediff-current-diff-face-A'
895 this variable represents.")
896 (ediff-hide-face 'ediff-current-diff-face-A
)
897 ;; Until custom.el for XEmacs starts supporting :inverse-video we do this.
898 ;; This means that some user customization may be trashed.
899 (if (and ediff-xemacs-p
900 (ediff-has-face-support-p)
901 (not (ediff-color-display-p)))
902 (copy-face 'modeline
'ediff-current-diff-face-A
))
906 ;;(defvar ediff-current-diff-face-B
907 ;; (if (ediff-has-face-support-p)
909 ;; (make-face 'ediff-current-diff-face-B)
910 ;; (or (face-differs-from-default-p 'ediff-current-diff-face-B)
911 ;; (cond ((ediff-color-display-p)
913 ;; 'foreground 'ediff-current-diff-face-B "DarkOrchid")
915 ;; 'background 'ediff-current-diff-face-B "Yellow"))
917 ;; (if ediff-xemacs-p
918 ;; (copy-face 'modeline 'ediff-current-diff-face-B)
919 ;; (copy-face 'highlight 'ediff-current-diff-face-B))
921 ;; 'ediff-current-diff-face-B))
922 ;; "Face for highlighting the selected difference in buffer B.")
924 (defface ediff-current-diff-face-B
925 '((((class color
)) (:foreground
"DarkOrchid" :background
"Yellow"))
926 (t (:inverse-video t
)))
927 "Face for highlighting the selected difference in buffer B."
928 :group
'ediff-highlighting
)
929 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
930 ;; this variable is set to nil, then again to the appropriate face.
931 (defvar ediff-current-diff-face-B
'ediff-current-diff-face-B
932 "Face for highlighting the selected difference in buffer B.
933 this variable. Instead, use the customization
934 widget to customize the actual face `ediff-current-diff-face-B'
935 this variable represents.")
936 (ediff-hide-face 'ediff-current-diff-face-B
)
937 ;; Until custom.el for XEmacs starts supporting :inverse-video we do this.
938 ;; This means that some user customization may be trashed.
939 (if (and ediff-xemacs-p
940 (ediff-has-face-support-p)
941 (not (ediff-color-display-p)))
942 (copy-face 'modeline
'ediff-current-diff-face-B
))
944 ;;(defvar ediff-current-diff-face-C
945 ;; (if (ediff-has-face-support-p)
947 ;; (make-face 'ediff-current-diff-face-C)
948 ;; (or (face-differs-from-default-p 'ediff-current-diff-face-C)
949 ;; (cond ((ediff-color-display-p)
951 ;; 'foreground 'ediff-current-diff-face-C "Navy")
953 ;; 'background 'ediff-current-diff-face-C "Pink"))
955 ;; (if ediff-xemacs-p
956 ;; (copy-face 'modeline 'ediff-current-diff-face-C)
957 ;; (copy-face 'highlight 'ediff-current-diff-face-C))
959 ;; 'ediff-current-diff-face-C))
960 ;; "Face for highlighting the selected difference in buffer C.")
962 (defface ediff-current-diff-face-C
963 '((((class color
)) (:foreground
"Navy" :background
"Pink"))
964 (t (:inverse-video t
)))
965 "Face for highlighting the selected difference in buffer C."
966 :group
'ediff-highlighting
)
967 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
968 ;; this variable is set to nil, then again to the appropriate face.
969 (defvar ediff-current-diff-face-C
'ediff-current-diff-face-C
970 "Face for highlighting the selected difference in buffer C.
971 DO NOT CHANGE this variable. Instead, use the customization
972 widget to customize the actual face object `ediff-current-diff-face-C'
973 this variable represents.")
974 (ediff-hide-face 'ediff-current-diff-face-C
)
975 ;; Until custom.el for XEmacs starts supporting :inverse-video we do this.
976 ;; This means that some user customization may be trashed.
977 (if (and ediff-xemacs-p
978 (ediff-has-face-support-p)
979 (not (ediff-color-display-p)))
980 (copy-face 'modeline
'ediff-current-diff-face-C
))
982 ;;(defvar ediff-current-diff-face-Ancestor
983 ;; (if (ediff-has-face-support-p)
985 ;; (make-face 'ediff-current-diff-face-Ancestor)
986 ;; (or (face-differs-from-default-p 'ediff-current-diff-face-Ancestor)
988 ;; 'ediff-current-diff-face-C 'ediff-current-diff-face-Ancestor))
989 ;; 'ediff-current-diff-face-Ancestor))
990 ;; "Face for highlighting the selected difference in the ancestor buffer.")
992 (defface ediff-current-diff-face-Ancestor
993 '((((class color
)) (:foreground
"Black" :background
"VioletRed"))
994 (t (:inverse-video t
)))
995 "Face for highlighting the selected difference in buffer Ancestor."
996 :group
'ediff-highlighting
)
997 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
998 ;; this variable is set to nil, then again to the appropriate face.
999 (defvar ediff-current-diff-face-Ancestor
'ediff-current-diff-face-Ancestor
1000 "Face for highlighting the selected difference in buffer Ancestor.
1001 DO NOT CHANGE this variable. Instead, use the customization
1002 widget to customize the actual face object `ediff-current-diff-face-Ancestor'
1003 this variable represents.")
1004 (ediff-hide-face 'ediff-current-diff-face-Ancestor
)
1005 ;; Until custom.el for XEmacs starts supporting :inverse-video we do this.
1006 ;; This means that some user customization may be trashed.
1007 (if (and ediff-xemacs-p
1008 (ediff-has-face-support-p)
1009 (not (ediff-color-display-p)))
1010 (copy-face 'modeline
'ediff-current-diff-face-Ancestor
))
1012 ;;(defvar ediff-fine-diff-pixmap "gray3"
1013 ;; "Pixmap to use for highlighting fine differences.")
1014 ;;(defvar ediff-odd-diff-pixmap "gray1"
1015 ;; "Pixmap to use for highlighting odd differences.")
1016 ;;(defvar ediff-even-diff-pixmap "Stipple"
1017 ;; "Pixmap to use for highlighting even differences.")
1019 ;;(defvar ediff-fine-diff-face-A
1020 ;; (if (ediff-has-face-support-p)
1022 ;; (make-face 'ediff-fine-diff-face-A)
1023 ;; (or (face-differs-from-default-p 'ediff-fine-diff-face-A)
1024 ;; (cond ((ediff-color-display-p)
1025 ;; (ediff-set-face 'foreground 'ediff-fine-diff-face-A
1027 ;; (ediff-set-face 'background 'ediff-fine-diff-face-A
1030 ;; (set-face-underline-p 'ediff-fine-diff-face-A t)
1031 ;; (ediff-set-face-pixmap 'ediff-fine-diff-face-A
1032 ;; ediff-fine-diff-pixmap)
1034 ;; 'ediff-fine-diff-face-A))
1035 ;; "Face for highlighting the refinement of the selected diff in buffer A.")
1038 (defface ediff-fine-diff-face-A
1039 '((((class color
)) (:foreground
"Navy" :background
"sky blue"))
1040 (t (:underline t
:stipple
"gray3")))
1041 "Face for highlighting the refinement of the selected diff in buffer A."
1042 :group
'ediff-highlighting
)
1043 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1044 ;; this variable is set to nil, then again to the appropriate face.
1045 (defvar ediff-fine-diff-face-A
'ediff-fine-diff-face-A
1046 "Face for highlighting the fine differences in buffer A.
1047 DO NOT CHANGE this variable. Instead, use the customization
1048 widget to customize the actual face object `ediff-fine-diff-face-A'
1049 this variable represents.")
1050 (ediff-hide-face 'ediff-fine-diff-face-A
)
1051 ;; Until custom.el for XEmacs starts supporting :stipple we do this.
1052 ;; This means that some use customization may be trashed.
1053 (if (and ediff-xemacs-p
1054 (ediff-has-face-support-p)
1055 (not (ediff-color-display-p)))
1056 (ediff-set-face-pixmap 'ediff-fine-diff-face-A
"gray3"))
1058 ;;(defvar ediff-fine-diff-face-B
1059 ;; (if (ediff-has-face-support-p)
1061 ;; (make-face 'ediff-fine-diff-face-B)
1062 ;; (or (face-differs-from-default-p 'ediff-fine-diff-face-B)
1063 ;; (cond ((ediff-color-display-p)
1064 ;; (ediff-set-face 'foreground 'ediff-fine-diff-face-B "Black")
1065 ;; (ediff-set-face 'background 'ediff-fine-diff-face-B "cyan"))
1067 ;; (set-face-underline-p 'ediff-fine-diff-face-B t)
1068 ;; (ediff-set-face-pixmap 'ediff-fine-diff-face-B
1069 ;; ediff-fine-diff-pixmap)
1071 ;; 'ediff-fine-diff-face-B))
1072 ;; "Face for highlighting the refinement of the selected diff in buffer B.")
1074 (defface ediff-fine-diff-face-B
1075 '((((class color
)) (:foreground
"Black" :background
"cyan"))
1076 (t (:underline t
:stipple
"gray3")))
1077 "Face for highlighting the refinement of the selected diff in buffer B."
1078 :group
'ediff-highlighting
)
1079 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1080 ;; this variable is set to nil, then again to the appropriate face.
1081 (defvar ediff-fine-diff-face-B
'ediff-fine-diff-face-B
1082 "Face for highlighting the fine differences in buffer B.
1083 DO NOT CHANGE this variable. Instead, use the customization
1084 widget to customize the actual face object `ediff-fine-diff-face-B'
1085 this variable represents.")
1086 (ediff-hide-face 'ediff-fine-diff-face-B
)
1087 ;; Until custom.el for XEmacs starts supporting :stipple we do this.
1088 ;; This means that some use customization may be trashed.
1089 (if (and ediff-xemacs-p
1090 (ediff-has-face-support-p)
1091 (not (ediff-color-display-p)))
1092 (ediff-set-face-pixmap 'ediff-fine-diff-face-B
"gray3"))
1094 ;;(defvar ediff-fine-diff-face-C
1095 ;; (if (ediff-has-face-support-p)
1097 ;; (make-face 'ediff-fine-diff-face-C)
1098 ;; (or (face-differs-from-default-p 'ediff-fine-diff-face-C)
1099 ;; (cond ((ediff-color-display-p)
1100 ;; (ediff-set-face 'foreground 'ediff-fine-diff-face-C "black")
1102 ;; 'background 'ediff-fine-diff-face-C "Turquoise"))
1104 ;; (set-face-underline-p 'ediff-fine-diff-face-C t)
1105 ;; (ediff-set-face-pixmap 'ediff-fine-diff-face-C
1106 ;; ediff-fine-diff-pixmap)
1108 ;; 'ediff-fine-diff-face-C))
1109 ;; "Face for highlighting the refinement of the selected diff in buffer C.")
1111 (defface ediff-fine-diff-face-C
1112 '((((class color
)) (:foreground
"Black" :background
"Turquoise"))
1113 (t (:underline t
:stipple
"gray3")))
1114 "Face for highlighting the refinement of the selected diff in buffer C."
1115 :group
'ediff-highlighting
)
1116 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1117 ;; this variable is set to nil, then again to the appropriate face.
1118 (defvar ediff-fine-diff-face-C
'ediff-fine-diff-face-C
1119 "Face for highlighting the fine differences in buffer C.
1120 DO NOT CHANGE this variable. Instead, use the customization
1121 widget to customize the actual face object `ediff-fine-diff-face-C'
1122 this variable represents.")
1123 (ediff-hide-face 'ediff-fine-diff-face-C
)
1124 ;; Until custom.el for XEmacs starts supporting :stipple we do this.
1125 ;; This means that some use customization may be trashed.
1126 (if (and ediff-xemacs-p
1127 (ediff-has-face-support-p)
1128 (not (ediff-color-display-p)))
1129 (ediff-set-face-pixmap 'ediff-fine-diff-face-C
"gray3"))
1131 ;;(defvar ediff-fine-diff-face-Ancestor
1132 ;; (if (ediff-has-face-support-p)
1134 ;; (make-face 'ediff-fine-diff-face-Ancestor)
1135 ;; (ediff-hide-face 'ediff-fine-diff-face-Ancestor)
1136 ;; (or (face-differs-from-default-p 'ediff-fine-diff-face-Ancestor)
1139 ;; 'ediff-fine-diff-face-C 'ediff-fine-diff-face-Ancestor)
1140 ;; (ediff-set-face-pixmap 'ediff-fine-diff-face-Ancestor
1141 ;; ediff-fine-diff-pixmap))
1143 ;; "Face highlighting refinements of the selected diff in ancestor buffer.
1144 ;;Presently, this is not used, as difference regions are not refined in the
1145 ;;ancestor buffer.")
1147 (defface ediff-fine-diff-face-Ancestor
1148 '((((class color
)) (:foreground
"Black" :background
"Green"))
1149 (t (:underline t
:stipple
"gray3")))
1150 "Face for highlighting the refinement of the selected diff in the ancestor buffer.
1151 At present, this face is not used and no fine differences are computed for the
1153 :group
'ediff-highlighting
)
1154 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1155 ;; this variable is set to nil, then again to the appropriate face.
1156 (defvar ediff-fine-diff-face-Ancestor
'ediff-fine-diff-face-Ancestor
1157 "Face for highlighting the fine differences in buffer Ancestor.
1158 DO NOT CHANGE this variable. Instead, use the customization
1159 widget to customize the actual face object `ediff-fine-diff-face-Ancestor'
1160 this variable represents.")
1161 (ediff-hide-face 'ediff-fine-diff-face-Ancestor
)
1162 ;; Until custom.el for XEmacs starts supporting :stipple we do this.
1163 ;; This means that some use customization may be trashed.
1164 (if (and ediff-xemacs-p
1165 (ediff-has-face-support-p)
1166 (not (ediff-color-display-p)))
1167 (ediff-set-face-pixmap
1168 'ediff-fine-diff-face-Ancestor
"gray3"))
1170 ;;(defvar ediff-even-diff-face-A
1171 ;; (if (ediff-has-face-support-p)
1173 ;; (make-face 'ediff-even-diff-face-A)
1174 ;; (or (face-differs-from-default-p 'ediff-even-diff-face-A)
1175 ;; (cond ((ediff-color-display-p)
1177 ;; 'foreground 'ediff-even-diff-face-A "black")
1179 ;; 'background 'ediff-even-diff-face-A "light grey"))
1181 ;; (copy-face 'italic 'ediff-even-diff-face-A)
1182 ;; (ediff-set-face-pixmap 'ediff-even-diff-face-A
1183 ;; ediff-even-diff-pixmap)
1185 ;; 'ediff-even-diff-face-A))
1186 ;; "Face used for highlighting even-numbered differences in buffer A.")
1188 (defface ediff-even-diff-face-A
1189 '((((class color
)) (:foreground
"Black" :background
"light grey"))
1190 (t (:italic t
:stipple
"Stipple")))
1191 "Face for highlighting even-numbered non-current differences in buffer A."
1192 :group
'ediff-highlighting
)
1193 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1194 ;; this variable is set to nil, then again to the appropriate face.
1195 (defvar ediff-even-diff-face-A
'ediff-even-diff-face-A
1196 "Face for highlighting even-numbered non-current differences in buffer A.
1197 DO NOT CHANGE this variable. Instead, use the customization
1198 widget to customize the actual face object `ediff-even-diff-face-A'
1199 this variable represents.")
1200 (ediff-hide-face 'ediff-even-diff-face-A
)
1201 ;; Until custom.el for XEmacs starts supporting :stipple we do this.
1202 ;; This means that some use customization may be trashed.
1203 (if (and ediff-xemacs-p
1204 (ediff-has-face-support-p)
1205 (not (ediff-color-display-p)))
1206 (ediff-set-face-pixmap 'ediff-even-diff-face-A
"Stipple"))
1208 ;;(defvar ediff-even-diff-face-B
1209 ;; (if (ediff-has-face-support-p)
1211 ;; (make-face 'ediff-even-diff-face-B)
1212 ;; (or (face-differs-from-default-p 'ediff-even-diff-face-B)
1213 ;; (cond ((ediff-color-display-p)
1215 ;; 'foreground 'ediff-even-diff-face-B "White")
1217 ;; 'background 'ediff-even-diff-face-B "Gray"))
1219 ;; (copy-face 'italic 'ediff-even-diff-face-B)
1220 ;; (ediff-set-face-pixmap 'ediff-even-diff-face-B
1221 ;; ediff-even-diff-pixmap)
1223 ;; 'ediff-even-diff-face-B))
1224 ;; "Face used for highlighting even-numbered differences in buffer B.")
1226 (defface ediff-even-diff-face-B
1227 '((((class color
)) (:foreground
"White" :background
"Grey"))
1228 (t (:italic t
:stipple
"Stipple")))
1229 "Face for highlighting even-numbered non-current differences in buffer B."
1230 :group
'ediff-highlighting
)
1231 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1232 ;; this variable is set to nil, then again to the appropriate face.
1233 (defvar ediff-even-diff-face-B
'ediff-even-diff-face-B
1234 "Face for highlighting even-numbered non-current differences in buffer B.
1235 DO NOT CHANGE this variable. Instead, use the customization
1236 widget to customize the actual face object `ediff-even-diff-face-B'
1237 this variable represents.")
1238 (ediff-hide-face 'ediff-even-diff-face-B
)
1239 ;; Until custom.el for XEmacs starts supporting :stipple we do this.
1240 ;; This means that some use customization may be trashed.
1241 (if (and ediff-xemacs-p
1242 (ediff-has-face-support-p)
1243 (not (ediff-color-display-p)))
1244 (ediff-set-face-pixmap 'ediff-even-diff-face-B
"Stipple"))
1246 ;;(defvar ediff-even-diff-face-C
1247 ;; (if (ediff-has-face-support-p)
1249 ;; (make-face 'ediff-even-diff-face-C)
1250 ;; (ediff-hide-face 'ediff-even-diff-face-C)
1251 ;; (or (face-differs-from-default-p 'ediff-even-diff-face-C)
1253 ;; (copy-face 'ediff-even-diff-face-A 'ediff-even-diff-face-C)
1254 ;; (ediff-set-face-pixmap 'ediff-even-diff-face-C
1255 ;; ediff-even-diff-pixmap)))
1256 ;; 'ediff-even-diff-face-C))
1257 ;; "Face used for highlighting even-numbered differences in buffer C.")
1259 (defface ediff-even-diff-face-C
1260 '((((class color
)) (:foreground
"Black" :background
"light grey"))
1261 (t (:italic t
:stipple
"Stipple")))
1262 "Face for highlighting even-numbered non-current differences in buffer C."
1263 :group
'ediff-highlighting
)
1264 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1265 ;; this variable is set to nil, then again to the appropriate face.
1266 (defvar ediff-even-diff-face-C
'ediff-even-diff-face-C
1267 "Face for highlighting even-numbered non-current differences in buffer C.
1268 DO NOT CHANGE this variable. Instead, use the customization
1269 widget to customize the actual face object `ediff-even-diff-face-C'
1270 this variable represents.")
1271 (ediff-hide-face 'ediff-even-diff-face-C
)
1272 ;; Until custom.el for XEmacs starts supporting :stipple we do this.
1273 ;; This means that some use customization may be trashed.
1274 (if (and ediff-xemacs-p
1275 (ediff-has-face-support-p)
1276 (not (ediff-color-display-p)))
1277 (ediff-set-face-pixmap 'ediff-even-diff-face-C
"Stipple"))
1279 ;;(defvar ediff-even-diff-face-Ancestor
1280 ;; (if (ediff-has-face-support-p)
1282 ;; (make-face 'ediff-even-diff-face-Ancestor)
1283 ;; (ediff-hide-face 'ediff-even-diff-face-Ancestor)
1284 ;; (or (face-differs-from-default-p 'ediff-even-diff-face-Ancestor)
1287 ;; 'ediff-even-diff-face-C 'ediff-even-diff-face-Ancestor)
1288 ;; (ediff-set-face-pixmap 'ediff-even-diff-face-Ancestor
1289 ;; ediff-even-diff-pixmap)))
1290 ;; 'ediff-even-diff-face-Ancestor))
1291 ;; "Face highlighting even-numbered differences in the ancestor buffer.")
1293 (defface ediff-even-diff-face-Ancestor
1294 '((((class color
)) (:foreground
"White" :background
"Grey"))
1295 (t (:italic t
:stipple
"Stipple")))
1296 "Face for highlighting even-numbered non-current differences in the ancestor buffer."
1297 :group
'ediff-highlighting
)
1298 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1299 ;; this variable is set to nil, then again to the appropriate face.
1300 (defvar ediff-even-diff-face-Ancestor
'ediff-even-diff-face-Ancestor
1301 "Face for highlighting even-numbered non-current differences in buffer Ancestor.
1302 DO NOT CHANGE this variable. Instead, use the customization
1303 widget to customize the actual face object `ediff-even-diff-face-Ancestor'
1304 this variable represents.")
1305 (ediff-hide-face 'ediff-even-diff-face-Ancestor
)
1306 ;; Until custom.el for XEmacs starts supporting :stipple we do this.
1307 ;; This means that some use customization may be trashed.
1308 (if (and ediff-xemacs-p
1309 (ediff-has-face-support-p)
1310 (not (ediff-color-display-p)))
1311 (ediff-set-face-pixmap
1312 'ediff-even-diff-face-Ancestor
"Stipple"))
1314 ;; Association between buffer types and even-diff-face symbols
1315 (defconst ediff-even-diff-face-alist
1316 '((A . ediff-even-diff-face-A
)
1317 (B . ediff-even-diff-face-B
)
1318 (C . ediff-even-diff-face-C
)
1319 (Ancestor . ediff-even-diff-face-Ancestor
)))
1321 ;;(defvar ediff-odd-diff-face-A
1322 ;; (if (ediff-has-face-support-p)
1324 ;; (make-face 'ediff-odd-diff-face-A)
1325 ;; (or (face-differs-from-default-p 'ediff-odd-diff-face-A)
1326 ;; (cond ((ediff-color-display-p)
1328 ;; 'foreground 'ediff-odd-diff-face-A "White")
1330 ;; 'background 'ediff-odd-diff-face-A "Gray"))
1332 ;; (copy-face 'italic 'ediff-odd-diff-face-A)
1333 ;; (ediff-set-face-pixmap 'ediff-odd-diff-face-A
1334 ;; ediff-odd-diff-pixmap)
1336 ;; 'ediff-odd-diff-face-A))
1337 ;; "Face used for highlighting odd-numbered differences in buffer A.")
1339 (defface ediff-odd-diff-face-A
1340 '((((class color
)) (:foreground
"White" :background
"Grey"))
1341 (t (:italic t
:stipple
"gray1")))
1342 "Face for highlighting odd-numbered non-current differences in buffer A."
1343 :group
'ediff-highlighting
)
1344 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1345 ;; this variable is set to nil, then again to the appropriate face.
1346 (defvar ediff-odd-diff-face-A
'ediff-odd-diff-face-A
1347 "Face for highlighting odd-numbered non-current differences in buffer A.
1348 DO NOT CHANGE this variable. Instead, use the customization
1349 widget to customize the actual face object `ediff-odd-diff-face-A'
1350 this variable represents.")
1351 (ediff-hide-face 'ediff-odd-diff-face-A
)
1352 ;; Until custom.el for XEmacs starts supporting :stipple we do this.
1353 ;; This means that some use customization may be trashed.
1354 (if (and ediff-xemacs-p
1355 (ediff-has-face-support-p)
1356 (not (ediff-color-display-p)))
1357 (ediff-set-face-pixmap 'ediff-odd-diff-face-A
"gray1"))
1359 ;;(defvar ediff-odd-diff-face-B
1360 ;; (if (ediff-has-face-support-p)
1362 ;; (make-face 'ediff-odd-diff-face-B)
1363 ;; (ediff-hide-face 'ediff-odd-diff-face-B)
1364 ;; (or (face-differs-from-default-p 'ediff-odd-diff-face-B)
1365 ;; (cond ((ediff-color-display-p)
1367 ;; 'foreground 'ediff-odd-diff-face-B "Black")
1369 ;; 'background 'ediff-odd-diff-face-B "light grey"))
1371 ;; (copy-face 'italic 'ediff-odd-diff-face-B)
1372 ;; (ediff-set-face-pixmap 'ediff-odd-diff-face-B
1373 ;; ediff-odd-diff-pixmap)
1375 ;; 'ediff-odd-diff-face-B))
1376 ;; "Face used for highlighting odd-numbered differences in buffer B.")
1378 (defface ediff-odd-diff-face-B
1379 '((((class color
)) (:foreground
"Black" :background
"light grey"))
1380 (t (:italic t
:stipple
"gray1")))
1381 "Face for highlighting odd-numbered non-current differences in buffer B."
1382 :group
'ediff-highlighting
)
1383 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1384 ;; this variable is set to nil, then again to the appropriate face.
1385 (defvar ediff-odd-diff-face-B
'ediff-odd-diff-face-B
1386 "Face for highlighting odd-numbered non-current differences in buffer B.
1387 DO NOT CHANGE this variable. Instead, use the customization
1388 widget to customize the actual face object `ediff-odd-diff-face-B'
1389 this variable represents.")
1390 (ediff-hide-face 'ediff-odd-diff-face-B
)
1391 ;; Until custom.el for XEmacs starts supporting :stipple we do this.
1392 ;; This means that some use customization may be trashed.
1393 (if (and ediff-xemacs-p
1394 (ediff-has-face-support-p)
1395 (not (ediff-color-display-p)))
1396 (ediff-set-face-pixmap 'ediff-odd-diff-face-B
"gray1"))
1398 ;;(defvar ediff-odd-diff-face-C
1399 ;; (if (ediff-has-face-support-p)
1401 ;; (make-face 'ediff-odd-diff-face-C)
1402 ;; (or (face-differs-from-default-p 'ediff-odd-diff-face-C)
1404 ;; (copy-face 'ediff-odd-diff-face-A 'ediff-odd-diff-face-C)
1405 ;; (ediff-set-face-pixmap 'ediff-odd-diff-face-C
1406 ;; ediff-odd-diff-pixmap)))
1407 ;; 'ediff-odd-diff-face-C))
1408 ;; "Face used for highlighting odd-numbered differences in buffer C.")
1410 (defface ediff-odd-diff-face-C
1411 '((((class color
)) (:foreground
"White" :background
"Grey"))
1412 (t (:italic t
:stipple
"gray1")))
1413 "Face for highlighting odd-numbered non-current differences in buffer C."
1414 :group
'ediff-highlighting
)
1415 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1416 ;; this variable is set to nil, then again to the appropriate face.
1417 (defvar ediff-odd-diff-face-C
'ediff-odd-diff-face-C
1418 "Face for highlighting odd-numbered non-current differences in buffer C.
1419 DO NOT CHANGE this variable. Instead, use the customization
1420 widget to customize the actual face object `ediff-odd-diff-face-C'
1421 this variable represents.")
1422 (ediff-hide-face 'ediff-odd-diff-face-C
)
1423 ;; Until custom.el for XEmacs starts supporting :stipple we do this.
1424 ;; This means that some use customization may be trashed.
1425 (if (and ediff-xemacs-p
1426 (ediff-has-face-support-p)
1427 (not (ediff-color-display-p)))
1428 (ediff-set-face-pixmap 'ediff-odd-diff-face-C
"gray1"))
1430 ;;(defvar ediff-odd-diff-face-Ancestor
1431 ;; (if (ediff-has-face-support-p)
1433 ;; (make-face 'ediff-odd-diff-face-Ancestor)
1434 ;; (or (face-differs-from-default-p 'ediff-odd-diff-face-Ancestor)
1436 ;; (copy-face 'ediff-odd-diff-face-C 'ediff-odd-diff-face-Ancestor)
1437 ;; (ediff-set-face-pixmap 'ediff-odd-diff-face-Ancestor
1438 ;; ediff-odd-diff-pixmap)))
1439 ;; 'ediff-odd-diff-face-Ancestor))
1440 ;; "Face used for highlighting even-numbered differences in the ancestor buffer.")
1442 (defface ediff-odd-diff-face-Ancestor
1443 '((((class color
)) (:foreground
"Black" :background
"light grey"))
1444 (t (:italic t
:stipple
"gray1")))
1445 "Face for highlighting odd-numbered non-current differences in the ancestor buffer."
1446 :group
'ediff-highlighting
)
1447 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
1448 ;; this variable is set to nil, then again to the appropriate face.
1449 (defvar ediff-odd-diff-face-Ancestor
'ediff-odd-diff-face-Ancestor
1450 "Face for highlighting odd-numbered non-current differences in buffer Ancestor.
1451 DO NOT CHANGE this variable. Instead, use the customization
1452 widget to customize the actual face object `ediff-odd-diff-face-Ancestor'
1453 this variable represents.")
1454 (ediff-hide-face 'ediff-odd-diff-face-Ancestor
)
1455 ;; Until custom.el for XEmacs starts supporting :stipple we do this.
1456 ;; This means that some use customization may be trashed.
1457 (if (and ediff-xemacs-p
1458 (ediff-has-face-support-p)
1459 (not (ediff-color-display-p)))
1460 (ediff-set-face-pixmap 'ediff-odd-diff-face-Ancestor
"gray1"))
1462 ;; Association between buffer types and odd-diff-face symbols
1463 (defconst ediff-odd-diff-face-alist
1464 '((A . ediff-odd-diff-face-A
)
1465 (B . ediff-odd-diff-face-B
)
1466 (C . ediff-odd-diff-face-C
)
1467 (Ancestor . ediff-odd-diff-face-Ancestor
)))
1469 ;; A-list of fine-diff face symbols associated with buffer types
1470 (defconst ediff-fine-diff-face-alist
1471 '((A . ediff-fine-diff-face-A
)
1472 (B . ediff-fine-diff-face-B
)
1473 (C . ediff-fine-diff-face-C
)
1474 (Ancestor . ediff-fine-diff-face-Ancestor
)))
1477 (put 'ediff-fine-diff-face-A
'ediff-help-echo
1478 "A `refinement' of the current difference region")
1479 (put 'ediff-fine-diff-face-B
'ediff-help-echo
1480 "A `refinement' of the current difference region")
1481 (put 'ediff-fine-diff-face-C
'ediff-help-echo
1482 "A `refinement' of the current difference region")
1483 (put 'ediff-fine-diff-face-Ancestor
'ediff-help-echo
1484 "A `refinement' of the current difference region")
1489 (ediff-defvar-local ediff-current-diff-overlay-A nil
1490 "Overlay for the current difference region in buffer A.")
1491 (ediff-defvar-local ediff-current-diff-overlay-B nil
1492 "Overlay for the current difference region in buffer B.")
1493 (ediff-defvar-local ediff-current-diff-overlay-C nil
1494 "Overlay for the current difference region in buffer C.")
1495 (ediff-defvar-local ediff-current-diff-overlay-Ancestor nil
1496 "Overlay for the current difference region in the ancestor buffer.")
1498 ;; Compute priority of ediff overlay.
1499 (defun ediff-highest-priority (start end buffer
)
1500 (let ((pos (max 1 (1- start
)))
1503 (1+ ediff-shadow-overlay-priority
)
1504 (ediff-with-current-buffer buffer
1505 (while (< pos
(min (point-max) (1+ end
)))
1506 (setq ovr-list
(append (overlays-at pos
) ovr-list
))
1507 (setq pos
(next-overlay-change pos
)))
1512 (or (ediff-overlay-get ovr
'priority
) 0)
1519 (defvar ediff-toggle-read-only-function nil
1520 "*Specifies the function to be used to toggle read-only.
1521 If nil, Ediff tries to deduce the function from the binding of C-x C-q.
1522 Normally, this is the `toggle-read-only' function, but, if version
1523 control is used, it could be `vc-toggle-read-only' or `rcs-toggle-read-only'.")
1525 (defcustom ediff-make-buffers-readonly-at-startup nil
1526 "*Make all variant buffers read-only when Ediff starts up.
1527 This property can be toggled interactively."
1534 ;; if nil, this silences some messages
1535 (defconst ediff-verbose-p t
)
1537 (defcustom ediff-autostore-merges
'group-jobs-only
1538 "*Save the results of merge jobs automatically.
1539 Nil means don't save automatically. t means always save. Anything but nil or t
1540 means save automatically only if the merge job is part of a group of jobs, such
1541 as `ediff-merge-directory' or `ediff-merge-directory-revisions'."
1542 :type
'(choice (const nil
) (const t
) (const group-jobs-only
))
1543 :group
'ediff-merge
)
1544 (make-variable-buffer-local 'ediff-autostore-merges
)
1546 ;; file where the result of the merge is to be saved. used internally
1547 (ediff-defvar-local ediff-merge-store-file nil
"")
1549 (defcustom ediff-no-emacs-help-in-control-buffer nil
1550 "*Non-nil means C-h should not invoke Emacs help in control buffer.
1551 Instead, C-h would jump to previous difference."
1555 (defcustom ediff-temp-file-prefix
1556 (let ((env (or (getenv "TMPDIR")
1560 (setq d
(if (and env
(> (length env
) 0))
1562 (cond ((memq system-type
'(vax-vms axp-vms
)) "SYS$SCRATCH:")
1563 ((eq system-type
'ms-dos
) "c:/")
1565 ;; The following is to make sure we get something to which we can
1566 ;; add directory levels under VMS.
1567 (setq d
(file-name-as-directory (directory-file-name d
)))
1569 "*Prefix to put on Ediff temporary file names.
1570 Do not start with `~/' or `~user-name/'."
1574 (defcustom ediff-temp-file-mode
384 ; u=rw only
1575 "*Mode for Ediff temporary files."
1579 ;; Metacharacters that have to be protected from the shell when executing
1580 ;; a diff/diff3 command.
1581 (defcustom ediff-metachars
"[ \t\n!\"#$&'()*;<=>?[\\^`{|~]"
1582 "Regexp that matches characters that must be quoted with `\\' in shell command line.
1583 This default should work without changes."
1587 ;; needed to simulate frame-char-width in XEmacs.
1588 (defvar ediff-H-glyph
(if ediff-xemacs-p
(make-glyph "H")))
1591 ;; Temporary file used for refining difference regions in buffer A.
1592 (ediff-defvar-local ediff-temp-file-A nil
"")
1593 ;; Temporary file used for refining difference regions in buffer B.
1594 (ediff-defvar-local ediff-temp-file-B nil
"")
1595 ;; Temporary file used for refining difference regions in buffer C.
1596 (ediff-defvar-local ediff-temp-file-C nil
"")
1599 ;;; In-line functions
1601 (or (fboundp 'ediff-file-remote-p
) ; user supplied his own function: use it
1602 (defun ediff-file-remote-p (file-name)
1603 (car (cond ((featurep 'efs-auto
) (efs-ftp-path file-name
))
1604 ((fboundp 'file-remote-p
) (file-remote-p file-name
))
1605 (t (require 'ange-ftp
)
1606 ;; Can happen only in Emacs, since XEmacs has file-remote-p
1607 (ange-ftp-ftp-name file-name
))))))
1610 (defsubst ediff-frame-unsplittable-p
(frame)
1611 (cdr (assq 'unsplittable
(frame-parameters frame
))))
1613 (defsubst ediff-get-next-window
(wind prev-wind
)
1614 (or (window-live-p wind
)
1615 (setq wind
(if prev-wind
1617 (selected-window)))))
1620 (defsubst ediff-kill-buffer-carefully
(buf)
1621 "Kill buffer BUF if it exists."
1622 (if (ediff-buffer-live-p buf
)
1623 (kill-buffer (get-buffer buf
))))
1625 (defsubst ediff-background-face
(buf-type dif-num
)
1626 ;; The value of dif-num is always 1- the one that user sees.
1627 ;; This is why even face is used when dif-num is odd.
1628 (ediff-get-symbol-from-alist
1629 buf-type
(if (ediff-odd-p dif-num
)
1630 ediff-even-diff-face-alist
1631 ediff-odd-diff-face-alist
)
1635 ;; activate faces on diff regions in buffer
1636 (defun ediff-paint-background-regions-in-one-buffer (buf-type unhighlight
)
1638 (eval (ediff-get-symbol-from-alist
1639 buf-type ediff-difference-vector-alist
)))
1643 (setq overl
(ediff-get-diff-overlay-from-diff-record rec
)
1644 diff-num
(ediff-overlay-get overl
'ediff-diff-num
))
1645 (if (ediff-overlay-buffer overl
)
1646 ;; only if overlay is alive
1647 (ediff-set-overlay-face
1649 (if (not unhighlight
)
1650 (ediff-background-face buf-type diff-num
))))
1655 ;; activate faces on diff regions in all buffers
1656 (defun ediff-paint-background-regions (&optional unhighlight
)
1657 (ediff-paint-background-regions-in-one-buffer
1659 (ediff-paint-background-regions-in-one-buffer
1661 (ediff-paint-background-regions-in-one-buffer
1663 (ediff-paint-background-regions-in-one-buffer
1664 'Ancestor unhighlight
))
1666 (defun ediff-highlight-diff-in-one-buffer (n buf-type
)
1667 (if (ediff-buffer-live-p (ediff-get-buffer buf-type
))
1668 (let* ((buff (ediff-get-buffer buf-type
))
1669 (last (ediff-with-current-buffer buff
(point-max)))
1670 (begin (ediff-get-diff-posn buf-type
'beg n
))
1671 (end (ediff-get-diff-posn buf-type
'end n
))
1672 (xtra (if (equal begin end
) 1 0))
1673 (end-hilit (min last
(+ end xtra
)))
1674 (current-diff-overlay
1676 (ediff-get-symbol-from-alist
1677 buf-type ediff-current-diff-overlay-alist
))))
1680 (ediff-move-overlay current-diff-overlay begin end-hilit
)
1681 (ediff-move-overlay current-diff-overlay begin end-hilit buff
))
1682 (ediff-overlay-put current-diff-overlay
'priority
1683 (ediff-highest-priority begin end-hilit buff
))
1684 (ediff-overlay-put current-diff-overlay
'ediff-diff-num n
)
1686 ;; unhighlight the background overlay for diff n so it won't
1687 ;; interfere with the current diff overlay
1688 (ediff-set-overlay-face (ediff-get-diff-overlay n buf-type
) nil
)
1692 (defun ediff-unhighlight-diff-in-one-buffer (buf-type)
1693 (if (ediff-buffer-live-p (ediff-get-buffer buf-type
))
1694 (let ((current-diff-overlay
1696 (ediff-get-symbol-from-alist
1697 buf-type ediff-current-diff-overlay-alist
)))
1699 (ediff-get-diff-overlay ediff-current-difference buf-type
))
1702 (ediff-move-overlay current-diff-overlay
1 1)
1704 ;; rehighlight the overlay in the background of the
1705 ;; current difference region
1706 (ediff-set-overlay-face
1708 (if (and (ediff-has-face-support-p)
1709 ediff-use-faces ediff-highlight-all-diffs
)
1710 (ediff-background-face buf-type ediff-current-difference
)))
1713 (defun ediff-unhighlight-diffs-totally-in-one-buffer (buf-type)
1714 (ediff-unselect-and-select-difference -
1)
1715 (if (and (ediff-has-face-support-p) ediff-use-faces
)
1716 (let* ((inhibit-quit t
)
1717 (current-diff-overlay-var
1718 (ediff-get-symbol-from-alist
1719 buf-type ediff-current-diff-overlay-alist
))
1720 (current-diff-overlay (symbol-value current-diff-overlay-var
)))
1721 (ediff-paint-background-regions 'unhighlight
)
1722 (if (ediff-overlayp current-diff-overlay
)
1723 (ediff-delete-overlay current-diff-overlay
))
1724 (set current-diff-overlay-var nil
)
1728 (defsubst ediff-highlight-diff
(n)
1729 "Put face on diff N. Invoked for X displays only."
1730 (ediff-highlight-diff-in-one-buffer n
'A
)
1731 (ediff-highlight-diff-in-one-buffer n
'B
)
1732 (ediff-highlight-diff-in-one-buffer n
'C
)
1733 (ediff-highlight-diff-in-one-buffer n
'Ancestor
)
1737 (defsubst ediff-unhighlight-diff
()
1738 "Remove overlays from buffers A, B, and C."
1739 (ediff-unhighlight-diff-in-one-buffer 'A
)
1740 (ediff-unhighlight-diff-in-one-buffer 'B
)
1741 (ediff-unhighlight-diff-in-one-buffer 'C
)
1742 (ediff-unhighlight-diff-in-one-buffer 'Ancestor
)
1745 ;; delete highlighting overlays, restore faces to their original form
1746 (defsubst ediff-unhighlight-diffs-totally
()
1747 (ediff-unhighlight-diffs-totally-in-one-buffer 'A
)
1748 (ediff-unhighlight-diffs-totally-in-one-buffer 'B
)
1749 (ediff-unhighlight-diffs-totally-in-one-buffer 'C
)
1750 (ediff-unhighlight-diffs-totally-in-one-buffer 'Ancestor
)
1754 ;; arg is a record for a given diff in a difference vector
1755 ;; this record is itself a vector
1756 (defsubst ediff-clear-fine-diff-vector
(diff-record)
1758 (mapcar 'ediff-delete-overlay
1759 (ediff-get-fine-diff-vector-from-diff-record diff-record
))))
1761 (defsubst ediff-clear-fine-differences-in-one-buffer
(n buf-type
)
1762 (ediff-clear-fine-diff-vector (ediff-get-difference n buf-type
))
1763 (ediff-set-fine-diff-vector n buf-type nil
))
1765 (defsubst ediff-clear-fine-differences
(n)
1766 (ediff-clear-fine-differences-in-one-buffer n
'A
)
1767 (ediff-clear-fine-differences-in-one-buffer n
'B
)
1769 (ediff-clear-fine-differences-in-one-buffer n
'C
)))
1772 (defsubst ediff-convert-fine-diffs-to-overlays
(diff-list region-num
)
1773 (ediff-set-fine-overlays-in-one-buffer 'A diff-list region-num
)
1774 (ediff-set-fine-overlays-in-one-buffer 'B diff-list region-num
)
1776 (ediff-set-fine-overlays-in-one-buffer 'C diff-list region-num
)
1779 (defsubst ediff-mouse-event-p
(event)
1781 (button-event-p event
)
1782 (string-match "mouse" (format "%S" (event-basic-type event
)))
1786 (defsubst ediff-key-press-event-p
(event)
1788 (key-press-event-p event
)
1789 (or (char-or-string-p event
) (symbolp event
))))
1791 (defun ediff-event-point (event)
1792 (cond ((ediff-mouse-event-p event
)
1795 (posn-point (event-start event
))))
1796 ((ediff-key-press-event-p event
)
1800 (defun ediff-event-buffer (event)
1801 (cond ((ediff-mouse-event-p event
)
1803 (event-buffer event
)
1804 (window-buffer (posn-window (event-start event
)))))
1805 ((ediff-key-press-event-p event
)
1810 (defsubst ediff-frame-iconified-p
(frame)
1811 (if (and (ediff-window-display-p) (frame-live-p frame
))
1813 (frame-iconified-p frame
)
1814 (eq (frame-visible-p frame
) 'icon
))))
1816 (defsubst ediff-window-visible-p
(wind)
1817 ;; under TTY, window-live-p also means window is visible
1818 (and (window-live-p wind
)
1819 (or (not (ediff-window-display-p))
1820 (frame-visible-p (window-frame wind
)))))
1823 (defsubst ediff-frame-char-width
(frame)
1825 (/ (frame-pixel-width frame
) (frame-width frame
))
1826 (frame-char-width frame
)))
1828 (defun ediff-reset-mouse (&optional frame do-not-grab-mouse
)
1829 (or frame
(setq frame
(selected-frame)))
1830 (if (ediff-window-display-p)
1831 (let ((frame-or-wind frame
))
1833 (setq frame-or-wind
(frame-selected-window frame
)))
1834 (or do-not-grab-mouse
1835 ;; don't set mouse if the user said to never do this
1836 (not ediff-grab-mouse
)
1837 ;; Don't grab on quit, if the user doesn't want to.
1838 ;; If ediff-grab-mouse = t, then mouse won't be grabbed for
1839 ;; sessions that are not part of a group (this is done in
1840 ;; ediff-recenter). The condition below affects only terminating
1841 ;; sessions in session groups (in which case mouse is warped into
1843 (and (eq ediff-grab-mouse
'maybe
)
1844 (memq this-command
'(ediff-quit ediff-update-diffs
)))
1845 (set-mouse-position frame-or-wind
1 0))
1848 (defsubst ediff-spy-after-mouse
()
1849 (setq ediff-mouse-pixel-position
(mouse-pixel-position)))
1851 ;; It is not easy to find out when the user grabs the mouse, since emacs and
1852 ;; xemacs behave differently when mouse is not in any frame. Also, this is
1853 ;; sensitive to when the user grabbed mouse. Not used for now.
1854 (defun ediff-user-grabbed-mouse ()
1855 (if ediff-mouse-pixel-position
1856 (cond ((not (eq (car ediff-mouse-pixel-position
)
1857 (car (mouse-pixel-position)))))
1858 ((and (car (cdr ediff-mouse-pixel-position
))
1859 (car (cdr (mouse-pixel-position)))
1860 (cdr (cdr ediff-mouse-pixel-position
))
1861 (cdr (cdr (mouse-pixel-position))))
1862 (not (and (< (abs (- (car (cdr ediff-mouse-pixel-position
))
1863 (car (cdr (mouse-pixel-position)))))
1864 ediff-mouse-pixel-threshold
)
1865 (< (abs (- (cdr (cdr ediff-mouse-pixel-position
))
1866 (cdr (cdr (mouse-pixel-position)))))
1867 ediff-mouse-pixel-threshold
))))
1870 (defsubst ediff-frame-char-height
(frame)
1872 (glyph-height ediff-H-glyph
(selected-window frame
))
1873 (frame-char-height frame
)))
1875 ;; Some overlay functions
1877 (defsubst ediff-overlay-start
(overl)
1878 (if (ediff-overlayp overl
)
1880 (overlay-start overl
)
1881 (extent-start-position overl
))))
1883 (defsubst ediff-overlay-end
(overl)
1884 (if (ediff-overlayp overl
)
1887 (extent-end-position overl
))))
1889 (defsubst ediff-empty-overlay-p
(overl)
1890 (= (ediff-overlay-start overl
) (ediff-overlay-end overl
)))
1892 ;; like overlay-buffer in Emacs. In XEmacs, returns nil if the extent is
1893 ;; dead. Otherwise, works like extent-buffer
1894 (defun ediff-overlay-buffer (overl)
1896 (overlay-buffer overl
)
1897 (and (extent-live-p overl
) (extent-object overl
))))
1899 ;; like overlay-get in Emacs. In XEmacs, returns nil if the extent is
1900 ;; dead. Otherwise, like extent-property
1901 (defun ediff-overlay-get (overl property
)
1903 (overlay-get overl property
)
1904 (and (extent-live-p overl
) (extent-property overl property
))))
1907 ;; These two functions are here because XEmacs refuses to
1908 ;; handle overlays whose buffers were deleted.
1909 (defun ediff-move-overlay (overlay beg end
&optional buffer
)
1910 "Calls `move-overlay' in Emacs and `set-extent-endpoints' in Lemacs.
1911 Checks if overlay's buffer exists before actually doing the move."
1912 (let ((buf (and overlay
(ediff-overlay-buffer overlay
))))
1913 (if (ediff-buffer-live-p buf
)
1915 (set-extent-endpoints overlay beg end
)
1916 (move-overlay overlay beg end buffer
))
1919 (ediff-delete-overlay overlay
)))))
1921 (defun ediff-overlay-put (overlay prop value
)
1922 "Calls `overlay-put' or `set-extent-property' depending on Emacs version.
1923 Checks if overlay's buffer exists."
1924 (if (ediff-buffer-live-p (ediff-overlay-buffer overlay
))
1926 (set-extent-property overlay prop value
)
1927 (overlay-put overlay prop value
))
1928 (ediff-delete-overlay overlay
)))
1930 ;; Some diff region tests
1932 ;; t if diff region is empty.
1933 ;; In case of buffer C, t also if it is not a 3way
1934 ;; comparison job (merging jobs return t as well).
1935 (defun ediff-empty-diff-region-p (n buf-type
)
1936 (if (eq buf-type
'C
)
1937 (or (not ediff-3way-comparison-job
)
1938 (= (ediff-get-diff-posn 'C
'beg n
)
1939 (ediff-get-diff-posn 'C
'end n
)))
1940 (= (ediff-get-diff-posn buf-type
'beg n
)
1941 (ediff-get-diff-posn buf-type
'end n
))))
1943 ;; Test if diff region is white space only.
1944 ;; If 2-way job and buf-type = C, then returns t.
1945 (defun ediff-whitespace-diff-region-p (n buf-type
)
1946 (or (and (eq buf-type
'C
) (not ediff-3way-job
))
1947 (ediff-empty-diff-region-p n buf-type
)
1948 (let ((beg (ediff-get-diff-posn buf-type
'beg n
))
1949 (end (ediff-get-diff-posn buf-type
'end n
)))
1950 (ediff-with-current-buffer (ediff-get-buffer buf-type
)
1953 (skip-chars-forward ediff-whitespace
)
1954 (>= (point) end
))))))
1956 ;; temporarily uses DIR to abbreviate file name
1957 ;; if DIR is nil, use default-directory
1958 (defun ediff-abbreviate-file-name (file &optional dir
)
1959 (cond ((stringp dir
)
1960 (let ((directory-abbrev-alist (list (cons dir
""))))
1961 (abbreviate-file-name file
)))
1962 (ediff-emacs-p (abbreviate-file-name file
))
1963 (t ; XEmacs requires addl argument
1964 (abbreviate-file-name file t
))))
1966 ;; Takes a directory and returns the parent directory.
1967 ;; does nothing to `/'. If the ARG is a regular file,
1968 ;; strip the file AND the last dir.
1969 (defun ediff-strip-last-dir (dir)
1970 (if (not (stringp dir
)) (setq dir default-directory
))
1971 (setq dir
(expand-file-name dir
))
1972 (or (file-directory-p dir
) (setq dir
(file-name-directory dir
)))
1973 (let* ((pos (1- (length dir
)))
1974 (last-char (aref dir pos
)))
1975 (if (and (> pos
0) (= last-char ?
/))
1976 (setq dir
(substring dir
0 pos
)))
1977 (ediff-abbreviate-file-name (file-name-directory dir
))))
1979 (defun ediff-truncate-string-left (str newlen
)
1980 ;; leave space for ... on the left
1981 (let ((len (length str
))
1985 (setq newlen
(max 0 (- newlen
3)))
1986 (setq substr
(substring str
(max 0 (- len
1 newlen
))))
1987 (concat "..." substr
))))
1989 (defun ediff-abbrev-jobname (jobname)
1990 (cond ((eq jobname
'ediff-directories
)
1991 "Compare two directories")
1992 ((eq jobname
'ediff-files
)
1993 "Compare two files")
1994 ((eq jobname
'ediff-buffers
)
1995 "Compare two buffers")
1996 ((eq jobname
'ediff-directories3
)
1997 "Compare three directories")
1998 ((eq jobname
'ediff-files3
)
1999 "Compare three files")
2000 ((eq jobname
'ediff-buffers3
)
2001 "Compare three buffers")
2002 ((eq jobname
'ediff-revision
)
2003 "Compare file with a version")
2004 ((eq jobname
'ediff-directory-revisions
)
2005 "Compare dir files with versions")
2006 ((eq jobname
'ediff-merge-directory-revisions
)
2007 "Merge dir files with versions")
2008 ((eq jobname
'ediff-merge-directory-revisions-with-ancestor
)
2009 "Merge dir versions via ancestors")
2011 (let* ((str (substring (symbol-name jobname
) 6))
2016 (aset str pos
(upcase (aref str pos
))))
2017 (if (= (aref str pos
) ?-
)
2019 (setq pos
(1+ pos
)))
2024 (defsubst ediff-get-region-contents
(n buf-type ctrl-buf
&optional start end
)
2025 (ediff-with-current-buffer
2026 (ediff-with-current-buffer ctrl-buf
(ediff-get-buffer buf-type
))
2028 (or start
(ediff-get-diff-posn buf-type
'beg n ctrl-buf
))
2029 (or end
(ediff-get-diff-posn buf-type
'end n ctrl-buf
)))))
2031 ;; If ediff modified mode line, strip the modification
2032 (defsubst ediff-strip-mode-line-format
()
2033 (if (member (car mode-line-format
) '(" A: " " B: " " C: " " Ancestor: "))
2034 (setq mode-line-format
(nth 2 mode-line-format
))))
2036 ;; Verify that we have a difference selected.
2037 (defsubst ediff-valid-difference-p
(&optional n
)
2038 (or n
(setq n ediff-current-difference
))
2039 (and (>= n
0) (< n ediff-number-of-differences
)))
2041 (defsubst ediff-show-all-diffs
(n)
2042 "Don't skip difference regions."
2046 (or (and a
(not b
)) (and (not a
) b
)))
2048 (defsubst ediff-message-if-verbose
(string &rest args
)
2050 (apply 'message string args
)))
2052 (defun ediff-file-attributes (filename attr-number
)
2053 (if (ediff-file-remote-p filename
)
2055 (nth attr-number
(file-attributes filename
))))
2057 (defsubst ediff-file-size
(filename)
2058 (ediff-file-attributes filename
7))
2059 (defsubst ediff-file-modtime
(filename)
2060 (ediff-file-attributes filename
5))
2063 (defun ediff-convert-standard-filename (fname)
2064 (if (fboundp 'convert-standard-filename
)
2065 (convert-standard-filename fname
)
2069 ;;; Local Variables:
2070 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
2071 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
2072 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
2075 (provide 'ediff-init
)
2078 ;;; ediff-init.el ends here