annotate lisp/ediff/ediff-init.el @ 16:0293115a14e9 r19-15b91

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