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