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