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