(easy-menu-create-keymaps): Add menu-alias property.
[bpt/emacs.git] / lisp / ediff-init.el
... / ...
CommitLineData
1;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff
2
3;; Copyright (C) 1994, 1995 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;; Is it XEmacs?
27(defconst ediff-xemacs-p (string-match "XEmacs" emacs-version))
28;; Is it Emacs?
29(defconst ediff-emacs-p (not ediff-xemacs-p))
30;; Are we running as a window application or on a TTY?
31(defsubst ediff-device-type ()
32 (if ediff-emacs-p
33 window-system
34 (device-type (selected-device))))
35;; in XEmacs: device-type is tty on tty and stream in batch.
36(defun ediff-window-display-p ()
37 (and (ediff-device-type) (not (memq (ediff-device-type) '(tty pc stream)))))
38
39;; test if supports faces
40;; ediff-force-faces is for those devices that support faces, but we don't know
41;; this yet
42(defun ediff-has-face-support-p ()
43 (cond ((ediff-window-display-p))
44 (ediff-force-faces)
45 (ediff-emacs-p (memq (ediff-device-type) '(pc)))
46 (ediff-xemacs-p (memq (ediff-device-type) '(tty pc)))))
47
48
49;;; Macros
50(defmacro ediff-odd-p (arg)
51 (` (eq (logand (, arg) 1) 1)))
52
53(defmacro ediff-buffer-live-p (buf)
54 (` (and (, buf) (get-buffer (, buf)) (buffer-name (get-buffer (, buf))))))
55
56(defmacro ediff-get-buffer (arg)
57 (` (cond ((eq (, arg) 'A) ediff-buffer-A)
58 ((eq (, arg) 'B) ediff-buffer-B)
59 ((eq (, arg) 'C) ediff-buffer-C)
60 ((eq (, arg) 'Ancestor) ediff-ancestor-buffer)
61 )
62 ))
63
64(defmacro ediff-get-value-according-to-buffer-type (buf-type list)
65 (` (cond ((eq (, buf-type) 'A) (nth 0 (, list)))
66 ((eq (, buf-type) 'B) (nth 1 (, list)))
67 ((eq (, buf-type) 'C) (nth 2 (, list))))))
68
69(defmacro ediff-char-to-buftype (arg)
70 (` (cond ((memq (, arg) '(?a ?A)) 'A)
71 ((memq (, arg) '(?b ?B)) 'B)
72 ((memq (, arg) '(?c ?C)) 'C)
73 )
74 ))
75
76(defmacro ediff-get-difference (n buf-type)
77 (` (aref
78 (symbol-value
79 (intern (format "ediff-difference-vector-%S" (, buf-type)))) (, n))))
80
81;; tell if it has been previously determined that the region has
82;; no diffs other than the white space and newlines
83;; The argument, N, is the diff region number used by Ediff to index the
84;; diff vector. It is 1 less than the number seen by the user.
85;;
86;; A difference vector has the form:
87;; [diff diff diff ...]
88;; where each diff has the form:
89;; [overlay fine-diff-vector no-fine-diffs-flag]
90;; fine-diff-vector is a vector [fine-diff fine-diff fine-diff ...]
91(defmacro ediff-no-fine-diffs-p (n)
92 (` (aref (ediff-get-difference (, n) 'A) 2)))
93
94(defmacro ediff-get-diff-overlay-from-diff-record (diff-rec)
95 (` (aref (, diff-rec) 0)))
96
97(defmacro ediff-get-diff-overlay (n buf-type)
98 (` (ediff-get-diff-overlay-from-diff-record
99 (ediff-get-difference (, n) (, buf-type)))))
100
101(defmacro ediff-get-fine-diff-vector-from-diff-record (diff-rec)
102 (` (aref (, diff-rec) 1)))
103
104(defmacro ediff-set-fine-diff-vector (n buf-type fine-vec)
105 (` (aset (ediff-get-difference (, n) (, buf-type)) 1 (, fine-vec))))
106
107(defmacro ediff-get-state-of-diff (n buf-type)
108 (` (if (ediff-buffer-live-p ediff-buffer-C)
109 (aref (ediff-get-difference (, n) (, buf-type)) 3))))
110(defmacro ediff-set-state-of-diff (n buf-type val)
111 (` (aset (ediff-get-difference (, n) (, buf-type)) 3 (, val))))
112(defmacro ediff-get-state-of-merge (n)
113 (` (if ediff-state-of-merge
114 (aref (aref ediff-state-of-merge (, n)) 0))))
115(defmacro ediff-get-state-of-ancestor (n)
116 (` (if ediff-state-of-merge
117 (aref (aref ediff-state-of-merge (, n)) 1))))
118(defmacro ediff-set-state-of-merge (n val)
119 (` (if ediff-state-of-merge
120 (aset (aref ediff-state-of-merge (, n)) 0 (, val)))))
121
122;; if flag is t, puts a mark on diff region saying that
123;; the differences are in white space only. If flag is nil,
124;; the region is marked as essential (i.e., differences are
125;; not just in the white space and newlines.)
126(defmacro ediff-mark-diff-as-space-only (n flag)
127 (` (aset (ediff-get-difference (, n) 'A) 2 (, flag))))
128
129(defmacro ediff-get-fine-diff-vector (n buf-type)
130 (` (ediff-get-fine-diff-vector-from-diff-record
131 (ediff-get-difference (, n) (, buf-type)))))
132
133
134;; Defines SYMBOL as an advertised local variable.
135;; Performs a defvar, then executes `make-variable-buffer-local' on
136;; the variable. Also sets the `permanent-local' property,
137;; so that `kill-all-local-variables' (called by major-mode setting
138;; commands) won't destroy Ediff control variables.
139;;
140;; Plagiarised from `emerge-defvar-local' for XEmacs.
141(defmacro ediff-defvar-local (var value doc)
142 (` (progn
143 (defvar (, var) (, value) (, doc))
144 (make-variable-buffer-local '(, var))
145 (put '(, var) 'permanent-local t))))
146
147;; Macro to switch to BUFFER, evaluate FORMS, returns to original buffer.
148;; Differs from `save-excursion' in that it doesn't save the point and mark.
149;; This is essentially `emerge-eval-in-buffer' with the test for live buffers."
150(defmacro ediff-eval-in-buffer (buffer &rest forms)
151 (` (let ((StartBuffer (current-buffer)))
152 (if (ediff-buffer-live-p (, buffer))
153 (unwind-protect
154 (progn
155 (set-buffer (, buffer))
156 (,@ forms))
157 (set-buffer StartBuffer))
158 (or (eq this-command 'ediff-quit)
159 (error ediff-KILLED-VITAL-BUFFER))
160 ))))
161
162
163(defsubst ediff-multiframe-setup-p ()
164 (and (ediff-window-display-p) ediff-multiframe))
165
166(defmacro ediff-narrow-control-frame-p ()
167 (` (and (ediff-multiframe-setup-p)
168 (equal ediff-help-message ediff-brief-message-string))))
169
170(defmacro ediff-3way-comparison-job ()
171 (` (memq
172 ediff-job-name
173 '(ediff-files3 ediff-buffers3))))
174(ediff-defvar-local ediff-3way-comparison-job nil "")
175
176(defmacro ediff-merge-job ()
177 (` (memq
178 ediff-job-name
179 '(ediff-merge-files
180 ediff-merge-buffers
181 ediff-merge-files-with-ancestor
182 ediff-merge-buffers-with-ancestor
183 ediff-merge-revisions
184 ediff-merge-revisions-with-ancestor))))
185(ediff-defvar-local ediff-merge-job nil "")
186
187(defmacro ediff-merge-with-ancestor-job ()
188 (` (memq
189 ediff-job-name
190 '(ediff-merge-files-with-ancestor
191 ediff-merge-buffers-with-ancestor
192 ediff-merge-revisions-with-ancestor))))
193(ediff-defvar-local ediff-merge-with-ancestor-job nil "")
194
195(defmacro ediff-3way-job ()
196 (` (or ediff-3way-comparison-job ediff-merge-job)))
197(ediff-defvar-local ediff-3way-job nil "")
198
199;; A diff3 job is like a 3way job, but ediff-merge doesn't require the use
200;; of diff3.
201(defmacro ediff-diff3-job ()
202 (` (or ediff-3way-comparison-job
203 ediff-merge-with-ancestor-job)))
204(ediff-defvar-local ediff-diff3-job nil "")
205
206(defmacro ediff-windows-job ()
207 (` (memq ediff-job-name '(ediff-windows-wordwise ediff-windows-linewise))))
208(ediff-defvar-local ediff-windows-job nil "")
209
210(defmacro ediff-word-mode-job ()
211 (` (memq ediff-job-name '(ediff-windows-wordwise ediff-regions-wordwise))))
212(ediff-defvar-local ediff-word-mode-job nil "")
213
214(defmacro ediff-narrow-job ()
215 (` (memq ediff-job-name '(ediff-windows-wordwise
216 ediff-regions-wordwise
217 ediff-windows-linewise
218 ediff-regions-linewise))))
219(ediff-defvar-local ediff-narrow-job nil "")
220
221;; Note: ediff-merge-directory-revisions-with-ancestor is not treated as an
222;; ancestor metajob, since it behaves differently.
223(defsubst ediff-ancestor-metajob (&optional metajob)
224 (memq (or metajob ediff-metajob-name)
225 '(ediff-merge-directories-with-ancestor
226 ediff-merge-filegroups-with-ancestor)))
227(defsubst ediff-revision-metajob (&optional metajob)
228 (memq (or metajob ediff-metajob-name)
229 '(ediff-directory-revisions
230 ediff-merge-directory-revisions
231 ediff-merge-directory-revisions-with-ancestor)))
232;; metajob involving only one directory
233(defsubst ediff-dir1-metajob (&optional metajob)
234 (or (ediff-revision-metajob metajob)
235 ;; add more here
236 ))
237(defsubst ediff-collect-diffs-metajob (&optional metajob)
238 (memq (or metajob ediff-metajob-name)
239 '(ediff-directories
240 ediff-directory-revisions
241 ediff-merge-directories
242 ediff-merge-directories-with-ancestor
243 ediff-merge-directory-revisions
244 ediff-merge-directory-revisions-with-ancestor
245 ;; add more here
246 )))
247
248(defsubst ediff-metajob3 (&optional metajob)
249 (memq (or metajob ediff-metajob-name)
250 '(ediff-merge-directories-with-ancestor
251 ediff-merge-filegroups-with-ancestor
252 ediff-directories3
253 ediff-filegroups3)))
254(defsubst ediff-comparison-metajob3 (&optional metajob)
255 (memq (or metajob ediff-metajob-name)
256 '(ediff-directories3 ediff-filegroups3)))
257
258(defsubst ediff-barf-if-not-control-buffer (&optional meta-buf)
259 (or (eq (if meta-buf ediff-meta-buffer ediff-control-buffer)
260 (current-buffer))
261 (error "%S: This command runs in Ediff Control Buffer only!"
262 this-command)))
263
264
265;; Hook variables
266
267(defvar ediff-before-setup-windows-hook nil
268 "*Hooks to run before Ediff sets its window configuration.
269This can be used to save the previous window config, which can be restored
270on ediff-quit or ediff-suspend.")
271(defvar ediff-after-setup-windows-hook nil
272 "*Hooks to run after Ediff sets its window configuration.
273This can be used to set up control window or icon in a desired place.")
274(defvar ediff-before-setup-control-frame-hook nil
275 "*Hooks run before setting up the frame to display Ediff Control Panel.
276Can be used to change control frame parameters to position it where it
277is desirable.")
278(defvar ediff-after-setup-control-frame-hook nil
279 "*Hooks run after setting up the frame to display Ediff Control Panel.
280Can be used to move the frame where it is desired.")
281(defvar ediff-startup-hook nil
282 "*Hooks to run in the control buffer after Ediff has been set up.")
283(defvar ediff-select-hook nil
284 "*Hooks to run after a difference has been selected.")
285(defvar ediff-unselect-hook nil
286 "*Hooks to run after a difference has been unselected.")
287(defvar ediff-prepare-buffer-hook nil
288 "*Hooks called after buffers A, B, and C are set up.")
289(defvar ediff-load-hook nil
290 "*Hook run after Ediff is loaded. Can be used to change defaults.")
291
292(defvar ediff-mode-hook nil
293 "*Hook run just after ediff-mode is set up in the control buffer.
294This is done before any windows or frames are created. One can use it to
295set local variables that determine how the display looks like.")
296(defvar ediff-keymap-setup-hook nil
297 "*Hook run just after the default bindings in Ediff keymap are set up.")
298
299(defvar ediff-display-help-hook nil
300 "*Hooks run after preparing the help message.")
301
302(defvar ediff-suspend-hook (list 'ediff-default-suspend-function)
303 "*Hooks to run in the Ediff control buffer when Ediff is suspended.")
304(defvar ediff-quit-hook (list 'ediff-cleanup-mess)
305 "*Hooks to run in the Ediff control buffer after finishing Ediff.")
306(defvar ediff-cleanup-hook nil
307 "*Hooks to run on exiting Ediff but before killing the control buffer.
308This is a place to do various cleanups, such as deleting the variant buffers.
309Ediff provides a function, `ediff-janitor', as one such possible hook.")
310
311
312;; Help messages
313
314(defconst ediff-long-help-message-head
315 " Moving around | Toggling features | Manipulations
316=====================|===========================|============================="
317 "The head of the full help message.")
318(defconst ediff-long-help-message-tail
319 "=====================|===========================|=============================
320 R -show registry | | M -show session group
321 D -diff output | E -browse Ediff manual| G -send bug report
322 i -status info | ? -help off | z/q -suspend/quit
323-------------------------------------------------------------------------------
324X,Y (x,y) on the left are meta-symbols for the keys A,B,C (a,b,c).
325X,Y on the right are meta-symbols for buffers A,B,C.
326A,B,C on the right denote the working buffers A,B,C, respectively."
327 "The tail of the full-help message.")
328
329(defconst ediff-long-help-message-compare3
330 "
331p,DEL -previous diff | | -vert/horiz split | xy -copy buf X's region to Y
332n,SPC -next diff | h -hiliting | rx -restore buf X's old diff
333 j -jump to diff | @ -auto-refinement | * -refine current region
334 gx -goto X's point| | ! -update diff regions
335 C-l -recenter | ## -ignore whitespace |
336 v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X
337 </> -scroll lt/rt | X -read-only in buf X | wd -save diff output
338 | m -wide display | ~ -rotate buffers
339"
340 "Help message usually used for 3-way comparison.
341Normally, not a user option. See `ediff-help-message' for details.")
342
343(defconst ediff-long-help-message-compare2
344 "
345p,DEL -previous diff | | -vert/horiz split |a/b -copy A/B's region to B/A
346n,SPC -next diff | h -hiliting | rx -restore buf X's old diff
347 j -jump to diff | @ -auto-refinement | * -refine current region
348 gx -goto X's point| | ! -update diff regions
349 C-l -recenter | ## -ignore whitespace |
350 v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X
351 </> -scroll lt/rt | X -read-only in buf X | wd -save diff output
352 ~ -swap variants | m -wide display |
353"
354 "Help message usually used for 2-way comparison.
355Normally, not a user option. See `ediff-help-message' for details.")
356
357(defconst ediff-long-help-message-narrow2
358 "
359p,DEL -previous diff | | -vert/horiz split |a/b -copy A/B's region to B/A
360n,SPC -next diff | h -hiliting | rx -restore buf X's old diff
361 j -jump to diff | @ -auto-refinement | * -refine current region
362 gx -goto X's point| % -narrow/widen buffs | ! -update diff regions
363 C-l -recenter | ## -ignore whitespace |
364 v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X
365 </> -scroll lt/rt | X -read-only in buf X | wd -save diff output
366 ~ -swap variants | m -wide display |
367"
368 "Help message when comparing windows or regions line-by-line.
369Normally, not a user option. See `ediff-help-message' for details.")
370
371(defconst ediff-long-help-message-word-mode
372 "
373p,DEL -previous diff | | -vert/horiz split | xy -copy buf X's region to Y
374n,SPC -next diff | h -hiliting | rx -restore buf X's old diff
375 j -jump to diff | |
376 gx -goto X's point| % -narrow/widen buffs | ! -recompute diffs
377 C-l -recenter | |
378 v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X
379 </> -scroll lt/rt | X -read-only in buf X | wd -save diff output
380 ~ -swap variants | m -wide display |
381"
382 "Help message when comparing windows or regions word-by-word.
383Normally, not a user option. See `ediff-help-message' for details.")
384
385(defconst ediff-long-help-message-merge
386 "
387p,DEL -previous diff | | -vert/horiz split | x -copy buf X's region to C
388n,SPC -next diff | h -hiliting | r -restore buf C's old diff
389 j -jump to diff | @ -auto-refinement | * -refine current region
390 gx -goto X's point| ## -ignore whitespace | ! -update diff regions
391 C-l -recenter | #f/#h -focus/hide regions | + -combine diff regions
392 v/V -scroll up/dn | X -read-only in buf X | wx -save buf X
393 </> -scroll lt/rt | m -wide display | wd -save diff output
394 ~ -swap variants | s -shrink window C | / -show ancestor buff
395 | $ -show clashes only | & -merge w/new default
396"
397 "Help message during merging.
398Normally, not a user option. See `ediff-help-message' for details.")
399
400;; The actual long help message.
401(ediff-defvar-local ediff-long-help-message ""
402 "Normally, not a user option. See `ediff-help-message' for details.")
403
404(defconst ediff-brief-message-string
405 " ? - help "
406 "Contents of the brief help message.")
407;; The actual brief help message
408(ediff-defvar-local ediff-brief-help-message ""
409 "Normally, not a user option. See `ediff-help-message' for details.")
410
411(ediff-defvar-local ediff-brief-help-message-function nil
412 "The brief help message that the user can customize.
413If the user sets this to a parameter-less function, Ediff will use it to
414produce the brief help message. This function must return a string.")
415(ediff-defvar-local ediff-long-help-message-function nil
416 "The long help message that the user can customize.
417See `ediff-brief-help-message-function' for more.")
418
419(defvar ediff-use-long-help-message nil
420 "*If t, Ediff displays a long help message. Short help message otherwise.")
421
422;; The actual help message.
423(ediff-defvar-local ediff-help-message ""
424 "The actual help message.
425Normally, the user shouldn't touch this. However, if you want Ediff to
426start up with different help messages for different jobs, you can change
427the value of this variable and the variables `ediff-help-message-*' in
428`ediff-startup-hook'.")
429
430;; Error messages
431(defconst ediff-KILLED-VITAL-BUFFER
432 "You have killed a vital Ediff buffer---you must leave Ediff now!")
433(defconst ediff-NO-DIFFERENCES
434 "Sorry, it is not my job to munch identical variants...")
435
436;; Selective browsing
437
438(ediff-defvar-local ediff-skip-diff-region-function 'ediff-show-all-diffs
439 "Function that determines the next/previous diff region to show.
440Should return t for regions to be ignored and nil otherwise.
441This function gets a region number as an argument. The region number
442is the one used internally by Ediff. It is 1 less than the number seen
443by the user.")
444
445(ediff-defvar-local ediff-hide-regexp-matches-function
446 'ediff-hide-regexp-matches
447 "Function to use in determining which regions to hide.
448See the documentation string of `ediff-hide-regexp-matches' for details.")
449(ediff-defvar-local ediff-focus-on-regexp-matches-function
450 'ediff-focus-on-regexp-matches
451 "Function to use in determining which regions to focus on.
452See the documentation string of `ediff-focus-on-regexp-matches' for details.")
453
454;; Regexp that determines buf A regions to focus on when skipping to diff
455(ediff-defvar-local ediff-regexp-focus-A "" "")
456;; Regexp that determines buf B regions to focus on when skipping to diff
457(ediff-defvar-local ediff-regexp-focus-B "" "")
458;; Regexp that determines buf C regions to focus on when skipping to diff
459(ediff-defvar-local ediff-regexp-focus-C "" "")
460;; connective that determines whether to focus regions that match both or
461;; one of the regexps
462(ediff-defvar-local ediff-focus-regexp-connective 'and "")
463
464;; Regexp that determines buf A regions to ignore when skipping to diff
465(ediff-defvar-local ediff-regexp-hide-A "" "")
466;; Regexp that determines buf B regions to ignore when skipping to diff
467(ediff-defvar-local ediff-regexp-hide-B "" "")
468;; Regexp that determines buf C regions to ignore when skipping to diff
469(ediff-defvar-local ediff-regexp-hide-C "" "")
470;; connective that determines whether to hide regions that match both or
471;; one of the regexps
472(ediff-defvar-local ediff-hide-regexp-connective 'and "")
473
474
475(defvar ediff-ange-ftp-ftp-name (if ediff-xemacs-p
476 'ange-ftp-ftp-path
477 'ange-ftp-ftp-name)
478 "Function ange-ftp uses to find out if file is remote.")
479
480
481;; Copying difference regions between buffers.
482(ediff-defvar-local ediff-killed-diffs-alist nil
483 "A list of killed diffs.
484A diff is saved here if it is replaced by a diff
485from another buffer. This alist has the form:
486\((num (buff-object . diff) (buff-object . diff) (buff-object . diff)) ...),
487where some buffer-objects may be missing.")
488
489
490;; Highlighting
491;;(defvar ediff-before-flag-bol (if ediff-emacs-p "->>\n" (make-glyph "->>\n"))
492(defvar ediff-before-flag-bol (if ediff-xemacs-p (make-glyph "->>") "->>")
493 "*Flag placed above the highlighted block of differences.
494Must end with newline.")
495;;(defvar ediff-after-flag-eol (if ediff-emacs-p "<<-\n" (make-glyph "<<-"))
496(defvar ediff-after-flag-eol (if ediff-xemacs-p (make-glyph "<<-") "<<-")
497 "*Flag placed below the highlighted block of differences.
498Must end with newline.")
499
500(defvar ediff-before-flag-mol (if ediff-xemacs-p (make-glyph "->>") "->>")
501 "*Like ediff-before-flag, used when a difference starts in mid-line.")
502(defvar ediff-after-flag-mol (if ediff-xemacs-p (make-glyph "<<-") "<<-")
503 "*Like ediff-after-flag, used when a difference starts in mid-line.")
504
505
506(ediff-defvar-local ediff-use-faces t
507 "If t, differences are highlighted using faces, if device supports faces.
508If nil, differences are highlighted using ASCII flags, ediff-before-flag
509and ediff-after-flag. On a non-window system, differences are always
510highlighted using ASCII flags.
511This variable can be set either in .emacs or toggled interactively.
512Use `setq-default' if setting it in .emacs")
513
514(defvar ediff-force-faces nil
515 "If t, Ediff will think that it is running on a display that supports faces.
516This is provided as a temporary relief for users of face-capable displays
517that Ediff doesn't know about.")
518
519
520;; this indicates that diff regions are word-size, so fine diffs are
521;; permanently nixed; used in ediff-windows-wordwise and ediff-regions-wordwise
522(ediff-defvar-local ediff-word-mode nil "")
523;; Name of the job (ediff-files, ediff-windows, etc.)
524(ediff-defvar-local ediff-job-name nil "")
525
526;; Narrowing and ediff-region/windows support
527;; This is a list (overlay-A overlay-B overlay-C)
528;; If set, Ediff compares only those parts of buffers A/B/C that lie within
529;; the bounds of these overlays.
530(ediff-defvar-local ediff-narrow-bounds nil "")
531
532;; List (overlay-A overlay-B overlay-C), where each overlay spans the
533;; entire corresponding buffer.
534(ediff-defvar-local ediff-wide-bounds nil "")
535
536;; Current visibility boundaries in buffers A, B, and C.
537;; This is also a list of overlays. When the user toggles narrow/widen,
538;; this list changes from ediff-wide-bounds to ediff-narrow-bounds.
539;; and back.
540(ediff-defvar-local ediff-visible-bounds nil "")
541
542(ediff-defvar-local ediff-start-narrowed t
543 "Non-nil means start narrowed, if doing ediff-windows-* or ediff-regions-*")
544(ediff-defvar-local ediff-quit-widened t
545 "*Non-nil means: when finished, Ediff widens buffers A/B.
546Actually, Ediff restores the scope of visibility that existed at startup.")
547(defvar ediff-keep-variants t
548 "*Nil means that non-modified variant buffers should be removed after some
549interrogation.
550Supplying a prefix argument to the quit command `q' temporarily reverses the
551meaning of this variable.")
552
553(ediff-defvar-local ediff-highlight-all-diffs t
554 "If nil, only the selected differences are highlighted.
555This variable can be set either in .emacs or toggled interactively, using
556ediff-toggle-hilit. Use `setq-default' to set it.")
557
558;; A var local to each control panel buffer. Indicates highlighting style
559;; in effect for this buffer: `face', `ascii', nil -- temporarily
560;; unhighlighted, `off' -- turned off \(on a dumb terminal only\).
561(ediff-defvar-local ediff-highlighting-style nil "")
562
563
564;; Variables that control each Ediff session. They are local to the
565;; control buffer.
566
567;; Mode variables
568;; The buffer in which the A variant is stored.
569(ediff-defvar-local ediff-buffer-A nil "")
570;; The buffer in which the B variant is stored.
571(ediff-defvar-local ediff-buffer-B nil "")
572;; The buffer in which the C variant is stored.
573(ediff-defvar-local ediff-buffer-C nil "")
574;; Ancestor buffer
575(ediff-defvar-local ediff-ancestor-buffer nil "")
576;; The control buffer of ediff.
577(ediff-defvar-local ediff-control-buffer nil "")
578
579
580;; The suffix of the control buffer name.
581(ediff-defvar-local ediff-control-buffer-suffix nil "")
582;; Same as ediff-control-buffer-suffix, but without <,>.
583;; It's a number rather than string.
584(ediff-defvar-local ediff-control-buffer-number nil "")
585
586
587;; The original values of ediff-protected-variables for buffer A
588(ediff-defvar-local ediff-buffer-values-orig-A nil "")
589;; The original values of ediff-protected-variables for buffer B
590(ediff-defvar-local ediff-buffer-values-orig-B nil "")
591;; The original values of ediff-protected-variables for buffer C
592(ediff-defvar-local ediff-buffer-values-orig-C nil "")
593;; The original values of ediff-protected-variables for buffer Ancestor
594(ediff-defvar-local ediff-buffer-values-orig-Ancestor nil "")
595;; Buffer-local variables to be saved then restored during Ediff sessions
596;; Buffer-local variables to be saved then restored during Ediff sessions
597(defconst ediff-protected-variables '(buffer-read-only
598;;; synchronize-minibuffers
599 mode-line-format))
600
601;; Vector of differences between the variants. Each difference is
602;; represented by a vector of two overlays plus a vector of fine diffs,
603;; plus a no-fine-diffs flag. The first overlay spans the
604;; difference region in the A buffer and the second overlays the diff in
605;; the B buffer. If a difference section is empty, the corresponding
606;; overlay's endpoints coincide.
607;;
608;; The precise form of a difference vector for one buffer is:
609;; [diff diff diff ...]
610;; where each diff has the form:
611;; [diff-overlay fine-diff-vector no-fine-diffs-flag state-of-difference]
612;; fine-diff-vector is a vector [fine-diff-overlay fine-diff-overlay ...]
613;; no-fine-diffs-flag says if there are fine differences.
614;; state-of-difference is A, B, C, or nil, indicating which buffer is
615;; different from the other two (used only in 3-way jobs.
616(ediff-defvar-local ediff-difference-vector-A nil "")
617(ediff-defvar-local ediff-difference-vector-B nil "")
618(ediff-defvar-local ediff-difference-vector-C nil "")
619(ediff-defvar-local ediff-difference-vector-Ancestor nil "")
620
621;; [ status status status ...]
622;; Each status: [state-of-merge state-of-ancestor]
623;; state-of-merge is default-A, default-B, prefer-A, or prefer-B. It
624;; indicates the way a diff region was created in buffer C.
625;; state-of-ancestor says if the corresponding region in ancestor buffer is
626;; empty.
627(ediff-defvar-local ediff-state-of-merge nil "")
628
629;; The difference that is currently selected.
630(ediff-defvar-local ediff-current-difference -1 "")
631;; Number of differences found.
632(ediff-defvar-local ediff-number-of-differences nil "")
633
634;; Buffer containing the output of diff, which is used by Ediff to step
635;; through files.
636(ediff-defvar-local ediff-diff-buffer nil "")
637;; Like ediff-diff-buffer, but contains context diff. It is not used by
638;; Ediff, but it is saved in a file, if user requests so.
639(ediff-defvar-local ediff-custom-diff-buffer nil "")
640;; Buffer used for diff-style fine differences between regions.
641(ediff-defvar-local ediff-fine-diff-buffer nil "")
642;; Temporary buffer used for computing fine differences.
643(defconst ediff-tmp-buffer " *ediff-tmp*" "")
644;; Buffer used for messages
645(defconst ediff-msg-buffer " *ediff-message*" "")
646;; Buffer containing the output of diff when diff returns errors.
647(ediff-defvar-local ediff-error-buffer nil "")
648;; Buffer to display debug info
649(ediff-defvar-local ediff-debug-buffer "*ediff-debug*" "")
650
651;; List of ediff control panels associated with each buffer A/B/C/Ancestor.
652;; Not used any more, but may be needed in the future.
653(ediff-defvar-local ediff-this-buffer-ediff-sessions nil "")
654
655;; to be deleted in due time
656;; List of difference overlays disturbed by working with the current diff.
657(defvar ediff-disturbed-overlays nil "")
658
659;; Priority of non-selected overlays.
660(defvar ediff-shadow-overlay-priority 100 "")
661
662(defvar ediff-version-control-package 'vc
663 "Version control package used.
664Currently, Ediff supports vc.el, rcs.el, pcl-cvs.el, and generic-sc.el. The
665standard Emacs interface to RCS, CVS, SCCS, etc., is vc.el. However, some
666people find the other two packages more convenient. Set this variable to the
667appropriate symbol: `rcs', `pcl-cvs', or `generic-sc' if you so desire.")
668
669
670(if ediff-xemacs-p
671 (progn
672 (fset 'ediff-read-event (symbol-function 'next-command-event))
673 (fset 'ediff-overlayp (symbol-function 'extentp))
674 (fset 'ediff-make-overlay (symbol-function 'make-extent))
675 (fset 'ediff-delete-overlay (symbol-function 'delete-extent)))
676 (fset 'ediff-read-event (symbol-function 'read-event))
677 (fset 'ediff-overlayp (symbol-function 'overlayp))
678 (fset 'ediff-overlayp (symbol-function 'overlayp))
679 (fset 'ediff-make-overlay (symbol-function 'make-overlay))
680 (fset 'ediff-delete-overlay (symbol-function 'delete-overlay)))
681
682;; Check the current version against the major and minor version numbers
683;; using op: cur-vers op major.minor If emacs-major-version or
684;; emacs-minor-version are not defined, we assume that the current version
685;; is hopelessly outdated. We assume that emacs-major-version and
686;; emacs-minor-version are defined. Otherwise, for Emacs/XEmacs 19, if the
687;; current minor version is < 10 (xemacs) or < 23 (emacs) the return value
688;; will be nil (when op is =, >, or >=) and t (when op is <, <=), which may be
689;; incorrect. However, this gives correct result in our cases, since we are
690;; testing for sufficiently high Emacs versions.
691(defun ediff-check-version (op major minor &optional type-of-emacs)
692 (if (and (boundp 'emacs-major-version) (boundp 'emacs-minor-version))
693 (and (cond ((eq type-of-emacs 'xemacs) ediff-xemacs-p)
694 ((eq type-of-emacs 'emacs) ediff-emacs-p)
695 (t t))
696 (cond ((eq op '=) (and (= emacs-minor-version minor)
697 (= emacs-major-version major)))
698 ((memq op '(> >= < <=))
699 (and (or (funcall op emacs-major-version major)
700 (= emacs-major-version major))
701 (if (= emacs-major-version major)
702 (funcall op emacs-minor-version minor)
703 t)))
704 (t
705 (error "%S: Invalid op in ediff-check-version" op))))
706 (cond ((memq op '(= > >=)) nil)
707 ((memq op '(< <=)) t))))
708
709
710;;;; warn if it is a wrong version of emacs
711;;(if (or (ediff-check-version '< 19 29 'emacs)
712;; (ediff-check-version '< 19 12 'xemacs))
713;; (progn
714;; (with-output-to-temp-buffer ediff-msg-buffer
715;; (switch-to-buffer ediff-msg-buffer)
716;; (insert
717;; (format "
718;;
719;;This version of Ediff requires
720;;
721;;\t Emacs 19.29 and higher
722;;\t OR
723;;\t XEmacs 19.12 and higher
724;;
725;;It is unlikely to work under Emacs version %s
726;;that you are using... " emacs-version))
727;; (if noninteractive
728;; ()
729;; (beep 1)
730;; (beep 1)
731;; (insert "\n\nType any key to continue...")
732;; (ediff-read-event)))
733;; (kill-buffer ediff-msg-buffer)))
734
735;; A fix for NeXT Step
736;; Should probably be eliminated in later versions.
737(if (and (ediff-window-display-p) (eq (ediff-device-type) 'ns))
738 (progn
739 (fset 'x-display-color-p (symbol-function 'ns-display-color-p))
740 (fset 'x-color-defined-p (symbol-function 'ns-color-defined-p))
741 (fset 'x-display-pixel-height (symbol-function 'ns-display-pixel-height))
742 (fset 'x-display-pixel-width (symbol-function 'ns-display-pixel-width))
743 ))
744
745
746(defsubst ediff-color-display-p ()
747 (if ediff-emacs-p
748 (x-display-color-p)
749 (eq (device-class (selected-device)) 'color)))
750
751
752(if (ediff-has-face-support-p)
753 (if ediff-xemacs-p
754 (progn
755 (fset 'ediff-valid-color-p (symbol-function 'valid-color-name-p))
756 (fset 'ediff-get-face (symbol-function 'get-face)))
757 ;; Temporary fix for OS/2 port of Emacs
758 ;; pm-win.el in PM-Emacs should be fixed.
759 (if (eq (ediff-device-type) 'pm)
760 (fset 'ediff-valid-color-p
761 (function (lambda (color) (assoc color pm-color-alist))))
762 (fset 'ediff-valid-color-p (symbol-function 'x-color-defined-p)))
763 (fset 'ediff-get-face (symbol-function 'internal-get-face))))
764
765(if (ediff-window-display-p)
766 (if ediff-xemacs-p
767 (progn
768 (fset 'ediff-display-pixel-width
769 (symbol-function 'device-pixel-width))
770 (fset 'ediff-display-pixel-height
771 (symbol-function 'device-pixel-height)))
772 (fset 'ediff-display-pixel-width
773 (symbol-function 'x-display-pixel-width))
774 (fset 'ediff-display-pixel-height
775 (symbol-function 'x-display-pixel-height))))
776
777
778(defun ediff-make-current-diff-overlay (type)
779 (if (ediff-has-face-support-p)
780 (let ((overlay (intern (format "ediff-current-diff-overlay-%S" type)))
781 (buffer (ediff-get-buffer type))
782 (face (face-name
783 (symbol-value
784 (intern (format "ediff-current-diff-face-%S" type))))))
785 (set overlay
786 (ediff-make-bullet-proof-overlay (point-max) (point-max) buffer))
787 (ediff-set-overlay-face (symbol-value overlay) face)
788 (ediff-overlay-put (symbol-value overlay) 'ediff ediff-control-buffer))
789 ))
790
791(defun ediff-set-overlay-face (extent face)
792 (ediff-overlay-put extent 'face face)
793 (ediff-overlay-put extent 'help-echo 'ediff-region-help-echo))
794
795;; This does nothing in Emacs, since overlays there have no help-echo property
796(defun ediff-region-help-echo (extent)
797 (let ((is-current (ediff-overlay-get extent 'ediff))
798 (face (ediff-overlay-get extent 'face))
799 (diff-num (ediff-overlay-get extent 'ediff-diff-num))
800 face-help help-msg)
801
802 ;; This happens only for refinement overlays
803 (setq face-help (and face (get face 'ediff-help-echo)))
804
805 (setq help-msg
806 (cond ((and is-current diff-num) ; current diff region
807 (format "Difference region %S -- current" (1+ diff-num)))
808 (face-help) ; refinement of current diff region
809 (diff-num ; non-current
810 (format "Difference region %S -- non-current" (1+ diff-num)))
811 (t ""))))) ; none
812
813(defun ediff-set-face (ground face color)
814 "Set face foreground/background."
815 (if (ediff-has-face-support-p)
816 (if (ediff-valid-color-p color)
817 (if (eq ground 'foreground)
818 (set-face-foreground face color)
819 (set-face-background face color))
820 (cond ((memq face
821 '(ediff-current-diff-face-A
822 ediff-current-diff-face-B
823 ediff-current-diff-face-C
824 ediff-current-diff-face-Ancestor))
825 (copy-face 'highlight face))
826 ((memq face
827 '(ediff-fine-diff-face-A
828 ediff-fine-diff-face-B
829 ediff-fine-diff-face-C
830 ediff-fine-diff-face-Ancestor))
831 (copy-face 'secondary-selection face)
832 (set-face-underline-p face t))
833 ((memq face
834 '(ediff-even-diff-face-A
835 ediff-odd-diff-face-A
836 ediff-even-diff-face-B ediff-odd-diff-face-B
837 ediff-even-diff-face-C ediff-odd-diff-face-C
838 ediff-even-diff-face-Ancestor
839 ediff-odd-diff-face-Ancestor))
840 (copy-face 'secondary-selection face))))
841 ))
842
843(defun ediff-hide-face (face)
844 (if (and (ediff-has-face-support-p) ediff-emacs-p)
845 (add-to-list 'facemenu-unlisted-faces face)))
846
847(defvar ediff-current-diff-face-A
848 (if (ediff-has-face-support-p)
849 (progn
850 (make-face 'ediff-current-diff-face-A)
851 (ediff-hide-face 'ediff-current-diff-face-A)
852 (or (face-differs-from-default-p 'ediff-current-diff-face-A)
853 (cond ((ediff-color-display-p)
854 (ediff-set-face
855 'foreground 'ediff-current-diff-face-A "firebrick")
856 (ediff-set-face
857 'background 'ediff-current-diff-face-A "pale green"))
858 (t
859 (if ediff-xemacs-p
860 (copy-face 'modeline 'ediff-current-diff-face-A)
861 (copy-face 'highlight 'ediff-current-diff-face-A))
862 )))
863 'ediff-current-diff-face-A))
864 "Face for highlighting the selected difference in buffer A.")
865
866(defvar ediff-current-diff-face-B
867 (if (ediff-has-face-support-p)
868 (progn
869 (make-face 'ediff-current-diff-face-B)
870 (ediff-hide-face 'ediff-current-diff-face-B)
871 (or (face-differs-from-default-p 'ediff-current-diff-face-B)
872 (cond ((ediff-color-display-p)
873 (ediff-set-face
874 'foreground 'ediff-current-diff-face-B "DarkOrchid")
875 (ediff-set-face
876 'background 'ediff-current-diff-face-B "Yellow"))
877 (t
878 (if ediff-xemacs-p
879 (copy-face 'modeline 'ediff-current-diff-face-B)
880 (copy-face 'highlight 'ediff-current-diff-face-B))
881 )))
882 'ediff-current-diff-face-B))
883 "Face for highlighting the selected difference in buffer B.")
884
885
886(defvar ediff-current-diff-face-C
887 (if (ediff-has-face-support-p)
888 (progn
889 (make-face 'ediff-current-diff-face-C)
890 (ediff-hide-face 'ediff-current-diff-face-C)
891 (or (face-differs-from-default-p 'ediff-current-diff-face-C)
892 (cond ((ediff-color-display-p)
893 (ediff-set-face
894 'foreground 'ediff-current-diff-face-C "Navy")
895 (ediff-set-face
896 'background 'ediff-current-diff-face-C "Pink"))
897 (t
898 (if ediff-xemacs-p
899 (copy-face 'modeline 'ediff-current-diff-face-C)
900 (copy-face 'highlight 'ediff-current-diff-face-C))
901 )))
902 'ediff-current-diff-face-C))
903 "Face for highlighting the selected difference in buffer C.")
904
905(defvar ediff-current-diff-face-Ancestor
906 (if (ediff-has-face-support-p)
907 (progn
908 (make-face 'ediff-current-diff-face-Ancestor)
909 (ediff-hide-face 'ediff-current-diff-face-Ancestor)
910 (or (face-differs-from-default-p 'ediff-current-diff-face-Ancestor)
911 (copy-face
912 'ediff-current-diff-face-C 'ediff-current-diff-face-Ancestor))))
913 "Face for highlighting the selected difference in the ancestor buffer.")
914
915(defvar ediff-fine-diff-face-A
916 (if (ediff-has-face-support-p)
917 (progn
918 (make-face 'ediff-fine-diff-face-A)
919 (ediff-hide-face 'ediff-fine-diff-face-A)
920 (or (face-differs-from-default-p 'ediff-fine-diff-face-A)
921 (cond ((ediff-color-display-p)
922 (ediff-set-face 'foreground 'ediff-fine-diff-face-A
923 "Navy")
924 (ediff-set-face 'background 'ediff-fine-diff-face-A
925 "sky blue"))
926 (t (set-face-underline-p 'ediff-fine-diff-face-A t))))
927 'ediff-fine-diff-face-A))
928 "Face for highlighting the refinement of the selected diff in buffer A.")
929
930(defvar ediff-fine-diff-face-B
931 (if (ediff-has-face-support-p)
932 (progn
933 (make-face 'ediff-fine-diff-face-B)
934 (ediff-hide-face 'ediff-fine-diff-face-B)
935 (or (face-differs-from-default-p 'ediff-fine-diff-face-B)
936 (cond ((ediff-color-display-p)
937 (ediff-set-face 'foreground 'ediff-fine-diff-face-B "Black")
938 (ediff-set-face 'background 'ediff-fine-diff-face-B "cyan"))
939 (t (set-face-underline-p 'ediff-fine-diff-face-B t))))
940 'ediff-fine-diff-face-B))
941 "Face for highlighting the refinement of the selected diff in buffer B.")
942
943(defvar ediff-fine-diff-face-C
944 (if (ediff-has-face-support-p)
945 (progn
946 (make-face 'ediff-fine-diff-face-C)
947 (ediff-hide-face 'ediff-fine-diff-face-C)
948 (or (face-differs-from-default-p 'ediff-fine-diff-face-C)
949 (cond ((ediff-color-display-p)
950 (ediff-set-face 'foreground 'ediff-fine-diff-face-C "black")
951 (ediff-set-face
952 'background 'ediff-fine-diff-face-C "Turquoise"))
953 (t (set-face-underline-p 'ediff-fine-diff-face-C t))))
954 'ediff-fine-diff-face-C))
955 "Face for highlighting the refinement of the selected diff in buffer C.")
956
957(defvar ediff-fine-diff-face-Ancestor
958 (if (ediff-has-face-support-p)
959 (progn
960 (make-face 'ediff-fine-diff-face-Ancestor)
961 (ediff-hide-face 'ediff-fine-diff-face-Ancestor)
962 (or (face-differs-from-default-p 'ediff-fine-diff-face-Ancestor)
963 (copy-face
964 'ediff-fine-diff-face-C 'ediff-fine-diff-face-Ancestor))))
965 "Face highlighting refinements of the selected diff in ancestor buffer.
966Presently, this is not used, as difference regions are not refined in the
967ancestor buffer.")
968
969(defvar ediff-even-diff-face-A
970 (if (ediff-has-face-support-p)
971 (progn
972 (make-face 'ediff-even-diff-face-A)
973 (ediff-hide-face 'ediff-even-diff-face-A)
974 (or (face-differs-from-default-p 'ediff-even-diff-face-A)
975 (cond ((ediff-color-display-p)
976 (ediff-set-face
977 'foreground 'ediff-even-diff-face-A "black")
978 (ediff-set-face
979 'background 'ediff-even-diff-face-A "light grey"))
980 (t
981 (copy-face 'italic 'ediff-even-diff-face-A))))
982 'ediff-even-diff-face-A))
983 "Face used to highlight even-numbered differences in buffer A.")
984
985(defvar ediff-even-diff-face-B
986 (if (ediff-has-face-support-p)
987 (progn
988 (make-face 'ediff-even-diff-face-B)
989 (ediff-hide-face 'ediff-even-diff-face-B)
990 (or (face-differs-from-default-p 'ediff-even-diff-face-B)
991 (cond ((ediff-color-display-p)
992 (ediff-set-face
993 'foreground 'ediff-even-diff-face-B "White")
994 (ediff-set-face
995 'background 'ediff-even-diff-face-B "Gray"))
996 (t
997 (copy-face 'italic 'ediff-even-diff-face-B))))
998 'ediff-even-diff-face-B))
999 "Face used to highlight even-numbered differences in buffer B.")
1000
1001(defvar ediff-even-diff-face-C
1002 (if (ediff-has-face-support-p)
1003 (progn
1004 (make-face 'ediff-even-diff-face-C)
1005 (ediff-hide-face 'ediff-even-diff-face-C)
1006 (or (face-differs-from-default-p 'ediff-even-diff-face-C)
1007 (copy-face 'ediff-even-diff-face-A 'ediff-even-diff-face-C))
1008 'ediff-even-diff-face-C))
1009 "Face used to highlight even-numbered differences in buffer C.")
1010
1011(defvar ediff-even-diff-face-Ancestor
1012 (if (ediff-has-face-support-p)
1013 (progn
1014 (make-face 'ediff-even-diff-face-Ancestor)
1015 (ediff-hide-face 'ediff-even-diff-face-Ancestor)
1016 (or (face-differs-from-default-p 'ediff-even-diff-face-Ancestor)
1017 (copy-face 'ediff-even-diff-face-C 'ediff-even-diff-face-Ancestor))
1018 'ediff-even-diff-face-Ancestor))
1019 "Face highlighting even-numbered differences in the ancestor buffer.")
1020
1021(defvar ediff-odd-diff-face-A
1022 (if (ediff-has-face-support-p)
1023 (progn
1024 (make-face 'ediff-odd-diff-face-A)
1025 (ediff-hide-face 'ediff-odd-diff-face-A)
1026 (or (face-differs-from-default-p 'ediff-odd-diff-face-A)
1027 (cond ((ediff-color-display-p)
1028 (ediff-set-face
1029 'foreground 'ediff-odd-diff-face-A "White")
1030 (ediff-set-face
1031 'background 'ediff-odd-diff-face-A "Gray"))
1032 (t
1033 (copy-face 'italic 'ediff-odd-diff-face-A))))
1034 'ediff-odd-diff-face-A))
1035 "Face used to highlight odd-numbered differences in buffer A.")
1036
1037(defvar ediff-odd-diff-face-B
1038 (if (ediff-has-face-support-p)
1039 (progn
1040 (make-face 'ediff-odd-diff-face-B)
1041 (ediff-hide-face 'ediff-odd-diff-face-B)
1042 (or (face-differs-from-default-p 'ediff-odd-diff-face-B)
1043 (cond ((ediff-color-display-p)
1044 (ediff-set-face
1045 'foreground 'ediff-odd-diff-face-B "Black")
1046 (ediff-set-face
1047 'background 'ediff-odd-diff-face-B "light grey"))
1048 (t
1049 (copy-face 'italic 'ediff-odd-diff-face-B))))
1050 'ediff-odd-diff-face-B))
1051 "Face used to highlight odd-numbered differences in buffer B.")
1052
1053(defvar ediff-odd-diff-face-C
1054 (if (ediff-has-face-support-p)
1055 (progn
1056 (make-face 'ediff-odd-diff-face-C)
1057 (ediff-hide-face 'ediff-odd-diff-face-C)
1058 (or (face-differs-from-default-p 'ediff-odd-diff-face-C)
1059 (copy-face 'ediff-odd-diff-face-A 'ediff-odd-diff-face-C))
1060 'ediff-odd-diff-face-C))
1061 "Face used to highlight odd-numbered differences in buffer C.")
1062
1063(defvar ediff-odd-diff-face-Ancestor
1064 (if (ediff-has-face-support-p)
1065 (progn
1066 (make-face 'ediff-odd-diff-face-Ancestor)
1067 (ediff-hide-face 'ediff-odd-diff-face-Ancestor)
1068 (or (face-differs-from-default-p 'ediff-odd-diff-face-Ancestor)
1069 (copy-face 'ediff-odd-diff-face-C 'ediff-odd-diff-face-Ancestor))
1070 'ediff-odd-diff-face-Ancestor))
1071 "Face used to highlight even-numbered differences in the ancestor buffer.")
1072
1073;; Help echo
1074(put 'ediff-fine-diff-face-A 'ediff-help-echo
1075 "A `refinement' of the current difference region")
1076(put 'ediff-fine-diff-face-B 'ediff-help-echo
1077 "A `refinement' of the current difference region")
1078(put 'ediff-fine-diff-face-C 'ediff-help-echo
1079 "A `refinement' of the current difference region")
1080(put 'ediff-fine-diff-face-Ancestor 'ediff-help-echo
1081 "A `refinement' of the current difference region")
1082
1083
1084;;; Overlays
1085
1086(ediff-defvar-local ediff-current-diff-overlay-A nil
1087 "Overlay for the current difference region in buffer A.")
1088(ediff-defvar-local ediff-current-diff-overlay-B nil
1089 "Overlay for the current difference region in buffer B.")
1090(ediff-defvar-local ediff-current-diff-overlay-C nil
1091 "Overlay for the current difference region in buffer C.")
1092(ediff-defvar-local ediff-current-diff-overlay-Ancestor nil
1093 "Overlay for the current difference region in the ancestor buffer.")
1094
1095;; Compute priority of ediff overlay.
1096(defun ediff-highest-priority (start end buffer)
1097 (let ((pos (max 1 (1- start)))
1098 ovr-list)
1099 (if ediff-xemacs-p
1100 (1+ ediff-shadow-overlay-priority)
1101 (ediff-eval-in-buffer buffer
1102 (while (< pos (min (point-max) (1+ end)))
1103 (setq ovr-list (append (overlays-at pos) ovr-list))
1104 (setq pos (next-overlay-change pos)))
1105 (1+ (apply '+
1106 (mapcar (function
1107 (lambda (ovr)
1108 (if ovr
1109 (or (ediff-overlay-get ovr 'priority) 0)
1110 0)))
1111 ovr-list)
1112 ))
1113 ))))
1114
1115
1116(defvar ediff-toggle-read-only-function nil
1117 "*Specifies the function to be used to toggle read-only.
1118If nil, Ediff tries to deduce the function from the binding of C-x C-q.
1119Normally, this is the `toggle-read-only' function, but, if version
1120control is used, it could be `vc-toggle-read-only' or `rcs-toggle-read-only'.")
1121
1122
1123;;; Misc
1124
1125;; if nil, this silences some messages
1126(defconst ediff-verbose-p t)
1127
1128(defvar ediff-no-emacs-help-in-control-buffer nil
1129 "*Non-nil means C-h should not invoke Emacs help in control buffer.
1130Instead, C-h jumps to previous difference.")
1131
1132(defvar ediff-temp-file-prefix
1133 (let ((env (or (getenv "TMPDIR")
1134 (getenv "TMP")
1135 (getenv "TEMP")))
1136 d)
1137 (setq d (if (and env (> (length env) 0))
1138 env
1139 (cond ((memq system-type '(vax-vms axp-vms)) "SYS$SCRATCH:")
1140 ((eq system-type 'ms-dos) "c:/")
1141 (t "/tmp"))))
1142 ;; The following is to make sure we get something to which we can
1143 ;; add directory levels on VMS.
1144 (setq d (file-name-as-directory (directory-file-name d)))
1145 )
1146 "*Prefix to put on Ediff temporary file names.
1147Do not start with `~/' or `~user-name/'.")
1148
1149(defvar ediff-temp-file-mode 384 ; u=rw only
1150 "*Mode for Ediff temporary files.")
1151
1152;; Metacharacters that have to be protected from the shell when executing
1153;; a diff/diff3 command.
1154(defvar ediff-metachars "[ \t\n!\"#$&'()*;<=>?[\\^`{|~]"
1155 "Characters that must be quoted with \\ when used in a shell command line.
1156More precisely, a regexp to match any one such character.")
1157
1158;; needed to simulate frame-char-width in XEmacs.
1159(defvar ediff-H-glyph (if ediff-xemacs-p (make-glyph "H")))
1160
1161
1162(ediff-defvar-local ediff-temp-file-A nil
1163 "Temporary file used for refining difference regions in buffer A.")
1164(ediff-defvar-local ediff-temp-file-B nil
1165 "Temporary file used for refining difference regions in buffer B.")
1166(ediff-defvar-local ediff-temp-file-C nil
1167 "Temporary file used for refining difference regions in buffer C.")
1168
1169;;; In-line functions
1170
1171(defsubst ediff-file-remote-p (file-name)
1172 (if (fboundp ediff-ange-ftp-ftp-name)
1173 (funcall ediff-ange-ftp-ftp-name file-name)))
1174
1175
1176(defsubst ediff-frame-unsplittable-p (frame)
1177 (cdr (assq 'unsplittable (frame-parameters frame))))
1178
1179(defsubst ediff-get-next-window (wind prev-wind)
1180 (or (window-live-p wind)
1181 (setq wind (if prev-wind
1182 (next-window wind)
1183 (selected-window)))))
1184
1185
1186(defsubst ediff-kill-buffer-carefully (buf)
1187 "Kill buffer BUF if it exists."
1188 (if (ediff-buffer-live-p buf)
1189 (kill-buffer (get-buffer buf))))
1190
1191
1192(defsubst ediff-highlight-diff (n)
1193 "Put face on diff N. Invoked for X displays only."
1194 (ediff-highlight-diff-in-one-buffer n 'A)
1195 (ediff-highlight-diff-in-one-buffer n 'B)
1196 (ediff-highlight-diff-in-one-buffer n 'C)
1197 (ediff-highlight-diff-in-one-buffer n 'Ancestor)
1198 )
1199
1200
1201(defsubst ediff-unhighlight-diff ()
1202 "Remove overlays from buffers A, B, and C."
1203 (ediff-unhighlight-diff-in-one-buffer 'A)
1204 (ediff-unhighlight-diff-in-one-buffer 'B)
1205 (ediff-unhighlight-diff-in-one-buffer 'C)
1206 (ediff-unhighlight-diff-in-one-buffer 'Ancestor)
1207 )
1208
1209;; delete highlighting overlays, restore faces to their original form
1210(defsubst ediff-unhighlight-diffs-totally ()
1211 (ediff-unhighlight-diffs-totally-in-one-buffer 'A)
1212 (ediff-unhighlight-diffs-totally-in-one-buffer 'B)
1213 (ediff-unhighlight-diffs-totally-in-one-buffer 'C)
1214 (ediff-unhighlight-diffs-totally-in-one-buffer 'Ancestor)
1215 )
1216
1217(defsubst ediff-background-face (buf-type dif-num)
1218 ;; The value of dif-num is always 1- the one that user sees.
1219 ;; This is why even face is used when dif-num is odd.
1220 (intern (format (if (ediff-odd-p dif-num)
1221 "ediff-even-diff-face-%S"
1222 "ediff-odd-diff-face-%S")
1223 buf-type)))
1224
1225
1226;; arg is a record for a given diff in a difference vector
1227;; this record is itself a vector
1228(defsubst ediff-clear-fine-diff-vector (diff-record)
1229 (if diff-record
1230 (mapcar 'ediff-delete-overlay
1231 (ediff-get-fine-diff-vector-from-diff-record diff-record))))
1232
1233(defsubst ediff-clear-fine-differences-in-one-buffer (n buf-type)
1234 (ediff-clear-fine-diff-vector (ediff-get-difference n buf-type))
1235 (ediff-set-fine-diff-vector n buf-type nil))
1236
1237(defsubst ediff-clear-fine-differences (n)
1238 (ediff-clear-fine-differences-in-one-buffer n 'A)
1239 (ediff-clear-fine-differences-in-one-buffer n 'B)
1240 (if ediff-3way-job
1241 (ediff-clear-fine-differences-in-one-buffer n 'C)))
1242
1243
1244(defsubst ediff-convert-fine-diffs-to-overlays (diff-list region-num)
1245 (ediff-set-fine-overlays-in-one-buffer 'A diff-list region-num)
1246 (ediff-set-fine-overlays-in-one-buffer 'B diff-list region-num)
1247 (if ediff-3way-job
1248 (ediff-set-fine-overlays-in-one-buffer 'C diff-list region-num)
1249 ))
1250
1251(defsubst ediff-mouse-event-p (event)
1252 (if ediff-xemacs-p
1253 (button-event-p event)
1254 (string-match "mouse" (format "%S" (event-basic-type event)))
1255 ))
1256
1257
1258(defsubst ediff-key-press-event-p (event)
1259 (if ediff-xemacs-p
1260 (key-press-event-p event)
1261 (or (char-or-string-p event) (symbolp event))))
1262
1263(defun ediff-event-point (event)
1264 (cond ((ediff-mouse-event-p event)
1265 (if ediff-xemacs-p
1266 (event-point event)
1267 (posn-point (event-start event))))
1268 ((ediff-key-press-event-p event)
1269 (point))
1270 (t (error))))
1271
1272(defun ediff-event-buffer (event)
1273 (cond ((ediff-mouse-event-p event)
1274 (if ediff-xemacs-p
1275 (event-buffer event)
1276 (window-buffer (posn-window (event-start event)))))
1277 ((ediff-key-press-event-p event)
1278 (current-buffer))
1279 (t (error))))
1280
1281
1282(defsubst ediff-frame-iconified-p (frame)
1283 (if (and (ediff-window-display-p) (frame-live-p frame))
1284 (if ediff-xemacs-p
1285 (frame-iconified-p frame)
1286 (eq (frame-visible-p frame) 'icon))))
1287
1288(defsubst ediff-window-visible-p (wind)
1289 ;; under TTY, window-live-p also means window is visible
1290 (and (window-live-p wind)
1291 (or (not (ediff-window-display-p))
1292 (frame-visible-p (window-frame wind)))))
1293
1294
1295(defsubst ediff-frame-char-width (frame)
1296 (if ediff-xemacs-p
1297 (/ (frame-pixel-width frame) (frame-width frame))
1298 (frame-char-width frame)))
1299
1300(defun ediff-reset-mouse (&optional frame do-not-grab-mouse)
1301 (or frame (setq frame (selected-frame)))
1302 (if (ediff-window-display-p)
1303 (let ((frame-or-wind frame))
1304 (if ediff-xemacs-p
1305 (setq frame-or-wind (frame-selected-window frame)))
1306 (or do-not-grab-mouse
1307 ;; don't set mouse if the user said to never do this
1308 (not ediff-grab-mouse)
1309 ;; Don't grab on quit, if the user doesn't want to.
1310 ;; If ediff-grab-mouse = t, then mouse won't be grabbed for
1311 ;; sessions that are not part of a group (this is done in
1312 ;; ediff-recenter). The condition below affects only terminating
1313 ;; sessions in session groups (in which case mouse is warped into
1314 ;; a meta buffer).
1315 (and (eq ediff-grab-mouse 'maybe)
1316 (memq this-command '(ediff-quit ediff-update-diffs)))
1317 (set-mouse-position frame-or-wind 1 0))
1318 )))
1319
1320(defsubst ediff-spy-after-mouse ()
1321 (setq ediff-mouse-pixel-position (mouse-pixel-position)))
1322
1323;; It is not easy to find out when the user grabs the mouse, since emacs and
1324;; xemacs behave differently when mouse is not in any frame. Also, this is
1325;; sensitive to when the user grabbed mouse. Not used for now.
1326(defun ediff-user-grabbed-mouse ()
1327 (if ediff-mouse-pixel-position
1328 (cond ((not (eq (car ediff-mouse-pixel-position)
1329 (car (mouse-pixel-position)))))
1330 ((and (car (cdr ediff-mouse-pixel-position))
1331 (car (cdr (mouse-pixel-position)))
1332 (cdr (cdr ediff-mouse-pixel-position))
1333 (cdr (cdr (mouse-pixel-position))))
1334 (not (and (< (abs (- (car (cdr ediff-mouse-pixel-position))
1335 (car (cdr (mouse-pixel-position)))))
1336 ediff-mouse-pixel-threshold)
1337 (< (abs (- (cdr (cdr ediff-mouse-pixel-position))
1338 (cdr (cdr (mouse-pixel-position)))))
1339 ediff-mouse-pixel-threshold))))
1340 (t nil))))
1341
1342(defsubst ediff-frame-char-height (frame)
1343 (if ediff-xemacs-p
1344 (glyph-height ediff-H-glyph (selected-window frame))
1345 (frame-char-height frame)))
1346
1347
1348(defsubst ediff-empty-overlay-p (overl)
1349 (= (ediff-overlay-start overl) (ediff-overlay-end overl)))
1350
1351;; like overlay-buffer in Emacs. In XEmacs, returns nil if the extent is
1352;; dead. Otherwise, works like extent-buffer
1353(defun ediff-overlay-buffer (overl)
1354 (if ediff-emacs-p
1355 (overlay-buffer overl)
1356 (and (extent-live-p overl) (extent-buffer overl))))
1357
1358;; like overlay-get in Emacs. In XEmacs, returns nil if the extent is
1359;; dead. Otherwise, like extent-property
1360(defun ediff-overlay-get (overl property)
1361 (if ediff-emacs-p
1362 (overlay-get overl property)
1363 (and (extent-live-p overl) (extent-property overl property))))
1364
1365;; t if diff region is empty.
1366;; In case of buffer C, t also if it is not a 3way
1367;; comparison job (merging jobs return t as well).
1368(defun ediff-empty-diff-region-p (n buf-type)
1369 (if (eq buf-type 'C)
1370 (or (not ediff-3way-comparison-job)
1371 (= (ediff-get-diff-posn 'C 'beg n)
1372 (ediff-get-diff-posn 'C 'end n)))
1373 (= (ediff-get-diff-posn buf-type 'beg n)
1374 (ediff-get-diff-posn buf-type 'end n))))
1375
1376;; Test if diff region is white space only.
1377;; If 2-way job and buf-type = C, then returns t.
1378(defun ediff-whitespace-diff-region-p (n buf-type)
1379 (or (and (eq buf-type 'C) (not ediff-3way-job))
1380 (ediff-empty-diff-region-p n buf-type)
1381 (let ((beg (ediff-get-diff-posn buf-type 'beg n))
1382 (end (ediff-get-diff-posn buf-type 'end n)))
1383 (ediff-eval-in-buffer (ediff-get-buffer buf-type)
1384 (save-excursion
1385 (goto-char beg)
1386 (skip-chars-forward ediff-whitespace)
1387 (>= (point) end))))))
1388
1389;; temporarily uses DIR to abbreviate file name
1390;; if DIR is nil, use default-directory
1391(defun ediff-abbreviate-file-name (file &optional dir)
1392 (cond ((stringp dir)
1393 (let ((directory-abbrev-alist (list (cons dir ""))))
1394 (abbreviate-file-name file)))
1395 (ediff-emacs-p (abbreviate-file-name file))
1396 (t ; XEmacs requires addl argument
1397 (abbreviate-file-name file t))))
1398
1399;; Takes a directory and returns the parent directory.
1400;; does nothing to `/'. If the ARG is a regular file,
1401;; strip the file AND the last dir.
1402(defun ediff-strip-last-dir (dir)
1403 (if (not (stringp dir)) (setq dir default-directory))
1404 (setq dir (expand-file-name dir))
1405 (or (file-directory-p dir) (setq dir (file-name-directory dir)))
1406 (let* ((pos (1- (length dir)))
1407 (last-char (aref dir pos)))
1408 (if (and (> pos 0) (= last-char ?/))
1409 (setq dir (substring dir 0 pos)))
1410 (ediff-abbreviate-file-name (file-name-directory dir))))
1411
1412(defun ediff-truncate-string-left (str newlen)
1413 ;; leave space for ... on the left
1414 (let ((len (length str))
1415 substr)
1416 (if (<= len newlen)
1417 str
1418 (setq newlen (max 0 (- newlen 3)))
1419 (setq substr (substring str (max 0 (- len 1 newlen))))
1420 (concat "..." substr))))
1421
1422(defun ediff-abbrev-jobname (jobname)
1423 (cond ((eq jobname 'ediff-directories)
1424 "Compare two directories")
1425 ((eq jobname 'ediff-files)
1426 "Compare two files")
1427 ((eq jobname 'ediff-buffers)
1428 "Compare two buffers")
1429 ((eq jobname 'ediff-directories3)
1430 "Compare three directories")
1431 ((eq jobname 'ediff-files3)
1432 "Compare three files")
1433 ((eq jobname 'ediff-buffers3)
1434 "Compare three buffers")
1435 ((eq jobname 'ediff-revision)
1436 "Compare file with a version")
1437 ((eq jobname 'ediff-directory-revisions)
1438 "Compare dir files with versions")
1439 ((eq jobname 'ediff-merge-directory-revisions)
1440 "Merge dir files with versions")
1441 ((eq jobname 'ediff-merge-directory-revisions-with-ancestor)
1442 "Merge dir versions via ancestors")
1443 (t
1444 (let* ((str (substring (symbol-name jobname) 6))
1445 (len (length str))
1446 (pos 0))
1447 (while (< pos len)
1448 (if (= pos 0)
1449 (aset str pos (upcase (aref str pos))))
1450 (if (= (aref str pos) ?-)
1451 (aset str pos ?\ ))
1452 (setq pos (1+ pos)))
1453 str))))
1454
1455
1456
1457(defsubst ediff-get-region-contents (n buf-type ctrl-buf &optional start end)
1458 (ediff-eval-in-buffer
1459 (ediff-eval-in-buffer ctrl-buf (ediff-get-buffer buf-type))
1460 (buffer-substring
1461 (or start (ediff-get-diff-posn buf-type 'beg n ctrl-buf))
1462 (or end (ediff-get-diff-posn buf-type 'end n ctrl-buf)))))
1463
1464;; If ediff modified mode line, strip the modification
1465(defsubst ediff-strip-mode-line-format ()
1466 (if (member (car mode-line-format) '(" A: " " B: " " C: " " Ancestor: "))
1467 (setq mode-line-format (nth 2 mode-line-format))))
1468
1469;; Verify that we have a difference selected.
1470(defsubst ediff-valid-difference-p (&optional n)
1471 (or n (setq n ediff-current-difference))
1472 (and (>= n 0) (< n ediff-number-of-differences)))
1473
1474(defsubst ediff-show-all-diffs (n)
1475 "Don't skip difference regions."
1476 nil)
1477
1478(defsubst Xor (a b)
1479 (or (and a (not b)) (and (not a) b)))
1480
1481(defsubst ediff-message-if-verbose (string &rest args)
1482 (if ediff-verbose-p
1483 (apply 'message string args)))
1484
1485
1486(provide 'ediff-init)
1487
1488
1489;;; ediff-init.el ends here