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