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