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