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