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