annotate lisp/ediff-init.el @ 15654:6f32894f4ad3

1. For fns like comint-postoutput-scroll-to-bottom on comint-output-filter-functions, don't count back using the length of STRING, as previous fns may have changed the buffer. Count from process-mark. 2. Don't bind file-name-handler-alist, it can break dir tracking. 3. Expand ^ in input only at boi. 4. Use new comint-file-name-regexp as source of valid chars in filenames.
author Simon Marshall <simon@gnu.org>
date Fri, 12 Jul 1996 07:32:45 +0000
parents 43a3308fcf61
children fb8897dbca30
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1 ;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13977
diff changeset
2
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
3 ;; Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
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
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13977
diff changeset
24 ;;; Code:
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
25
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
26 ;; Start compiler pacifier
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
27 (defvar ediff-metajob-name)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
28 (defvar ediff-meta-buffer)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
29 (defvar pm-color-alist)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
30 (defvar ediff-grab-mouse)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
31 (defvar ediff-mouse-pixel-position)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
32 (defvar ediff-mouse-pixel-threshold)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
33 (defvar ediff-whitespace)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
34 (defvar ediff-multiframe)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
35 ;; end pacifier
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
36
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
37 ;; Is it XEmacs?
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
38 (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
39 ;; Is it Emacs?
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
40 (defconst ediff-emacs-p (not ediff-xemacs-p))
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
41
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
42 (defvar ediff-force-faces nil
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
43 "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
44 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
45 that Ediff doesn't know about.")
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
46
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
47 ;; 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
48 (defsubst ediff-device-type ()
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
49 (if ediff-emacs-p
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
50 window-system
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
51 (device-type (selected-device))))
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
52
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
53 ;; 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
54 (defun ediff-window-display-p ()
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
55 (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
56
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
57 ;; test if supports faces
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
58 ;; ediff-force-faces is for those devices that support faces, but we don't know
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
59 ;; this yet
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
60 (defun ediff-has-face-support-p ()
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
61 (cond ((ediff-window-display-p))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
62 (ediff-force-faces)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
63 (ediff-emacs-p (memq (ediff-device-type) '(pc)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
64 (ediff-xemacs-p (memq (ediff-device-type) '(tty pc)))))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
65
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
66
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
67 ;; Defines SYMBOL as an advertised local variable.
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
68 ;; Performs a defvar, then executes `make-variable-buffer-local' on
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
69 ;; the variable. Also sets the `permanent-local' property,
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
70 ;; 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
71 ;; commands) won't destroy Ediff control variables.
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
72 ;;
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
73 ;; Plagiarised from `emerge-defvar-local' for XEmacs.
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
74 (defmacro ediff-defvar-local (var value doc)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
75 (` (progn
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
76 (defvar (, var) (, value) (, doc))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
77 (make-variable-buffer-local '(, var))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
78 (put '(, var) 'permanent-local t))))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
79
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
80
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
81
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
82 ;; 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
83
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
84 ;; Mode variables
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
85 ;; The buffer in which the A variant is stored.
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
86 (ediff-defvar-local ediff-buffer-A nil "")
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
87 ;; The buffer in which the B variant is stored.
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
88 (ediff-defvar-local ediff-buffer-B nil "")
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
89 ;; The buffer in which the C variant is stored.
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
90 (ediff-defvar-local ediff-buffer-C nil "")
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
91 ;; Ancestor buffer
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
92 (ediff-defvar-local ediff-ancestor-buffer nil "")
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
93 ;; The control buffer of ediff.
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
94 (ediff-defvar-local ediff-control-buffer nil "")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
95
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
96 ;;; Macros
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
97 (defmacro ediff-odd-p (arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
98 (` (eq (logand (, arg) 1) 1)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
99
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
100 (defmacro ediff-buffer-live-p (buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
101 (` (and (, buf) (get-buffer (, buf)) (buffer-name (get-buffer (, buf))))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
102
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
103 (defmacro ediff-get-buffer (arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
104 (` (cond ((eq (, arg) 'A) ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
105 ((eq (, arg) 'B) ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
106 ((eq (, arg) 'C) ediff-buffer-C)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
107 ((eq (, arg) 'Ancestor) ediff-ancestor-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
108 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
109 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
110
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
111 (defmacro ediff-get-value-according-to-buffer-type (buf-type list)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
112 (` (cond ((eq (, buf-type) 'A) (nth 0 (, list)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
113 ((eq (, buf-type) 'B) (nth 1 (, list)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
114 ((eq (, buf-type) 'C) (nth 2 (, list))))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
115
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
116 (defmacro ediff-char-to-buftype (arg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
117 (` (cond ((memq (, arg) '(?a ?A)) 'A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
118 ((memq (, arg) '(?b ?B)) 'B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
119 ((memq (, arg) '(?c ?C)) 'C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
120 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
121 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
122
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
123 (defmacro ediff-get-difference (n buf-type)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
124 (` (aref
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
125 (symbol-value
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
126 (intern (format "ediff-difference-vector-%S" (, buf-type)))) (, n))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
127
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
128 ;; tell if it has been previously determined that the region has
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
129 ;; no diffs other than the white space and newlines
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
130 ;; The argument, N, is the diff region number used by Ediff to index the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
131 ;; diff vector. It is 1 less than the number seen by the user.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
132 ;;
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
133 ;; A difference vector has the form:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
134 ;; [diff diff diff ...]
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
135 ;; where each diff has the form:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
136 ;; [overlay fine-diff-vector no-fine-diffs-flag]
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
137 ;; fine-diff-vector is a vector [fine-diff fine-diff fine-diff ...]
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
138 (defmacro ediff-no-fine-diffs-p (n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
139 (` (aref (ediff-get-difference (, n) 'A) 2)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
140
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
141 (defmacro ediff-get-diff-overlay-from-diff-record (diff-rec)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
142 (` (aref (, diff-rec) 0)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
143
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
144 (defmacro ediff-get-diff-overlay (n buf-type)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
145 (` (ediff-get-diff-overlay-from-diff-record
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
146 (ediff-get-difference (, n) (, buf-type)))))
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-get-fine-diff-vector-from-diff-record (diff-rec)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
149 (` (aref (, diff-rec) 1)))
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-set-fine-diff-vector (n buf-type fine-vec)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
152 (` (aset (ediff-get-difference (, n) (, buf-type)) 1 (, fine-vec))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
153
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
154 (defmacro ediff-get-state-of-diff (n buf-type)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
155 (` (if (ediff-buffer-live-p ediff-buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
156 (aref (ediff-get-difference (, n) (, buf-type)) 3))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
157 (defmacro ediff-set-state-of-diff (n buf-type val)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
158 (` (aset (ediff-get-difference (, n) (, buf-type)) 3 (, val))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
159 (defmacro ediff-get-state-of-merge (n)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
160 (` (if ediff-state-of-merge
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
161 (aref (aref ediff-state-of-merge (, n)) 0))))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
162 (defmacro ediff-get-state-of-ancestor (n)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
163 (` (if ediff-state-of-merge
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
164 (aref (aref ediff-state-of-merge (, n)) 1))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
165 (defmacro ediff-set-state-of-merge (n val)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
166 (` (if ediff-state-of-merge
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
167 (aset (aref ediff-state-of-merge (, n)) 0 (, val)))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
168
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
169 ;; if flag is t, puts a mark on diff region saying that
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
170 ;; the differences are in white space only. If flag is nil,
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
171 ;; the region is marked as essential (i.e., differences are
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
172 ;; not just in the white space and newlines.)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
173 (defmacro ediff-mark-diff-as-space-only (n flag)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
174 (` (aset (ediff-get-difference (, n) 'A) 2 (, flag))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
175
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
176 (defmacro ediff-get-fine-diff-vector (n buf-type)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
177 (` (ediff-get-fine-diff-vector-from-diff-record
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
178 (ediff-get-difference (, n) (, buf-type)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
179
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
180 ;; Macro to switch to BUFFER, evaluate FORMS, returns to original buffer.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
181 ;; Differs from `save-excursion' in that it doesn't save the point and mark.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
182 ;; This is essentially `emerge-eval-in-buffer' with the test for live buffers."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
183 (defmacro ediff-eval-in-buffer (buffer &rest forms)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
184 (` (let ((StartBuffer (current-buffer)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
185 (if (ediff-buffer-live-p (, buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
186 (unwind-protect
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
187 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
188 (set-buffer (, buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
189 (,@ forms))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
190 (set-buffer StartBuffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
191 (or (eq this-command 'ediff-quit)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
192 (error ediff-KILLED-VITAL-BUFFER))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
193 ))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
194
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
195
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
196 (defsubst ediff-multiframe-setup-p ()
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
197 (and (ediff-window-display-p) ediff-multiframe))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
198
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
199 (defmacro ediff-narrow-control-frame-p ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
200 (` (and (ediff-multiframe-setup-p)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
201 (equal ediff-help-message ediff-brief-message-string))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
202
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
203 (defmacro ediff-3way-comparison-job ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
204 (` (memq
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
205 ediff-job-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
206 '(ediff-files3 ediff-buffers3))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
207 (ediff-defvar-local ediff-3way-comparison-job nil "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
208
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
209 (defmacro ediff-merge-job ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
210 (` (memq
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
211 ediff-job-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
212 '(ediff-merge-files
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
213 ediff-merge-buffers
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
214 ediff-merge-files-with-ancestor
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
215 ediff-merge-buffers-with-ancestor
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
216 ediff-merge-revisions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
217 ediff-merge-revisions-with-ancestor))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
218 (ediff-defvar-local ediff-merge-job nil "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
219
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
220 (defmacro ediff-merge-with-ancestor-job ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
221 (` (memq
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
222 ediff-job-name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
223 '(ediff-merge-files-with-ancestor
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
224 ediff-merge-buffers-with-ancestor
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
225 ediff-merge-revisions-with-ancestor))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
226 (ediff-defvar-local ediff-merge-with-ancestor-job nil "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
227
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
228 (defmacro ediff-3way-job ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
229 (` (or ediff-3way-comparison-job ediff-merge-job)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
230 (ediff-defvar-local ediff-3way-job nil "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
231
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
232 ;; 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
233 ;; of diff3.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
234 (defmacro ediff-diff3-job ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
235 (` (or ediff-3way-comparison-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
236 ediff-merge-with-ancestor-job)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
237 (ediff-defvar-local ediff-diff3-job nil "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
238
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
239 (defmacro ediff-windows-job ()
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
240 (` (memq ediff-job-name '(ediff-windows-wordwise ediff-windows-linewise))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
241 (ediff-defvar-local ediff-windows-job nil "")
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
242
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
243 (defmacro ediff-word-mode-job ()
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
244 (` (memq ediff-job-name '(ediff-windows-wordwise ediff-regions-wordwise))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
245 (ediff-defvar-local ediff-word-mode-job nil "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
246
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
247 (defmacro ediff-narrow-job ()
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
248 (` (memq ediff-job-name '(ediff-windows-wordwise
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
249 ediff-regions-wordwise
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
250 ediff-windows-linewise
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
251 ediff-regions-linewise))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
252 (ediff-defvar-local ediff-narrow-job nil "")
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
253
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
254 ;; 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
255 ;; ancestor metajob, since it behaves differently.
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
256 (defsubst ediff-ancestor-metajob (&optional metajob)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
257 (memq (or metajob ediff-metajob-name)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
258 '(ediff-merge-directories-with-ancestor
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
259 ediff-merge-filegroups-with-ancestor)))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
260 (defsubst ediff-revision-metajob (&optional metajob)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
261 (memq (or metajob ediff-metajob-name)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
262 '(ediff-directory-revisions
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
263 ediff-merge-directory-revisions
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
264 ediff-merge-directory-revisions-with-ancestor)))
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
265 (defsubst ediff-patch-metajob (&optional metajob)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
266 (memq (or metajob ediff-metajob-name)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
267 '(ediff-multifile-patch)))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
268 ;; 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
269 ;; revision
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
270 (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
271 (or (ediff-revision-metajob metajob)
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
272 (ediff-patch-metajob metajob)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
273 ;; add more here
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
274 ))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
275 (defsubst ediff-collect-diffs-metajob (&optional metajob)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
276 (memq (or metajob ediff-metajob-name)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
277 '(ediff-directories
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
278 ediff-directory-revisions
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
279 ediff-merge-directories
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
280 ediff-merge-directories-with-ancestor
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
281 ediff-merge-directory-revisions
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
282 ediff-merge-directory-revisions-with-ancestor
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
283 ;; add more here
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
284 )))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
285
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
286 (defsubst ediff-metajob3 (&optional metajob)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
287 (memq (or metajob ediff-metajob-name)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
288 '(ediff-merge-directories-with-ancestor
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
289 ediff-merge-filegroups-with-ancestor
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
290 ediff-directories3
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
291 ediff-filegroups3)))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
292 (defsubst ediff-comparison-metajob3 (&optional metajob)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
293 (memq (or metajob ediff-metajob-name)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
294 '(ediff-directories3 ediff-filegroups3)))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
295
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
296 (defsubst ediff-barf-if-not-control-buffer (&optional meta-buf)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
297 (or (eq (if meta-buf ediff-meta-buffer ediff-control-buffer)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
298 (current-buffer))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
299 (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
300 this-command)))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
301
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
302
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
303 ;; Hook variables
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
304
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
305 (defvar ediff-before-setup-windows-hook nil
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
306 "*Hooks to run before Ediff sets its window configuration.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
307 This can be used to save the previous window config, which can be restored
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
308 on ediff-quit or ediff-suspend.")
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
309 (defvar ediff-after-setup-windows-hook nil
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
310 "*Hooks to run after Ediff sets its window configuration.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
311 This can be used to set up control window or icon in a desired place.")
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
312 (defvar ediff-before-setup-control-frame-hook nil
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
313 "*Hooks run before setting up the frame to display Ediff Control Panel.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
314 Can be used to change control frame parameters to position it where it
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
315 is desirable.")
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
316 (defvar ediff-after-setup-control-frame-hook nil
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
317 "*Hooks run after setting up the frame to display Ediff Control Panel.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
318 Can be used to move the frame where it is desired.")
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
319 (defvar ediff-startup-hook nil
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
320 "*Hooks to run in the control buffer after Ediff has been set up.")
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
321 (defvar ediff-select-hook nil
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
322 "*Hooks to run after a difference has been selected.")
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
323 (defvar ediff-unselect-hook nil
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
324 "*Hooks to run after a difference has been unselected.")
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
325 (defvar ediff-prepare-buffer-hook nil
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
326 "*Hooks called after buffers A, B, and C are set up.")
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
327 (defvar ediff-load-hook nil
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
328 "*Hook run after Ediff is loaded. Can be used to change defaults.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
329
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
330 (defvar ediff-mode-hook nil
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
331 "*Hook run just after ediff-mode is set up in the control buffer.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
332 This is done before any windows or frames are created. One can use it to
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
333 set local variables that determine how the display looks like.")
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
334 (defvar ediff-keymap-setup-hook nil
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
335 "*Hook run just after the default bindings in Ediff keymap are set up.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
336
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
337 (defvar ediff-display-help-hook nil
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
338 "*Hooks run after preparing the help message.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
339
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
340 (defvar ediff-suspend-hook (list 'ediff-default-suspend-function)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
341 "*Hooks to run in the Ediff control buffer when Ediff is suspended.")
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
342 (defvar ediff-quit-hook (list 'ediff-cleanup-mess)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
343 "*Hooks to run in the Ediff control buffer after finishing Ediff.")
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
344 (defvar ediff-cleanup-hook nil
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
345 "*Hooks to run on exiting Ediff but before killing the control buffer.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
346 This is a place to do various cleanups, such as deleting the variant buffers.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
347 Ediff provides a function, `ediff-janitor', as one such possible hook.")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
348
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
349
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
350 ;; Help messages
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
351
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
352 (defconst ediff-long-help-message-head
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
353 " Moving around | Toggling features | Manipulations
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
354 =====================|===========================|============================="
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
355 "The head of the full help message.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
356 (defconst ediff-long-help-message-tail
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
357 "=====================|===========================|=============================
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
358 R -show registry | | M -show session group
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
359 D -diff output | E -browse Ediff manual| G -send bug report
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
360 i -status info | ? -help off | z/q -suspend/quit
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
361 -------------------------------------------------------------------------------
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
362 X,Y (x,y) on the left are meta-symbols for the keys A,B,C (a,b,c).
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
363 X,Y on the right are meta-symbols for buffers A,B,C.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
364 A,B,C on the right denote the working buffers A,B,C, respectively."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
365 "The tail of the full-help message.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
366
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
367 (defconst ediff-long-help-message-compare3
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
368 "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
369 p,DEL -previous diff | | -vert/horiz split | xy -copy buf X's region to Y
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
370 n,SPC -next diff | h -hiliting | rx -restore buf X's old diff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
371 j -jump to diff | @ -auto-refinement | * -refine current region
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
372 gx -goto X's point| | ! -update diff regions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
373 C-l -recenter | ## -ignore whitespace |
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
374 v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
375 </> -scroll lt/rt | X -read-only in buf X | wd -save diff output
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
376 | m -wide display | ~ -rotate buffers
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
377 "
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
378 "Help message usually used for 3-way comparison.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
379 Normally, not a user option. See `ediff-help-message' for details.")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
380
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
381 (defconst ediff-long-help-message-compare2
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
382 "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
383 p,DEL -previous diff | | -vert/horiz split |a/b -copy A/B's region to B/A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
384 n,SPC -next diff | h -hiliting | rx -restore buf X's old diff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
385 j -jump to diff | @ -auto-refinement | * -refine current region
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
386 gx -goto X's point| | ! -update diff regions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
387 C-l -recenter | ## -ignore whitespace |
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
388 v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
389 </> -scroll lt/rt | X -read-only in buf X | wd -save diff output
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
390 ~ -swap variants | m -wide display |
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
391 "
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
392 "Help message usually used for 2-way comparison.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
393 Normally, not a user option. See `ediff-help-message' for details.")
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
394
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
395 (defconst ediff-long-help-message-narrow2
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
396 "
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
397 p,DEL -previous diff | | -vert/horiz split |a/b -copy A/B's region to B/A
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
398 n,SPC -next diff | h -hiliting | rx -restore buf X's old diff
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
399 j -jump to diff | @ -auto-refinement | * -refine current region
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
400 gx -goto X's point| % -narrow/widen buffs | ! -update diff regions
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
401 C-l -recenter | ## -ignore whitespace |
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
402 v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
403 </> -scroll lt/rt | X -read-only in buf X | wd -save diff output
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
404 ~ -swap variants | m -wide display |
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
405 "
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
406 "Help message when comparing windows or regions line-by-line.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
407 Normally, not a user option. See `ediff-help-message' for details.")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
408
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
409 (defconst ediff-long-help-message-word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
410 "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
411 p,DEL -previous diff | | -vert/horiz split | xy -copy buf X's region to Y
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
412 n,SPC -next diff | h -hiliting | rx -restore buf X's old diff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
413 j -jump to diff | |
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
414 gx -goto X's point| % -narrow/widen buffs | ! -recompute diffs
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
415 C-l -recenter | |
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
416 v/V -scroll up/dn | #f/#h -focus/hide regions | wx -save buf X
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
417 </> -scroll lt/rt | X -read-only in buf X | wd -save diff output
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
418 ~ -swap variants | m -wide display |
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
419 "
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
420 "Help message when comparing windows or regions word-by-word.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
421 Normally, not a user option. See `ediff-help-message' for details.")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
422
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
423 (defconst ediff-long-help-message-merge
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
424 "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
425 p,DEL -previous diff | | -vert/horiz split | x -copy buf X's region to C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
426 n,SPC -next diff | h -hiliting | r -restore buf C's old diff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
427 j -jump to diff | @ -auto-refinement | * -refine current region
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
428 gx -goto X's point| ## -ignore whitespace | ! -update diff regions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
429 C-l -recenter | #f/#h -focus/hide regions | + -combine diff regions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
430 v/V -scroll up/dn | X -read-only in buf X | wx -save buf X
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
431 </> -scroll lt/rt | m -wide display | wd -save diff output
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
432 ~ -swap variants | s -shrink window C | / -show ancestor buff
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
433 | $ -show clashes only | & -merge w/new default
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
434 "
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
435 "Help message during merging.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
436 Normally, not a user option. See `ediff-help-message' for details.")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
437
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
438 ;; The actual long help message.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
439 (ediff-defvar-local ediff-long-help-message ""
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
440 "Normally, not a user option. See `ediff-help-message' for details.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
441
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
442 (defconst ediff-brief-message-string
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
443 " ? - help "
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
444 "Contents of the brief help message.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
445 ;; The actual brief help message
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
446 (ediff-defvar-local ediff-brief-help-message ""
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
447 "Normally, not a user option. See `ediff-help-message' for details.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
448
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
449 (ediff-defvar-local ediff-brief-help-message-function nil
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
450 "The brief help message that the user can customize.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
451 If the user sets this to a parameter-less function, Ediff will use it to
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
452 produce the brief help message. This function must return a string.")
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
453 (ediff-defvar-local ediff-long-help-message-function nil
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
454 "The long help message that the user can customize.
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
455 See `ediff-brief-help-message-function' for more.")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
456
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
457 (defvar ediff-use-long-help-message nil
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
458 "*If t, Ediff displays a long help message. Short help message otherwise.")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
459
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
460 ;; The actual help message.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
461 (ediff-defvar-local ediff-help-message ""
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
462 "The actual help message.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
463 Normally, the user shouldn't touch this. However, if you want Ediff to
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
464 start up with different help messages for different jobs, you can change
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
465 the value of this variable and the variables `ediff-help-message-*' in
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
466 `ediff-startup-hook'.")
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
467
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
468 ;; Error messages
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
469 (defconst ediff-KILLED-VITAL-BUFFER
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
470 "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
471 (defconst ediff-NO-DIFFERENCES
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
472 "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
473 (defconst ediff-BAD-DIFF-NUMBER
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
474 ;; %S stands for this-command, %d - diff number, %d - max diff
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
475 "%S: Bad diff region number, %d. Valid numbers are 1 to %d")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
476
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
477 ;; Selective browsing
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
478
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
479 (ediff-defvar-local ediff-skip-diff-region-function 'ediff-show-all-diffs
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
480 "Function that determines the next/previous diff region to show.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
481 Should return t for regions to be ignored and nil otherwise.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
482 This function gets a region number as an argument. The region number
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
483 is the one used internally by Ediff. It is 1 less than the number seen
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
484 by the user.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
485
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
486 (ediff-defvar-local ediff-hide-regexp-matches-function
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
487 'ediff-hide-regexp-matches
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
488 "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
489 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
490 (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
491 'ediff-focus-on-regexp-matches
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
492 "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
493 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
494
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
495 ;; Regexp that determines buf A regions to focus on when skipping to diff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
496 (ediff-defvar-local ediff-regexp-focus-A "" "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
497 ;; Regexp that determines buf B regions to focus on when skipping to diff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
498 (ediff-defvar-local ediff-regexp-focus-B "" "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
499 ;; Regexp that determines buf C regions to focus on when skipping to diff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
500 (ediff-defvar-local ediff-regexp-focus-C "" "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
501 ;; connective that determines whether to focus regions that match both or
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
502 ;; one of the regexps
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
503 (ediff-defvar-local ediff-focus-regexp-connective 'and "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
504
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
505 ;; Regexp that determines buf A regions to ignore when skipping to diff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
506 (ediff-defvar-local ediff-regexp-hide-A "" "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
507 ;; Regexp that determines buf B regions to ignore when skipping to diff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
508 (ediff-defvar-local ediff-regexp-hide-B "" "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
509 ;; Regexp that determines buf C regions to ignore when skipping to diff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
510 (ediff-defvar-local ediff-regexp-hide-C "" "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
511 ;; connective that determines whether to hide regions that match both or
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
512 ;; one of the regexps
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
513 (ediff-defvar-local ediff-hide-regexp-connective 'and "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
514
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
515
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
516 (defvar ediff-ange-ftp-ftp-name (if ediff-xemacs-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
517 'ange-ftp-ftp-path
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
518 'ange-ftp-ftp-name)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
519 "Function ange-ftp uses to find out if file is remote.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
520
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
521
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
522 ;; Copying difference regions between buffers.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
523 (ediff-defvar-local ediff-killed-diffs-alist nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
524 "A list of killed diffs.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
525 A diff is saved here if it is replaced by a diff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
526 from another buffer. This alist has the form:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
527 \((num (buff-object . diff) (buff-object . diff) (buff-object . diff)) ...),
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
528 where some buffer-objects may be missing.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
529
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
530
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
531 ;; Highlighting
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
532 ;;(defvar ediff-before-flag-bol (if ediff-emacs-p "->>\n" (make-glyph "->>\n"))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
533 (defvar ediff-before-flag-bol (if ediff-xemacs-p (make-glyph "->>") "->>")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
534 "*Flag placed above the highlighted block of differences.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
535 Must end with newline.")
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
536 ;;(defvar ediff-after-flag-eol (if ediff-emacs-p "<<-\n" (make-glyph "<<-"))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
537 (defvar ediff-after-flag-eol (if ediff-xemacs-p (make-glyph "<<-") "<<-")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
538 "*Flag placed below the highlighted block of differences.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
539 Must end with newline.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
540
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
541 (defvar ediff-before-flag-mol (if ediff-xemacs-p (make-glyph "->>") "->>")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
542 "*Like ediff-before-flag, used when a difference starts in mid-line.")
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
543 (defvar ediff-after-flag-mol (if ediff-xemacs-p (make-glyph "<<-") "<<-")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
544 "*Like ediff-after-flag, used when a difference starts in mid-line.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
545
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
546
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
547 (ediff-defvar-local ediff-use-faces t
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
548 "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
549 If nil, differences are highlighted using ASCII flags, ediff-before-flag
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
550 and ediff-after-flag. On a non-window system, differences are always
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
551 highlighted using ASCII flags.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
552 This variable can be set either in .emacs or toggled interactively.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
553 Use `setq-default' if setting it in .emacs")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
554
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
555 ;; 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
556 ;; permanently nixed; used in ediff-windows-wordwise and ediff-regions-wordwise
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
557 (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
558 ;; Name of the job (ediff-files, ediff-windows, etc.)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
559 (ediff-defvar-local ediff-job-name nil "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
560
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
561 ;; Narrowing and ediff-region/windows support
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
562 ;; This is a list (overlay-A overlay-B overlay-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
563 ;; 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
564 ;; the bounds of these overlays.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
565 (ediff-defvar-local ediff-narrow-bounds nil "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
566
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
567 ;; List (overlay-A overlay-B overlay-C), where each overlay spans the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
568 ;; entire corresponding buffer.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
569 (ediff-defvar-local ediff-wide-bounds nil "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
570
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
571 ;; Current visibility boundaries in buffers A, B, and C.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
572 ;; This is also a list of overlays. When the user toggles narrow/widen,
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
573 ;; this list changes from ediff-wide-bounds to ediff-narrow-bounds.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
574 ;; and back.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
575 (ediff-defvar-local ediff-visible-bounds nil "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
576
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
577 (ediff-defvar-local ediff-start-narrowed t
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
578 "Non-nil means start narrowed, if doing ediff-windows-* or ediff-regions-*")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
579 (ediff-defvar-local ediff-quit-widened t
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
580 "*Non-nil means: when finished, Ediff widens buffers A/B.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
581 Actually, Ediff restores the scope of visibility that existed at startup.")
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
582 (defvar ediff-keep-variants t
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
583 "*Nil means that non-modified variant buffers should be removed after some
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
584 interrogation.
13977
11784c04028a (ediff-keep-variants): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 13494
diff changeset
585 Supplying a prefix argument to the quit command `q' temporarily reverses the
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
586 meaning of this variable.")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
587
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
588 (ediff-defvar-local ediff-highlight-all-diffs t
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
589 "If nil, only the selected differences are highlighted.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
590 This variable can be set either in .emacs or toggled interactively, using
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
591 ediff-toggle-hilit. Use `setq-default' to set it.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
592
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
593 ;; A var local to each control panel buffer. Indicates highlighting style
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
594 ;; in effect for this buffer: `face', `ascii', nil -- temporarily
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
595 ;; unhighlighted, `off' -- turned off \(on a dumb terminal only\).
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
596 (ediff-defvar-local ediff-highlighting-style nil "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
597
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
598
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
599 ;; The suffix of the control buffer name.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
600 (ediff-defvar-local ediff-control-buffer-suffix nil "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
601 ;; Same as ediff-control-buffer-suffix, but without <,>.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
602 ;; It's a number rather than string.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
603 (ediff-defvar-local ediff-control-buffer-number nil "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
604
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
605
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
606 ;; 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
607 (ediff-defvar-local ediff-buffer-values-orig-A nil "")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
608 ;; 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
609 (ediff-defvar-local ediff-buffer-values-orig-B nil "")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
610 ;; 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
611 (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
612 ;; 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
613 (ediff-defvar-local ediff-buffer-values-orig-Ancestor nil "")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
614 ;; Buffer-local variables to be saved then restored during Ediff sessions
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
615 ;; Buffer-local variables to be saved then restored during Ediff sessions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
616 (defconst ediff-protected-variables '(buffer-read-only
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
617 ;;; synchronize-minibuffers
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
618 mode-line-format))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
619
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
620 ;; Vector of differences between the variants. Each difference is
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
621 ;; represented by a vector of two overlays plus a vector of fine diffs,
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
622 ;; plus a no-fine-diffs flag. The first overlay spans the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
623 ;; difference region in the A buffer and the second overlays the diff in
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
624 ;; the B buffer. If a difference section is empty, the corresponding
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
625 ;; overlay's endpoints coincide.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
626 ;;
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
627 ;; The precise form of a difference vector for one buffer is:
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
628 ;; [diff diff diff ...]
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
629 ;; where each diff has the form:
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
630 ;; [diff-overlay fine-diff-vector no-fine-diffs-flag state-of-difference]
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
631 ;; fine-diff-vector is a vector [fine-diff-overlay fine-diff-overlay ...]
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
632 ;; no-fine-diffs-flag says if there are fine differences.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
633 ;; state-of-difference is A, B, C, or nil, indicating which buffer is
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
634 ;; different from the other two (used only in 3-way jobs.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
635 (ediff-defvar-local ediff-difference-vector-A nil "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
636 (ediff-defvar-local ediff-difference-vector-B nil "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
637 (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
638 (ediff-defvar-local ediff-difference-vector-Ancestor nil "")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
639
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
640 ;; [ status status status ...]
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
641 ;; Each status: [state-of-merge state-of-ancestor]
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
642 ;; state-of-merge is default-A, default-B, prefer-A, or prefer-B. It
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
643 ;; 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
644 ;; 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
645 ;; empty.
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
646 (ediff-defvar-local ediff-state-of-merge nil "")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
647
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
648 ;; The difference that is currently selected.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
649 (ediff-defvar-local ediff-current-difference -1 "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
650 ;; Number of differences found.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
651 (ediff-defvar-local ediff-number-of-differences nil "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
652
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
653 ;; Buffer containing the output of diff, which is used by Ediff to step
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
654 ;; through files.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
655 (ediff-defvar-local ediff-diff-buffer nil "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
656 ;; Like ediff-diff-buffer, but contains context diff. It is not used by
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
657 ;; Ediff, but it is saved in a file, if user requests so.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
658 (ediff-defvar-local ediff-custom-diff-buffer nil "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
659 ;; Buffer used for diff-style fine differences between regions.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
660 (ediff-defvar-local ediff-fine-diff-buffer nil "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
661 ;; Temporary buffer used for computing fine differences.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
662 (defconst ediff-tmp-buffer " *ediff-tmp*" "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
663 ;; Buffer used for messages
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
664 (defconst ediff-msg-buffer " *ediff-message*" "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
665 ;; Buffer containing the output of diff when diff returns errors.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
666 (ediff-defvar-local ediff-error-buffer nil "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
667 ;; Buffer to display debug info
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
668 (ediff-defvar-local ediff-debug-buffer "*ediff-debug*" "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
669
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
670 ;; 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
671 ;; 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
672 (ediff-defvar-local ediff-this-buffer-ediff-sessions nil "")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
673
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
674 ;; to be deleted in due time
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
675 ;; List of difference overlays disturbed by working with the current diff.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
676 (defvar ediff-disturbed-overlays nil "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
677
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
678 ;; Priority of non-selected overlays.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
679 (defvar ediff-shadow-overlay-priority 100 "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
680
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
681 (defvar ediff-version-control-package 'vc
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
682 "Version control package used.
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
683 Currently, Ediff supports vc.el, rcs.el, pcl-cvs.el, and generic-sc.el. The
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
684 standard Emacs interface to RCS, CVS, SCCS, etc., is vc.el. However, some
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
685 people find the other two packages more convenient. Set this variable to the
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
686 appropriate symbol: `rcs', `pcl-cvs', or `generic-sc' if you so desire.")
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
687
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
688
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
689 (if ediff-xemacs-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
690 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
691 (fset 'ediff-read-event (symbol-function 'next-command-event))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
692 (fset 'ediff-overlayp (symbol-function 'extentp))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
693 (fset 'ediff-make-overlay (symbol-function 'make-extent))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
694 (fset 'ediff-delete-overlay (symbol-function 'delete-extent)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
695 (fset 'ediff-read-event (symbol-function 'read-event))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
696 (fset 'ediff-overlayp (symbol-function 'overlayp))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
697 (fset 'ediff-overlayp (symbol-function 'overlayp))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
698 (fset 'ediff-make-overlay (symbol-function 'make-overlay))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
699 (fset 'ediff-delete-overlay (symbol-function 'delete-overlay)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
700
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
701 ;; 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
702 ;; 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
703 ;; 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
704 ;; 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
705 ;; 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
706 ;; 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
707 ;; will be nil (when op is =, >, or >=) and t (when op is <, <=), which may be
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
708 ;; incorrect. However, this gives correct result in our cases, since we are
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
709 ;; testing for sufficiently high Emacs versions.
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
710 (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
711 (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
712 (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
713 ((eq type-of-emacs 'emacs) ediff-emacs-p)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
714 (t t))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
715 (cond ((eq op '=) (and (= emacs-minor-version minor)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
716 (= emacs-major-version major)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
717 ((memq op '(> >= < <=))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
718 (and (or (funcall op emacs-major-version major)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
719 (= emacs-major-version major))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
720 (if (= emacs-major-version major)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
721 (funcall op emacs-minor-version minor)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
722 t)))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
723 (t
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
724 (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
725 (cond ((memq op '(= > >=)) nil)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
726 ((memq op '(< <=)) t))))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
727
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
728
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
729 ;;;; warn if it is a wrong version of emacs
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
730 ;;(if (or (ediff-check-version '< 19 29 'emacs)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
731 ;; (ediff-check-version '< 19 12 'xemacs))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
732 ;; (progn
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
733 ;; (with-output-to-temp-buffer ediff-msg-buffer
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
734 ;; (switch-to-buffer ediff-msg-buffer)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
735 ;; (insert
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
736 ;; (format "
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
737 ;;
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
738 ;;This version of Ediff requires
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
739 ;;
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
740 ;;\t Emacs 19.29 and higher
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
741 ;;\t OR
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
742 ;;\t XEmacs 19.12 and higher
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
743 ;;
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
744 ;;It is unlikely to work under Emacs version %s
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
745 ;;that you are using... " emacs-version))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
746 ;; (if noninteractive
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
747 ;; ()
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
748 ;; (beep 1)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
749 ;; (beep 1)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
750 ;; (insert "\n\nType any key to continue...")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
751 ;; (ediff-read-event)))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
752 ;; (kill-buffer ediff-msg-buffer)))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
753
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
754 ;; A fix for NeXT Step
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
755 ;; Should probably be eliminated in later versions.
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
756 (if (and (ediff-window-display-p) (eq (ediff-device-type) 'ns))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
757 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
758 (fset 'x-display-color-p (symbol-function 'ns-display-color-p))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
759 (fset 'x-color-defined-p (symbol-function 'ns-color-defined-p))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
760 (fset 'x-display-pixel-height (symbol-function 'ns-display-pixel-height))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
761 (fset 'x-display-pixel-width (symbol-function 'ns-display-pixel-width))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
762 ))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
763
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
764
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
765 (defsubst ediff-color-display-p ()
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
766 (if ediff-emacs-p
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
767 (x-display-color-p)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
768 (eq (device-class (selected-device)) 'color)))
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
769
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
770
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
771 (if (ediff-has-face-support-p)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
772 (if ediff-xemacs-p
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
773 (progn
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
774 (fset 'ediff-valid-color-p (symbol-function 'valid-color-name-p))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
775 (fset 'ediff-get-face (symbol-function 'get-face)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
776 ;; Temporary fix for OS/2 port of Emacs
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
777 ;; pm-win.el in PM-Emacs should be fixed.
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
778 (if (eq (ediff-device-type) 'pm)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
779 (fset 'ediff-valid-color-p
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
780 (function (lambda (color) (assoc color pm-color-alist))))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
781 (fset 'ediff-valid-color-p (symbol-function 'x-color-defined-p)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
782 (fset 'ediff-get-face (symbol-function 'internal-get-face))))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
783
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
784 (if (ediff-window-display-p)
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
785 (if ediff-xemacs-p
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
786 (progn
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
787 (fset 'ediff-display-pixel-width
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
788 (symbol-function 'device-pixel-width))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
789 (fset 'ediff-display-pixel-height
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
790 (symbol-function 'device-pixel-height)))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
791 (fset 'ediff-display-pixel-width
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
792 (symbol-function 'x-display-pixel-width))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
793 (fset 'ediff-display-pixel-height
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
794 (symbol-function 'x-display-pixel-height))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
795
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
796
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
797 (defun ediff-make-current-diff-overlay (type)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
798 (if (ediff-has-face-support-p)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
799 (let ((overlay (intern (format "ediff-current-diff-overlay-%S" type)))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
800 (buffer (ediff-get-buffer type))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
801 (face (face-name
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
802 (symbol-value
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
803 (intern (format "ediff-current-diff-face-%S" type))))))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
804 (set overlay
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
805 (ediff-make-bullet-proof-overlay (point-max) (point-max) buffer))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
806 (ediff-set-overlay-face (symbol-value overlay) face)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
807 (ediff-overlay-put (symbol-value overlay) 'ediff ediff-control-buffer))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
808 ))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
809
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
810 (defun ediff-set-overlay-face (extent face)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
811 (ediff-overlay-put extent 'face face)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
812 (ediff-overlay-put extent 'help-echo 'ediff-region-help-echo))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
813
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
814 ;; This does nothing in Emacs, since overlays there have no help-echo property
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
815 (defun ediff-region-help-echo (extent)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
816 (let ((is-current (ediff-overlay-get extent 'ediff))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
817 (face (ediff-overlay-get extent 'face))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
818 (diff-num (ediff-overlay-get extent 'ediff-diff-num))
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
819 face-help)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
820
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
821 ;; This happens only for refinement overlays
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
822 (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
823
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
824 (cond ((and is-current diff-num) ; current diff region
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
825 (format "Difference region %S -- current" (1+ diff-num)))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
826 (face-help) ; refinement of current diff region
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
827 (diff-num ; non-current
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
828 (format "Difference region %S -- non-current" (1+ diff-num)))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
829 (t "")) ; none
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
830 ))
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
831
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
832 (defun ediff-set-face (ground face color)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
833 "Set face foreground/background."
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
834 (if (ediff-has-face-support-p)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
835 (if (ediff-valid-color-p color)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
836 (if (eq ground 'foreground)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
837 (set-face-foreground face color)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
838 (set-face-background face color))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
839 (cond ((memq face
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
840 '(ediff-current-diff-face-A
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
841 ediff-current-diff-face-B
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
842 ediff-current-diff-face-C
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
843 ediff-current-diff-face-Ancestor))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
844 (copy-face 'highlight face))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
845 ((memq face
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
846 '(ediff-fine-diff-face-A
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
847 ediff-fine-diff-face-B
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
848 ediff-fine-diff-face-C
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
849 ediff-fine-diff-face-Ancestor))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
850 (copy-face 'secondary-selection face)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
851 (set-face-underline-p face t))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
852 ((memq face
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
853 '(ediff-even-diff-face-A
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
854 ediff-odd-diff-face-A
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
855 ediff-even-diff-face-B ediff-odd-diff-face-B
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
856 ediff-even-diff-face-C ediff-odd-diff-face-C
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
857 ediff-even-diff-face-Ancestor
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
858 ediff-odd-diff-face-Ancestor))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
859 (copy-face 'secondary-selection face))))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
860 ))
14534
3c38a5112cb6 Make sure `facemenu-unlisted-faces' is bound.
Richard M. Stallman <rms@gnu.org>
parents: 14419
diff changeset
861
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
862 (defun ediff-hide-face (face)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
863 (if (and (ediff-has-face-support-p) ediff-emacs-p)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
864 (add-to-list 'facemenu-unlisted-faces face)))
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
865
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
866 (defvar ediff-current-diff-face-A
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
867 (if (ediff-has-face-support-p)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
868 (progn
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
869 (make-face 'ediff-current-diff-face-A)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
870 (ediff-hide-face 'ediff-current-diff-face-A)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
871 (or (face-differs-from-default-p 'ediff-current-diff-face-A)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
872 (cond ((ediff-color-display-p)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
873 (ediff-set-face
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
874 'foreground 'ediff-current-diff-face-A "firebrick")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
875 (ediff-set-face
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
876 'background 'ediff-current-diff-face-A "pale green"))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
877 (t
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
878 (if ediff-xemacs-p
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
879 (copy-face 'modeline 'ediff-current-diff-face-A)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
880 (copy-face 'highlight 'ediff-current-diff-face-A))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
881 )))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
882 'ediff-current-diff-face-A))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
883 "Face for highlighting the selected difference in buffer A.")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
884
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
885 (defvar ediff-current-diff-face-B
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
886 (if (ediff-has-face-support-p)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
887 (progn
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
888 (make-face 'ediff-current-diff-face-B)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
889 (ediff-hide-face 'ediff-current-diff-face-B)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
890 (or (face-differs-from-default-p 'ediff-current-diff-face-B)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
891 (cond ((ediff-color-display-p)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
892 (ediff-set-face
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
893 'foreground 'ediff-current-diff-face-B "DarkOrchid")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
894 (ediff-set-face
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
895 'background 'ediff-current-diff-face-B "Yellow"))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
896 (t
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
897 (if ediff-xemacs-p
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
898 (copy-face 'modeline 'ediff-current-diff-face-B)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
899 (copy-face 'highlight 'ediff-current-diff-face-B))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
900 )))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
901 'ediff-current-diff-face-B))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
902 "Face for highlighting the selected difference in buffer B.")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
903
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
904
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
905 (defvar ediff-current-diff-face-C
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
906 (if (ediff-has-face-support-p)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
907 (progn
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
908 (make-face 'ediff-current-diff-face-C)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
909 (ediff-hide-face 'ediff-current-diff-face-C)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
910 (or (face-differs-from-default-p 'ediff-current-diff-face-C)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
911 (cond ((ediff-color-display-p)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
912 (ediff-set-face
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
913 'foreground 'ediff-current-diff-face-C "Navy")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
914 (ediff-set-face
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
915 'background 'ediff-current-diff-face-C "Pink"))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
916 (t
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
917 (if ediff-xemacs-p
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
918 (copy-face 'modeline 'ediff-current-diff-face-C)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
919 (copy-face 'highlight 'ediff-current-diff-face-C))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
920 )))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
921 'ediff-current-diff-face-C))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
922 "Face for highlighting the selected difference in buffer C.")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
923
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
924 (defvar ediff-current-diff-face-Ancestor
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
925 (if (ediff-has-face-support-p)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
926 (progn
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
927 (make-face 'ediff-current-diff-face-Ancestor)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
928 (ediff-hide-face 'ediff-current-diff-face-Ancestor)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
929 (or (face-differs-from-default-p 'ediff-current-diff-face-Ancestor)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
930 (copy-face
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
931 'ediff-current-diff-face-C 'ediff-current-diff-face-Ancestor))))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
932 "Face for highlighting the selected difference in the ancestor buffer.")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
933
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
934 (defvar ediff-fine-diff-face-A
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
935 (if (ediff-has-face-support-p)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
936 (progn
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
937 (make-face 'ediff-fine-diff-face-A)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
938 (ediff-hide-face 'ediff-fine-diff-face-A)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
939 (or (face-differs-from-default-p 'ediff-fine-diff-face-A)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
940 (cond ((ediff-color-display-p)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
941 (ediff-set-face 'foreground 'ediff-fine-diff-face-A
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
942 "Navy")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
943 (ediff-set-face 'background 'ediff-fine-diff-face-A
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
944 "sky blue"))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
945 (t (set-face-underline-p 'ediff-fine-diff-face-A t))))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
946 'ediff-fine-diff-face-A))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
947 "Face for highlighting the refinement of the selected diff in buffer A.")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
948
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
949 (defvar ediff-fine-diff-face-B
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
950 (if (ediff-has-face-support-p)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
951 (progn
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
952 (make-face 'ediff-fine-diff-face-B)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
953 (ediff-hide-face 'ediff-fine-diff-face-B)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
954 (or (face-differs-from-default-p 'ediff-fine-diff-face-B)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
955 (cond ((ediff-color-display-p)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
956 (ediff-set-face 'foreground 'ediff-fine-diff-face-B "Black")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
957 (ediff-set-face 'background 'ediff-fine-diff-face-B "cyan"))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
958 (t (set-face-underline-p 'ediff-fine-diff-face-B t))))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
959 'ediff-fine-diff-face-B))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
960 "Face for highlighting the refinement of the selected diff in buffer B.")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
961
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
962 (defvar ediff-fine-diff-face-C
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
963 (if (ediff-has-face-support-p)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
964 (progn
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
965 (make-face 'ediff-fine-diff-face-C)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
966 (ediff-hide-face 'ediff-fine-diff-face-C)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
967 (or (face-differs-from-default-p 'ediff-fine-diff-face-C)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
968 (cond ((ediff-color-display-p)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
969 (ediff-set-face 'foreground 'ediff-fine-diff-face-C "black")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
970 (ediff-set-face
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
971 'background 'ediff-fine-diff-face-C "Turquoise"))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
972 (t (set-face-underline-p 'ediff-fine-diff-face-C t))))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
973 'ediff-fine-diff-face-C))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
974 "Face for highlighting the refinement of the selected diff in buffer C.")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
975
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
976 (defvar ediff-fine-diff-face-Ancestor
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
977 (if (ediff-has-face-support-p)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
978 (progn
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
979 (make-face 'ediff-fine-diff-face-Ancestor)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
980 (ediff-hide-face 'ediff-fine-diff-face-Ancestor)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
981 (or (face-differs-from-default-p 'ediff-fine-diff-face-Ancestor)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
982 (copy-face
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
983 'ediff-fine-diff-face-C 'ediff-fine-diff-face-Ancestor))))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
984 "Face highlighting refinements of the selected diff in ancestor buffer.
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
985 Presently, this is not used, as difference regions are not refined in the
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
986 ancestor buffer.")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
987
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
988 (defvar ediff-even-diff-face-A
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
989 (if (ediff-has-face-support-p)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
990 (progn
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
991 (make-face 'ediff-even-diff-face-A)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
992 (ediff-hide-face 'ediff-even-diff-face-A)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
993 (or (face-differs-from-default-p 'ediff-even-diff-face-A)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
994 (cond ((ediff-color-display-p)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
995 (ediff-set-face
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
996 'foreground 'ediff-even-diff-face-A "black")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
997 (ediff-set-face
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
998 'background 'ediff-even-diff-face-A "light grey"))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
999 (t
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1000 (copy-face 'italic 'ediff-even-diff-face-A))))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1001 'ediff-even-diff-face-A))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1002 "Face used to highlight even-numbered differences in buffer A.")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1003
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1004 (defvar ediff-even-diff-face-B
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1005 (if (ediff-has-face-support-p)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1006 (progn
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1007 (make-face 'ediff-even-diff-face-B)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1008 (ediff-hide-face 'ediff-even-diff-face-B)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1009 (or (face-differs-from-default-p 'ediff-even-diff-face-B)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1010 (cond ((ediff-color-display-p)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1011 (ediff-set-face
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1012 'foreground 'ediff-even-diff-face-B "White")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1013 (ediff-set-face
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1014 'background 'ediff-even-diff-face-B "Gray"))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1015 (t
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1016 (copy-face 'italic 'ediff-even-diff-face-B))))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1017 'ediff-even-diff-face-B))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1018 "Face used to highlight even-numbered differences in buffer B.")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1019
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1020 (defvar ediff-even-diff-face-C
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1021 (if (ediff-has-face-support-p)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1022 (progn
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1023 (make-face 'ediff-even-diff-face-C)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1024 (ediff-hide-face 'ediff-even-diff-face-C)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1025 (or (face-differs-from-default-p 'ediff-even-diff-face-C)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1026 (copy-face 'ediff-even-diff-face-A 'ediff-even-diff-face-C))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1027 'ediff-even-diff-face-C))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1028 "Face used to highlight even-numbered differences in buffer C.")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1029
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1030 (defvar ediff-even-diff-face-Ancestor
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1031 (if (ediff-has-face-support-p)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1032 (progn
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1033 (make-face 'ediff-even-diff-face-Ancestor)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1034 (ediff-hide-face 'ediff-even-diff-face-Ancestor)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1035 (or (face-differs-from-default-p 'ediff-even-diff-face-Ancestor)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1036 (copy-face 'ediff-even-diff-face-C 'ediff-even-diff-face-Ancestor))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1037 'ediff-even-diff-face-Ancestor))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1038 "Face highlighting even-numbered differences in the ancestor buffer.")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1039
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1040 (defvar ediff-odd-diff-face-A
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1041 (if (ediff-has-face-support-p)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1042 (progn
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1043 (make-face 'ediff-odd-diff-face-A)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1044 (ediff-hide-face 'ediff-odd-diff-face-A)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1045 (or (face-differs-from-default-p 'ediff-odd-diff-face-A)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1046 (cond ((ediff-color-display-p)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1047 (ediff-set-face
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1048 'foreground 'ediff-odd-diff-face-A "White")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1049 (ediff-set-face
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1050 'background 'ediff-odd-diff-face-A "Gray"))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1051 (t
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1052 (copy-face 'italic 'ediff-odd-diff-face-A))))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1053 'ediff-odd-diff-face-A))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1054 "Face used to highlight odd-numbered differences in buffer A.")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1055
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1056 (defvar ediff-odd-diff-face-B
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1057 (if (ediff-has-face-support-p)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1058 (progn
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1059 (make-face 'ediff-odd-diff-face-B)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1060 (ediff-hide-face 'ediff-odd-diff-face-B)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1061 (or (face-differs-from-default-p 'ediff-odd-diff-face-B)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1062 (cond ((ediff-color-display-p)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1063 (ediff-set-face
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1064 'foreground 'ediff-odd-diff-face-B "Black")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1065 (ediff-set-face
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1066 'background 'ediff-odd-diff-face-B "light grey"))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1067 (t
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1068 (copy-face 'italic 'ediff-odd-diff-face-B))))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1069 'ediff-odd-diff-face-B))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1070 "Face used to highlight odd-numbered differences in buffer B.")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1071
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1072 (defvar ediff-odd-diff-face-C
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1073 (if (ediff-has-face-support-p)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1074 (progn
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1075 (make-face 'ediff-odd-diff-face-C)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1076 (ediff-hide-face 'ediff-odd-diff-face-C)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1077 (or (face-differs-from-default-p 'ediff-odd-diff-face-C)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1078 (copy-face 'ediff-odd-diff-face-A 'ediff-odd-diff-face-C))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1079 'ediff-odd-diff-face-C))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1080 "Face used to highlight odd-numbered differences in buffer C.")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1081
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1082 (defvar ediff-odd-diff-face-Ancestor
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1083 (if (ediff-has-face-support-p)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1084 (progn
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1085 (make-face 'ediff-odd-diff-face-Ancestor)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1086 (ediff-hide-face 'ediff-odd-diff-face-Ancestor)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1087 (or (face-differs-from-default-p 'ediff-odd-diff-face-Ancestor)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1088 (copy-face 'ediff-odd-diff-face-C 'ediff-odd-diff-face-Ancestor))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1089 'ediff-odd-diff-face-Ancestor))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1090 "Face used to highlight even-numbered differences in the ancestor buffer.")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1091
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1092 ;; Help echo
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1093 (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
1094 "A `refinement' of the current difference region")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1095 (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
1096 "A `refinement' of the current difference region")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1097 (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
1098 "A `refinement' of the current difference region")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1099 (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
1100 "A `refinement' of the current difference region")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1101
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1102
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1103 ;;; Overlays
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1104
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1105 (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
1106 "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
1107 (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
1108 "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
1109 (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
1110 "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
1111 (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
1112 "Overlay for the current difference region in the ancestor buffer.")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1113
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1114 ;; Compute priority of ediff overlay.
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1115 (defun ediff-highest-priority (start end buffer)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1116 (let ((pos (max 1 (1- start)))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1117 ovr-list)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1118 (if ediff-xemacs-p
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1119 (1+ ediff-shadow-overlay-priority)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1120 (ediff-eval-in-buffer buffer
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1121 (while (< pos (min (point-max) (1+ end)))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1122 (setq ovr-list (append (overlays-at pos) ovr-list))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1123 (setq pos (next-overlay-change pos)))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1124 (1+ (apply '+
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1125 (mapcar (function
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1126 (lambda (ovr)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1127 (if ovr
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1128 (or (ediff-overlay-get ovr 'priority) 0)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1129 0)))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1130 ovr-list)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1131 ))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1132 ))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1133
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1134
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1135 (defvar ediff-toggle-read-only-function nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1136 "*Specifies the function to be used to toggle read-only.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1137 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
1138 Normally, this is the `toggle-read-only' function, but, if version
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1139 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
1140
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1141
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1142 ;;; Misc
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1143
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1144 ;; if nil, this silences some messages
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1145 (defconst ediff-verbose-p t)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1146
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1147 (defvar ediff-no-emacs-help-in-control-buffer nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1148 "*Non-nil means C-h should not invoke Emacs help in control buffer.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1149 Instead, C-h jumps to previous difference.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1150
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1151 (defvar ediff-temp-file-prefix
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1152 (let ((env (or (getenv "TMPDIR")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1153 (getenv "TMP")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1154 (getenv "TEMP")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1155 d)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1156 (setq d (if (and env (> (length env) 0))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1157 env
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1158 (cond ((memq system-type '(vax-vms axp-vms)) "SYS$SCRATCH:")
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1159 ((eq system-type 'ms-dos) "c:/")
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1160 (t "/tmp"))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1161 ;; The following is to make sure we get something to which we can
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1162 ;; add directory levels on VMS.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1163 (setq d (file-name-as-directory (directory-file-name d)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1164 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1165 "*Prefix to put on Ediff temporary file names.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1166 Do not start with `~/' or `~user-name/'.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1167
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1168 (defvar ediff-temp-file-mode 384 ; u=rw only
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1169 "*Mode for Ediff temporary files.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1170
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1171 ;; Metacharacters that have to be protected from the shell when executing
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1172 ;; a diff/diff3 command.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1173 (defvar ediff-metachars "[ \t\n!\"#$&'()*;<=>?[\\^`{|~]"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1174 "Characters that must be quoted with \\ when used in a shell command line.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1175 More precisely, a regexp to match any one such character.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1176
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1177 ;; needed to simulate frame-char-width in XEmacs.
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1178 (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
1179
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1180
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1181 (ediff-defvar-local ediff-temp-file-A nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1182 "Temporary file used for refining difference regions in buffer A.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1183 (ediff-defvar-local ediff-temp-file-B nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1184 "Temporary file used for refining difference regions in buffer B.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1185 (ediff-defvar-local ediff-temp-file-C nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1186 "Temporary file used for refining difference regions in buffer C.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1187
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1188 ;;; In-line functions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1189
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1190 (defsubst ediff-file-remote-p (file-name)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1191 (if (fboundp ediff-ange-ftp-ftp-name)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1192 (funcall ediff-ange-ftp-ftp-name file-name)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1193
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1194
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1195 (defsubst ediff-frame-unsplittable-p (frame)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
1196 (cdr (assq 'unsplittable (frame-parameters frame))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1197
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1198 (defsubst ediff-get-next-window (wind prev-wind)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1199 (or (window-live-p wind)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1200 (setq wind (if prev-wind
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1201 (next-window wind)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1202 (selected-window)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1203
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1204
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1205 (defsubst ediff-kill-buffer-carefully (buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1206 "Kill buffer BUF if it exists."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1207 (if (ediff-buffer-live-p buf)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1208 (kill-buffer (get-buffer buf))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1209
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1210
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1211 (defsubst ediff-highlight-diff (n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1212 "Put face on diff N. Invoked for X displays only."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1213 (ediff-highlight-diff-in-one-buffer n 'A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1214 (ediff-highlight-diff-in-one-buffer n 'B)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1215 (ediff-highlight-diff-in-one-buffer n 'C)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1216 (ediff-highlight-diff-in-one-buffer n 'Ancestor)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1217 )
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1218
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1219
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1220 (defsubst ediff-unhighlight-diff ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1221 "Remove overlays from buffers A, B, and C."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1222 (ediff-unhighlight-diff-in-one-buffer 'A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1223 (ediff-unhighlight-diff-in-one-buffer 'B)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1224 (ediff-unhighlight-diff-in-one-buffer 'C)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1225 (ediff-unhighlight-diff-in-one-buffer 'Ancestor)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1226 )
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1227
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1228 ;; delete highlighting overlays, restore faces to their original form
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1229 (defsubst ediff-unhighlight-diffs-totally ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1230 (ediff-unhighlight-diffs-totally-in-one-buffer 'A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1231 (ediff-unhighlight-diffs-totally-in-one-buffer 'B)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1232 (ediff-unhighlight-diffs-totally-in-one-buffer 'C)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1233 (ediff-unhighlight-diffs-totally-in-one-buffer 'Ancestor)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1234 )
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1235
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1236 (defsubst ediff-background-face (buf-type dif-num)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1237 ;; The value of dif-num is always 1- the one that user sees.
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1238 ;; This is why even face is used when dif-num is odd.
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1239 (intern (format (if (ediff-odd-p dif-num)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1240 "ediff-even-diff-face-%S"
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1241 "ediff-odd-diff-face-%S")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1242 buf-type)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1243
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1244
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1245 ;; arg is a record for a given diff in a difference vector
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1246 ;; this record is itself a vector
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1247 (defsubst ediff-clear-fine-diff-vector (diff-record)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1248 (if diff-record
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1249 (mapcar 'ediff-delete-overlay
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1250 (ediff-get-fine-diff-vector-from-diff-record diff-record))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1251
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1252 (defsubst ediff-clear-fine-differences-in-one-buffer (n buf-type)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1253 (ediff-clear-fine-diff-vector (ediff-get-difference n buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1254 (ediff-set-fine-diff-vector n buf-type nil))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1255
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1256 (defsubst ediff-clear-fine-differences (n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1257 (ediff-clear-fine-differences-in-one-buffer n 'A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1258 (ediff-clear-fine-differences-in-one-buffer n 'B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1259 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1260 (ediff-clear-fine-differences-in-one-buffer n 'C)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1261
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1262
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1263 (defsubst ediff-convert-fine-diffs-to-overlays (diff-list region-num)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1264 (ediff-set-fine-overlays-in-one-buffer 'A diff-list region-num)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1265 (ediff-set-fine-overlays-in-one-buffer 'B diff-list region-num)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1266 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1267 (ediff-set-fine-overlays-in-one-buffer 'C diff-list region-num)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1268 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1269
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1270 (defsubst ediff-mouse-event-p (event)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1271 (if ediff-xemacs-p
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1272 (button-event-p event)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1273 (string-match "mouse" (format "%S" (event-basic-type event)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1274 ))
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1275
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1276
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1277 (defsubst ediff-key-press-event-p (event)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1278 (if ediff-xemacs-p
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1279 (key-press-event-p event)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1280 (or (char-or-string-p event) (symbolp event))))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1281
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1282 (defun ediff-event-point (event)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1283 (cond ((ediff-mouse-event-p event)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1284 (if ediff-xemacs-p
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1285 (event-point event)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1286 (posn-point (event-start event))))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1287 ((ediff-key-press-event-p event)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1288 (point))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1289 (t (error))))
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1290
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1291 (defun ediff-event-buffer (event)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1292 (cond ((ediff-mouse-event-p event)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1293 (if ediff-xemacs-p
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1294 (event-buffer event)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1295 (window-buffer (posn-window (event-start event)))))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1296 ((ediff-key-press-event-p event)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1297 (current-buffer))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1298 (t (error))))
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1299
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1300
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1301 (defsubst ediff-frame-iconified-p (frame)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
1302 (if (and (ediff-window-display-p) (frame-live-p frame))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1303 (if ediff-xemacs-p
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
1304 (frame-iconified-p frame)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1305 (eq (frame-visible-p frame) 'icon))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1306
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1307 (defsubst ediff-window-visible-p (wind)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
1308 ;; under TTY, window-live-p also means window is visible
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1309 (and (window-live-p wind)
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
1310 (or (not (ediff-window-display-p))
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
1311 (frame-visible-p (window-frame wind)))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1312
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1313
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1314 (defsubst ediff-frame-char-width (frame)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1315 (if ediff-xemacs-p
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
1316 (/ (frame-pixel-width frame) (frame-width frame))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1317 (frame-char-width frame)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1318
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1319 (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
1320 (or frame (setq frame (selected-frame)))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
1321 (if (ediff-window-display-p)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1322 (let ((frame-or-wind frame))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1323 (if ediff-xemacs-p
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1324 (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
1325 (or do-not-grab-mouse
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1326 ;; don't set mouse if the user said to never do this
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1327 (not ediff-grab-mouse)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1328 ;; 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
1329 ;; 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
1330 ;; sessions that are not part of a group (this is done in
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1331 ;; ediff-recenter). The condition below affects only terminating
13977
11784c04028a (ediff-keep-variants): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 13494
diff changeset
1332 ;; 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
1333 ;; a meta buffer).
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1334 (and (eq ediff-grab-mouse 'maybe)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1335 (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
1336 (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
1337 )))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1338
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1339 (defsubst ediff-spy-after-mouse ()
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1340 (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
1341
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1342 ;; It is not easy to find out when the user grabs the mouse, since emacs and
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1343 ;; xemacs behave differently when mouse is not in any frame. Also, this is
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1344 ;; 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
1345 (defun ediff-user-grabbed-mouse ()
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1346 (if ediff-mouse-pixel-position
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1347 (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
1348 (car (mouse-pixel-position)))))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1349 ((and (car (cdr ediff-mouse-pixel-position))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1350 (car (cdr (mouse-pixel-position)))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1351 (cdr (cdr ediff-mouse-pixel-position))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1352 (cdr (cdr (mouse-pixel-position))))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1353 (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
1354 (car (cdr (mouse-pixel-position)))))
13977
11784c04028a (ediff-keep-variants): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 13494
diff changeset
1355 ediff-mouse-pixel-threshold)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1356 (< (abs (- (cdr (cdr ediff-mouse-pixel-position))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1357 (cdr (cdr (mouse-pixel-position)))))
13977
11784c04028a (ediff-keep-variants): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 13494
diff changeset
1358 ediff-mouse-pixel-threshold))))
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1359 (t nil))))
12085
589a32fa67a9 Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents: 11234
diff changeset
1360
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1361 (defsubst ediff-frame-char-height (frame)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1362 (if ediff-xemacs-p
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1363 (glyph-height ediff-H-glyph (selected-window frame))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1364 (frame-char-height frame)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1365
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1366
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1367 (defsubst ediff-empty-overlay-p (overl)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1368 (= (ediff-overlay-start overl) (ediff-overlay-end overl)))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1369
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1370 ;; like overlay-buffer in Emacs. In XEmacs, returns nil if the extent is
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1371 ;; dead. Otherwise, works like extent-buffer
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1372 (defun ediff-overlay-buffer (overl)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1373 (if ediff-emacs-p
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1374 (overlay-buffer overl)
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1375 (and (extent-live-p overl) (extent-object overl))))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1376
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1377 ;; like overlay-get in Emacs. In XEmacs, returns nil if the extent is
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1378 ;; dead. Otherwise, like extent-property
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1379 (defun ediff-overlay-get (overl property)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1380 (if ediff-emacs-p
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1381 (overlay-get overl property)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1382 (and (extent-live-p overl) (extent-property overl property))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1383
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1384 ;; t if diff region is empty.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1385 ;; In case of buffer C, t also if it is not a 3way
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1386 ;; comparison job (merging jobs return t as well).
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1387 (defun ediff-empty-diff-region-p (n buf-type)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1388 (if (eq buf-type 'C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1389 (or (not ediff-3way-comparison-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1390 (= (ediff-get-diff-posn 'C 'beg n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1391 (ediff-get-diff-posn 'C 'end n)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1392 (= (ediff-get-diff-posn buf-type 'beg n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1393 (ediff-get-diff-posn buf-type 'end n))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1394
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1395 ;; Test if diff region is white space only.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1396 ;; If 2-way job and buf-type = C, then returns t.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1397 (defun ediff-whitespace-diff-region-p (n buf-type)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1398 (or (and (eq buf-type 'C) (not ediff-3way-job))
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1399 (ediff-empty-diff-region-p n buf-type)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1400 (let ((beg (ediff-get-diff-posn buf-type 'beg n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1401 (end (ediff-get-diff-posn buf-type 'end n)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1402 (ediff-eval-in-buffer (ediff-get-buffer buf-type)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1403 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1404 (goto-char beg)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1405 (skip-chars-forward ediff-whitespace)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1406 (>= (point) end))))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1407
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1408 ;; temporarily uses DIR to abbreviate file name
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1409 ;; if DIR is nil, use default-directory
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1410 (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
1411 (cond ((stringp dir)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1412 (let ((directory-abbrev-alist (list (cons dir ""))))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1413 (abbreviate-file-name file)))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1414 (ediff-emacs-p (abbreviate-file-name file))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1415 (t ; XEmacs requires addl argument
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1416 (abbreviate-file-name file t))))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1417
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1418 ;; Takes a directory and returns the parent directory.
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1419 ;; does nothing to `/'. If the ARG is a regular file,
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1420 ;; strip the file AND the last dir.
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1421 (defun ediff-strip-last-dir (dir)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1422 (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
1423 (setq dir (expand-file-name dir))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1424 (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
1425 (let* ((pos (1- (length dir)))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1426 (last-char (aref dir pos)))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1427 (if (and (> pos 0) (= last-char ?/))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1428 (setq dir (substring dir 0 pos)))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1429 (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
1430
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1431 (defun ediff-truncate-string-left (str newlen)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1432 ;; leave space for ... on the left
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1433 (let ((len (length str))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1434 substr)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1435 (if (<= len newlen)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1436 str
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1437 (setq newlen (max 0 (- newlen 3)))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1438 (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
1439 (concat "..." substr))))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1440
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1441 (defun ediff-abbrev-jobname (jobname)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1442 (cond ((eq jobname 'ediff-directories)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1443 "Compare two directories")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1444 ((eq jobname 'ediff-files)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1445 "Compare two files")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1446 ((eq jobname 'ediff-buffers)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1447 "Compare two buffers")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1448 ((eq jobname 'ediff-directories3)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1449 "Compare three directories")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1450 ((eq jobname 'ediff-files3)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1451 "Compare three files")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1452 ((eq jobname 'ediff-buffers3)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1453 "Compare three buffers")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1454 ((eq jobname 'ediff-revision)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1455 "Compare file with a version")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1456 ((eq jobname 'ediff-directory-revisions)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1457 "Compare dir files with versions")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1458 ((eq jobname 'ediff-merge-directory-revisions)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1459 "Merge dir files with versions")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1460 ((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
1461 "Merge dir versions via ancestors")
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1462 (t
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1463 (let* ((str (substring (symbol-name jobname) 6))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1464 (len (length str))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1465 (pos 0))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1466 (while (< pos len)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1467 (if (= pos 0)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1468 (aset str pos (upcase (aref str pos))))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1469 (if (= (aref str pos) ?-)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1470 (aset str pos ?\ ))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1471 (setq pos (1+ pos)))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1472 str))))
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1473
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1474
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1475
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1476 (defsubst ediff-get-region-contents (n buf-type ctrl-buf &optional start end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1477 (ediff-eval-in-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1478 (ediff-eval-in-buffer ctrl-buf (ediff-get-buffer buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1479 (buffer-substring
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1480 (or start (ediff-get-diff-posn buf-type 'beg n ctrl-buf))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1481 (or end (ediff-get-diff-posn buf-type 'end n ctrl-buf)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1482
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1483 ;; If ediff modified mode line, strip the modification
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1484 (defsubst ediff-strip-mode-line-format ()
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1485 (if (member (car mode-line-format) '(" A: " " B: " " C: " " Ancestor: "))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1486 (setq mode-line-format (nth 2 mode-line-format))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1487
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1488 ;; Verify that we have a difference selected.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1489 (defsubst ediff-valid-difference-p (&optional n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1490 (or n (setq n ediff-current-difference))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1491 (and (>= n 0) (< n ediff-number-of-differences)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1492
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1493 (defsubst ediff-show-all-diffs (n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1494 "Don't skip difference regions."
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1495 nil)
13128
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1496
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1497 (defsubst Xor (a b)
b0ec8d932b35 (ediff-abbreviate-file-name): function modified.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12212
diff changeset
1498 (or (and a (not b)) (and (not a) b)))
13216
b9dc8cc658d5 Moved defsubsts up.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 13128
diff changeset
1499
b9dc8cc658d5 Moved defsubsts up.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 13128
diff changeset
1500 (defsubst ediff-message-if-verbose (string &rest args)
b9dc8cc658d5 Moved defsubsts up.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 13128
diff changeset
1501 (if ediff-verbose-p
b9dc8cc658d5 Moved defsubsts up.
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 13128
diff changeset
1502 (apply 'message string args)))
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14534
diff changeset
1503
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1504 (defun ediff-file-attributes (filename attr-number)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1505 (let ((handler (find-file-name-handler filename 'find-file-noselect)))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1506 (if (and handler (string-match "ange-ftp" (format "%S" handler)))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1507 -1
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1508 (nth attr-number (file-attributes filename)))))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1509 (defsubst ediff-file-size (filename)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1510 (ediff-file-attributes filename 7))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1511 (defsubst ediff-file-modtime (filename)
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1512 (ediff-file-attributes filename 5))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1513
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1514
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1515
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14582
diff changeset
1516
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1517
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1518 (provide 'ediff-init)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1519
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1520
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1521 ;;; ediff-init.el ends here