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