annotate lisp/ediff-init.el @ 46093:070dab19fecf

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