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