Mercurial > emacs
annotate lisp/ediff-util.el @ 87919:5e627a8698d8
* replace.el (occur-mode-find-occurrence-hook): New hook that can
be used to reveal or highlight the location of a match.
(occur-mode-goto-occurrence)
(occur-mode-goto-occurrence-other-window)
(occur-mode-display-occurrence): Run
`occur-mode-find-occurrence-hook'.
author | Carsten Dominik <dominik@science.uva.nl> |
---|---|
date | Wed, 23 Jan 2008 10:49:31 +0000 |
parents | f2c8fd594360 |
children | c70e45a7acfd 5fc145fcebe2 |
rev | line source |
---|---|
11042 | 1 ;;; ediff-util.el --- the core commands and utilities of ediff |
14169 | 2 |
62727
79e4354d107b
(ediff-mode): Use run-mode-hooks.
Lute Kamstra <lute@gnu.org>
parents:
54090
diff
changeset
|
3 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
79721 | 4 ;; 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
5 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
11042 | 7 |
8 ;; This file is part of GNU Emacs. | |
9 | |
10 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
11 ;; it under the terms of the GNU General Public License as published by | |
78236
9355f9b7bbff
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
75389
diff
changeset
|
12 ;; the Free Software Foundation; either version 3, or (at your option) |
11042 | 13 ;; any later version. |
14 | |
15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 ;; GNU General Public License for more details. | |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
14169 | 21 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
64091 | 22 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
23 ;; Boston, MA 02110-1301, USA. | |
11042 | 24 |
38422
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
36857
diff
changeset
|
25 ;;; Commentary: |
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
36857
diff
changeset
|
26 |
11042 | 27 ;;; Code: |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
28 |
11042 | 29 |
18054 | 30 ;; Compiler pacifier |
31 (defvar ediff-patch-diagnostics) | |
32 (defvar ediff-patchbufer) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
33 (defvar ediff-use-toolbar-p) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
34 (defvar ediff-toolbar-height) |
18054 | 35 (defvar ediff-toolbar) |
36 (defvar ediff-toolbar-3way) | |
37 (defvar bottom-toolbar) | |
38 (defvar bottom-toolbar-visible-p) | |
39 (defvar bottom-toolbar-height) | |
40 (defvar mark-active) | |
41 | |
42288
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
42 (defvar ediff-after-quit-hook-internal nil) |
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
43 |
87691
f2c8fd594360
2008-01-10 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
87678
diff
changeset
|
44 (eval-and-compile |
f2c8fd594360
2008-01-10 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
87678
diff
changeset
|
45 (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))) |
f2c8fd594360
2008-01-10 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
87678
diff
changeset
|
46 |
18054 | 47 (eval-when-compile |
48 (let ((load-path (cons (expand-file-name ".") load-path))) | |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68651
diff
changeset
|
49 (provide 'ediff-util) ; to break recursive load cycle |
18054 | 50 (or (featurep 'ediff-init) |
86465
c1445e6992c4
Load ediff-*.el files silently.
Glenn Morris <rgm@gnu.org>
parents:
85972
diff
changeset
|
51 (load "ediff-init.el" nil t 'nosuffix)) |
18054 | 52 (or (featurep 'ediff-help) |
86465
c1445e6992c4
Load ediff-*.el files silently.
Glenn Morris <rgm@gnu.org>
parents:
85972
diff
changeset
|
53 (load "ediff-help.el" nil t 'nosuffix)) |
18054 | 54 (or (featurep 'ediff-mult) |
86465
c1445e6992c4
Load ediff-*.el files silently.
Glenn Morris <rgm@gnu.org>
parents:
85972
diff
changeset
|
55 (load "ediff-mult.el" nil t 'nosuffix)) |
18054 | 56 (or (featurep 'ediff-wind) |
86465
c1445e6992c4
Load ediff-*.el files silently.
Glenn Morris <rgm@gnu.org>
parents:
85972
diff
changeset
|
57 (load "ediff-wind.el" nil t 'nosuffix)) |
18054 | 58 (or (featurep 'ediff-diff) |
86465
c1445e6992c4
Load ediff-*.el files silently.
Glenn Morris <rgm@gnu.org>
parents:
85972
diff
changeset
|
59 (load "ediff-diff.el" nil t 'nosuffix)) |
18054 | 60 (or (featurep 'ediff-merg) |
86465
c1445e6992c4
Load ediff-*.el files silently.
Glenn Morris <rgm@gnu.org>
parents:
85972
diff
changeset
|
61 (load "ediff-merg.el" nil t 'nosuffix)) |
18054 | 62 (or (featurep 'ediff) |
86465
c1445e6992c4
Load ediff-*.el files silently.
Glenn Morris <rgm@gnu.org>
parents:
85972
diff
changeset
|
63 (load "ediff.el" nil t 'nosuffix)) |
18054 | 64 (or (featurep 'ediff-tbar) |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85890
diff
changeset
|
65 (featurep 'emacs) |
18054 | 66 (load "ediff-tbar.el" 'noerror nil 'nosuffix)) |
67 )) | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
68 ;; end pacifier |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
69 |
21940 | 70 |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
71 (require 'ediff-init) |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
72 (require 'ediff-help) |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
73 (require 'ediff-mult) |
18054 | 74 (require 'ediff-wind) |
75 (require 'ediff-diff) | |
76 (require 'ediff-merg) | |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
77 |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85890
diff
changeset
|
78 (if (featurep 'xemacs) |
21940 | 79 (require 'ediff-tbar)) |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
80 |
11042 | 81 |
82 ;;; Functions | |
83 | |
84 (defun ediff-mode () | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
85 "Ediff mode controls all operations in a single Ediff session. |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
86 This mode is entered through one of the following commands: |
11042 | 87 `ediff' |
88 `ediff-files' | |
89 `ediff-buffers' | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
90 `ebuffers' |
11042 | 91 `ediff3' |
92 `ediff-files3' | |
93 `ediff-buffers3' | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
94 `ebuffers3' |
11042 | 95 `ediff-merge' |
96 `ediff-merge-files' | |
97 `ediff-merge-files-with-ancestor' | |
98 `ediff-merge-buffers' | |
99 `ediff-merge-buffers-with-ancestor' | |
100 `ediff-merge-revisions' | |
101 `ediff-merge-revisions-with-ancestor' | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
102 `ediff-windows-wordwise' |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
103 `ediff-windows-linewise' |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
104 `ediff-regions-wordwise' |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
105 `ediff-regions-linewise' |
11042 | 106 `epatch' |
107 `ediff-patch-file' | |
108 `ediff-patch-buffer' | |
109 `epatch-buffer' | |
18839 | 110 `erevision' |
11042 | 111 `ediff-revision' |
112 | |
113 Commands: | |
114 \\{ediff-mode-map}" | |
115 (kill-all-local-variables) | |
116 (setq major-mode 'ediff-mode) | |
117 (setq mode-name "Ediff") | |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64091
diff
changeset
|
118 ;; We use run-hooks instead of run-mode-hooks for two reasons. |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64091
diff
changeset
|
119 ;; The ediff control buffer is read-only and it is not supposed to be |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64091
diff
changeset
|
120 ;; modified by minor modes and such. So, run-mode-hooks doesn't do anything |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64091
diff
changeset
|
121 ;; useful here on top of what run-hooks does. |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64091
diff
changeset
|
122 ;; Second, changing run-hooks to run-mode-hooks would require an |
84864
cac94194ce6d
(ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents:
82467
diff
changeset
|
123 ;; if-statement, since XEmacs doesn't have this. |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64091
diff
changeset
|
124 (run-hooks 'ediff-mode-hook)) |
11042 | 125 |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
126 |
11042 | 127 |
128 ;;; Build keymaps | |
129 | |
130 (ediff-defvar-local ediff-mode-map nil | |
131 "Local keymap used in Ediff mode. | |
132 This is local to each Ediff Control Panel, so they may vary from invocation | |
133 to invocation.") | |
134 | |
135 ;; Set up the keymap in the control buffer | |
136 (defun ediff-set-keys () | |
137 "Set up Ediff keymap, if necessary." | |
138 (if (null ediff-mode-map) | |
139 (ediff-setup-keymap)) | |
140 (use-local-map ediff-mode-map)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
141 |
11042 | 142 ;; Reload Ediff keymap. For debugging only. |
143 (defun ediff-reload-keymap () | |
144 (interactive) | |
145 (setq ediff-mode-map nil) | |
146 (ediff-set-keys)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
147 |
11042 | 148 |
149 (defun ediff-setup-keymap () | |
150 "Set up the keymap used in the control buffer of Ediff." | |
151 (setq ediff-mode-map (make-sparse-keymap)) | |
152 (suppress-keymap ediff-mode-map) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
153 |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
154 (define-key ediff-mode-map |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85890
diff
changeset
|
155 (if (featurep 'emacs) [mouse-2] [button2]) 'ediff-help-for-quick-help) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
156 (define-key ediff-mode-map "\C-m" 'ediff-help-for-quick-help) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
157 |
11042 | 158 (define-key ediff-mode-map "p" 'ediff-previous-difference) |
159 (define-key ediff-mode-map "\C-?" 'ediff-previous-difference) | |
160 (define-key ediff-mode-map [delete] 'ediff-previous-difference) | |
161 (define-key ediff-mode-map "\C-h" (if ediff-no-emacs-help-in-control-buffer | |
162 'ediff-previous-difference nil)) | |
19774 | 163 ;; must come after C-h, or else C-h wipes out backspace's binding in XEmacs |
164 (define-key ediff-mode-map [backspace] 'ediff-previous-difference) | |
11042 | 165 (define-key ediff-mode-map "n" 'ediff-next-difference) |
166 (define-key ediff-mode-map " " 'ediff-next-difference) | |
167 (define-key ediff-mode-map "j" 'ediff-jump-to-difference) | |
168 (define-key ediff-mode-map "g" nil) | |
169 (define-key ediff-mode-map "ga" 'ediff-jump-to-difference-at-point) | |
170 (define-key ediff-mode-map "gb" 'ediff-jump-to-difference-at-point) | |
171 (define-key ediff-mode-map "q" 'ediff-quit) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
172 (define-key ediff-mode-map "D" 'ediff-show-diff-output) |
11042 | 173 (define-key ediff-mode-map "z" 'ediff-suspend) |
174 (define-key ediff-mode-map "\C-l" 'ediff-recenter) | |
175 (define-key ediff-mode-map "|" 'ediff-toggle-split) | |
176 (define-key ediff-mode-map "h" 'ediff-toggle-hilit) | |
177 (or ediff-word-mode | |
178 (define-key ediff-mode-map "@" 'ediff-toggle-autorefine)) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
179 (if ediff-narrow-job |
11042 | 180 (define-key ediff-mode-map "%" 'ediff-toggle-narrow-region)) |
181 (define-key ediff-mode-map "~" 'ediff-swap-buffers) | |
182 (define-key ediff-mode-map "v" 'ediff-scroll-vertically) | |
183 (define-key ediff-mode-map "\C-v" 'ediff-scroll-vertically) | |
184 (define-key ediff-mode-map "^" 'ediff-scroll-vertically) | |
185 (define-key ediff-mode-map "\M-v" 'ediff-scroll-vertically) | |
186 (define-key ediff-mode-map "V" 'ediff-scroll-vertically) | |
187 (define-key ediff-mode-map "<" 'ediff-scroll-horizontally) | |
188 (define-key ediff-mode-map ">" 'ediff-scroll-horizontally) | |
189 (define-key ediff-mode-map "i" 'ediff-status-info) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
190 (define-key ediff-mode-map "E" 'ediff-documentation) |
11042 | 191 (define-key ediff-mode-map "?" 'ediff-toggle-help) |
192 (define-key ediff-mode-map "!" 'ediff-update-diffs) | |
20206 | 193 (define-key ediff-mode-map "M" 'ediff-show-current-session-meta-buffer) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
194 (define-key ediff-mode-map "R" 'ediff-show-registry) |
11042 | 195 (or ediff-word-mode |
196 (define-key ediff-mode-map "*" 'ediff-make-or-kill-fine-diffs)) | |
197 (define-key ediff-mode-map "a" nil) | |
198 (define-key ediff-mode-map "b" nil) | |
199 (define-key ediff-mode-map "r" nil) | |
200 (cond (ediff-merge-job | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
201 ;; Will barf if no ancestor |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
202 (define-key ediff-mode-map "/" 'ediff-show-ancestor) |
11042 | 203 ;; In merging, we allow only A->C and B->C copying. |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
204 (define-key ediff-mode-map "a" 'ediff-copy-A-to-C) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
205 (define-key ediff-mode-map "b" 'ediff-copy-B-to-C) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
206 (define-key ediff-mode-map "r" 'ediff-restore-diff-in-merge-buffer) |
11042 | 207 (define-key ediff-mode-map "s" 'ediff-shrink-window-C) |
208 (define-key ediff-mode-map "+" 'ediff-combine-diffs) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
209 (define-key ediff-mode-map "$" nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
210 (define-key ediff-mode-map "$$" 'ediff-toggle-show-clashes-only) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
211 (define-key ediff-mode-map "$*" 'ediff-toggle-skip-changed-regions) |
11042 | 212 (define-key ediff-mode-map "&" 'ediff-re-merge)) |
213 (ediff-3way-comparison-job | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
214 (define-key ediff-mode-map "ab" 'ediff-copy-A-to-B) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
215 (define-key ediff-mode-map "ba" 'ediff-copy-B-to-A) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
216 (define-key ediff-mode-map "ac" 'ediff-copy-A-to-C) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
217 (define-key ediff-mode-map "bc" 'ediff-copy-B-to-C) |
11042 | 218 (define-key ediff-mode-map "c" nil) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
219 (define-key ediff-mode-map "ca" 'ediff-copy-C-to-A) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
220 (define-key ediff-mode-map "cb" 'ediff-copy-C-to-B) |
11042 | 221 (define-key ediff-mode-map "ra" 'ediff-restore-diff) |
222 (define-key ediff-mode-map "rb" 'ediff-restore-diff) | |
223 (define-key ediff-mode-map "rc" 'ediff-restore-diff) | |
224 (define-key ediff-mode-map "C" 'ediff-toggle-read-only)) | |
225 (t ; 2-way comparison | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
226 (define-key ediff-mode-map "a" 'ediff-copy-A-to-B) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
227 (define-key ediff-mode-map "b" 'ediff-copy-B-to-A) |
11042 | 228 (define-key ediff-mode-map "ra" 'ediff-restore-diff) |
229 (define-key ediff-mode-map "rb" 'ediff-restore-diff)) | |
230 ) ; cond | |
231 (define-key ediff-mode-map "G" 'ediff-submit-report) | |
232 (define-key ediff-mode-map "#" nil) | |
233 (define-key ediff-mode-map "#h" 'ediff-toggle-regexp-match) | |
234 (define-key ediff-mode-map "#f" 'ediff-toggle-regexp-match) | |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68651
diff
changeset
|
235 (define-key ediff-mode-map "#c" 'ediff-toggle-ignore-case) |
11042 | 236 (or ediff-word-mode |
237 (define-key ediff-mode-map "##" 'ediff-toggle-skip-similar)) | |
238 (define-key ediff-mode-map "o" nil) | |
239 (define-key ediff-mode-map "A" 'ediff-toggle-read-only) | |
240 (define-key ediff-mode-map "B" 'ediff-toggle-read-only) | |
241 (define-key ediff-mode-map "w" nil) | |
242 (define-key ediff-mode-map "wa" 'ediff-save-buffer) | |
243 (define-key ediff-mode-map "wb" 'ediff-save-buffer) | |
244 (define-key ediff-mode-map "wd" 'ediff-save-buffer) | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
245 (define-key ediff-mode-map "=" 'ediff-inferior-compare-regions) |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
246 (if (and (fboundp 'ediff-show-patch-diagnostics) (ediff-patch-job)) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
247 (define-key ediff-mode-map "P" 'ediff-show-patch-diagnostics)) |
11042 | 248 (if ediff-3way-job |
249 (progn | |
250 (define-key ediff-mode-map "wc" 'ediff-save-buffer) | |
251 (define-key ediff-mode-map "gc" 'ediff-jump-to-difference-at-point) | |
252 )) | |
253 | |
254 (define-key ediff-mode-map "m" 'ediff-toggle-wide-display) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
255 |
11042 | 256 ;; Allow ediff-mode-map to be referenced indirectly |
257 (fset 'ediff-mode-map ediff-mode-map) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
258 (run-hooks 'ediff-keymap-setup-hook)) |
11042 | 259 |
260 | |
261 ;;; Setup functions | |
262 | |
18054 | 263 ;; Common startup entry for all Ediff functions It now returns control buffer |
264 ;; so other functions can do post-processing SETUP-PARAMETERS is a list of the | |
265 ;; form ((param .val) (param . val)...) This serves a similar purpose to | |
266 ;; STARTUP-HOOKS, but these parameters are set in the new control buffer right | |
267 ;; after this buf is created and before any windows are set and such. | |
11042 | 268 (defun ediff-setup (buffer-A file-A buffer-B file-B buffer-C file-C |
20206 | 269 startup-hooks setup-parameters |
270 &optional merge-buffer-file) | |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
271 (run-hooks 'ediff-before-setup-hook) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
272 ;; ediff-convert-standard-filename puts file names in the form appropriate |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
273 ;; for the OS at hand. |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
274 (setq file-A (ediff-convert-standard-filename (expand-file-name file-A))) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
275 (setq file-B (ediff-convert-standard-filename (expand-file-name file-B))) |
11042 | 276 (if (stringp file-C) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
277 (setq file-C |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
278 (ediff-convert-standard-filename (expand-file-name file-C)))) |
20206 | 279 (if (stringp merge-buffer-file) |
280 (progn | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
281 (setq merge-buffer-file |
20206 | 282 (ediff-convert-standard-filename |
283 (expand-file-name merge-buffer-file))) | |
284 ;; check the directory exists | |
285 (or (file-exists-p (file-name-directory merge-buffer-file)) | |
38422
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
36857
diff
changeset
|
286 (error "Directory %s given as place to save the merge doesn't exist" |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
287 (abbreviate-file-name |
20206 | 288 (file-name-directory merge-buffer-file)))) |
289 (if (and (file-exists-p merge-buffer-file) | |
290 (file-directory-p merge-buffer-file)) | |
291 (error "The merge buffer file %s must not be a directory" | |
292 (abbreviate-file-name merge-buffer-file))) | |
293 )) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
294 (let* ((control-buffer-name |
11042 | 295 (ediff-unique-buffer-name "*Ediff Control Panel" "*")) |
19047 | 296 (control-buffer (ediff-with-current-buffer buffer-A |
11042 | 297 (get-buffer-create control-buffer-name)))) |
19047 | 298 (ediff-with-current-buffer control-buffer |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
299 (ediff-mode) |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
300 |
18054 | 301 (make-local-variable 'ediff-use-long-help-message) |
302 (make-local-variable 'ediff-prefer-iconified-control-frame) | |
303 (make-local-variable 'ediff-split-window-function) | |
304 (make-local-variable 'ediff-default-variant) | |
305 (make-local-variable 'ediff-merge-window-share) | |
306 (make-local-variable 'ediff-window-setup-function) | |
307 (make-local-variable 'ediff-keep-variants) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
308 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
309 (ediff-cond-compile-for-xemacs-or-emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
310 (make-local-hook 'ediff-after-quit-hook-internal) ; xemacs form |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
311 nil ; emacs form |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
312 ) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
313 |
11042 | 314 ;; unwrap set up parameters passed as argument |
315 (while setup-parameters | |
316 (set (car (car setup-parameters)) (cdr (car setup-parameters))) | |
317 (setq setup-parameters (cdr setup-parameters))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
318 |
11042 | 319 ;; set variables classifying the current ediff job |
18054 | 320 ;; must come AFTER setup-parameters |
11042 | 321 (setq ediff-3way-comparison-job (ediff-3way-comparison-job) |
322 ediff-merge-job (ediff-merge-job) | |
323 ediff-merge-with-ancestor-job (ediff-merge-with-ancestor-job) | |
324 ediff-3way-job (ediff-3way-job) | |
325 ediff-diff3-job (ediff-diff3-job) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
326 ediff-narrow-job (ediff-narrow-job) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
327 ediff-windows-job (ediff-windows-job) |
11042 | 328 ediff-word-mode-job (ediff-word-mode-job)) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
329 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
330 ;; Don't delete variants in case of ediff-buffer-* jobs without asking. |
65856
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65689
diff
changeset
|
331 ;; This is because one may loose work---dangerous. |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
332 (if (string-match "buffer" (symbol-name ediff-job-name)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
333 (setq ediff-keep-variants t)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
334 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
335 (ediff-cond-compile-for-xemacs-or-emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
336 (make-local-hook 'pre-command-hook) ; xemacs form |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
337 nil ; emacs form |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
338 ) |
42288
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
339 |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
340 (if (ediff-window-display-p) |
42288
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
341 (add-hook 'pre-command-hook 'ediff-spy-after-mouse nil 'local)) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
342 (setq ediff-mouse-pixel-position (mouse-pixel-position)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
343 |
11042 | 344 ;; adjust for merge jobs |
345 (if ediff-merge-job | |
346 (let ((buf | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
347 ;; If default variant is `combined', the right stuff is |
11042 | 348 ;; inserted by ediff-do-merge |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
349 ;; Note: at some point, we tried to put ancestor buffer here |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
350 ;; (which is currently buffer C. This didn't work right |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
351 ;; because the merge buffer will contain lossage: diff regions |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
352 ;; in the ancestor, which correspond to revisions that agree |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
353 ;; in both buf A and B. |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
354 (cond ((eq ediff-default-variant 'default-B) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
355 buffer-B) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
356 (t buffer-A)))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
357 |
11042 | 358 (setq ediff-split-window-function |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
359 ediff-merge-split-window-function) |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
360 |
11042 | 361 ;; remember the ancestor buffer, if any |
362 (setq ediff-ancestor-buffer buffer-C) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
363 |
11042 | 364 (setq buffer-C |
365 (get-buffer-create | |
366 (ediff-unique-buffer-name "*ediff-merge" "*"))) | |
367 (save-excursion | |
368 (set-buffer buffer-C) | |
65627
511f8e9d22ca
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65582
diff
changeset
|
369 (insert-buffer-substring buf) |
65856
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65689
diff
changeset
|
370 (goto-char (point-min)) |
19047 | 371 (funcall (ediff-with-current-buffer buf major-mode)) |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
372 (widen) ; merge buffer is always widened |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
373 (add-hook 'local-write-file-hooks 'ediff-set-merge-mode nil t) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
374 ))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
375 (setq buffer-read-only nil |
11042 | 376 ediff-buffer-A buffer-A |
377 ediff-buffer-B buffer-B | |
378 ediff-buffer-C buffer-C | |
379 ediff-control-buffer control-buffer) | |
36857
f6386773ce30
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
36456
diff
changeset
|
380 |
f6386773ce30
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
36456
diff
changeset
|
381 (ediff-choose-syntax-table) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
382 |
11042 | 383 (setq ediff-control-buffer-suffix |
384 (if (string-match "<[0-9]*>" control-buffer-name) | |
385 (substring control-buffer-name | |
386 (match-beginning 0) (match-end 0)) | |
387 "") | |
388 ediff-control-buffer-number | |
389 (max | |
390 0 | |
391 (1- | |
392 (string-to-number | |
393 (substring | |
394 ediff-control-buffer-suffix | |
395 (or | |
396 (string-match "[0-9]+" ediff-control-buffer-suffix) | |
397 0)))))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
398 |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
399 (setq ediff-error-buffer |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
400 (get-buffer-create (ediff-unique-buffer-name "*ediff-errors" "*"))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
401 |
87009
2039ff581b31
* ediff-util.el (ediff-setup):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
86465
diff
changeset
|
402 (with-current-buffer ediff-error-buffer |
2039ff581b31
* ediff-util.el (ediff-setup):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
86465
diff
changeset
|
403 (setq buffer-undo-list t)) |
2039ff581b31
* ediff-util.el (ediff-setup):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
86465
diff
changeset
|
404 |
19047 | 405 (ediff-with-current-buffer buffer-A (ediff-strip-mode-line-format)) |
406 (ediff-with-current-buffer buffer-B (ediff-strip-mode-line-format)) | |
11042 | 407 (if ediff-3way-job |
19047 | 408 (ediff-with-current-buffer buffer-C (ediff-strip-mode-line-format))) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
409 (if (ediff-buffer-live-p ediff-ancestor-buffer) |
19047 | 410 (ediff-with-current-buffer ediff-ancestor-buffer |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
411 (ediff-strip-mode-line-format))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
412 |
11042 | 413 (ediff-save-protected-variables) ; save variables to be restored on exit |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
414 |
11042 | 415 ;; ediff-setup-diff-regions-function must be set after setup |
416 ;; parameters are processed. | |
417 (setq ediff-setup-diff-regions-function | |
418 (if ediff-diff3-job | |
419 'ediff-setup-diff-regions3 | |
420 'ediff-setup-diff-regions)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
421 |
11042 | 422 (setq ediff-wide-bounds |
423 (list (ediff-make-bullet-proof-overlay | |
424 '(point-min) '(point-max) ediff-buffer-A) | |
425 (ediff-make-bullet-proof-overlay | |
426 '(point-min) '(point-max) ediff-buffer-B) | |
427 (ediff-make-bullet-proof-overlay | |
428 '(point-min) '(point-max) ediff-buffer-C))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
429 |
11042 | 430 ;; This has effect only on ediff-windows/regions |
431 ;; In all other cases, ediff-visible-region sets visibility bounds to | |
432 ;; ediff-wide-bounds, and ediff-narrow-bounds are ignored. | |
433 (if ediff-start-narrowed | |
434 (setq ediff-visible-bounds ediff-narrow-bounds) | |
435 (setq ediff-visible-bounds ediff-wide-bounds)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
436 |
11042 | 437 (ediff-set-keys) ; comes after parameter setup |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
438 |
11042 | 439 ;; set up ediff-narrow-bounds, if not set |
440 (or ediff-narrow-bounds | |
441 (setq ediff-narrow-bounds ediff-wide-bounds)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
442 |
19047 | 443 ;; All these must be inside ediff-with-current-buffer control-buffer, |
11042 | 444 ;; since these vars are local to control-buffer |
445 ;; These won't run if there are errors in diff | |
19047 | 446 (ediff-with-current-buffer ediff-buffer-A |
11042 | 447 (ediff-nuke-selective-display) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
448 (run-hooks 'ediff-prepare-buffer-hook) |
19047 | 449 (if (ediff-with-current-buffer control-buffer ediff-merge-job) |
11042 | 450 (setq buffer-read-only t)) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
451 ;; add control-buffer to the list of sessions--no longer used, but may |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
452 ;; be used again in the future |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
453 (or (memq control-buffer ediff-this-buffer-ediff-sessions) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
454 (setq ediff-this-buffer-ediff-sessions |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
455 (cons control-buffer ediff-this-buffer-ediff-sessions))) |
18839 | 456 (if ediff-make-buffers-readonly-at-startup |
457 (setq buffer-read-only t)) | |
11042 | 458 ) |
18839 | 459 |
19047 | 460 (ediff-with-current-buffer ediff-buffer-B |
11042 | 461 (ediff-nuke-selective-display) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
462 (run-hooks 'ediff-prepare-buffer-hook) |
19047 | 463 (if (ediff-with-current-buffer control-buffer ediff-merge-job) |
11042 | 464 (setq buffer-read-only t)) |
465 ;; add control-buffer to the list of sessions | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
466 (or (memq control-buffer ediff-this-buffer-ediff-sessions) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
467 (setq ediff-this-buffer-ediff-sessions |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
468 (cons control-buffer ediff-this-buffer-ediff-sessions))) |
18839 | 469 (if ediff-make-buffers-readonly-at-startup |
470 (setq buffer-read-only t)) | |
11042 | 471 ) |
18839 | 472 |
11042 | 473 (if ediff-3way-job |
19047 | 474 (ediff-with-current-buffer ediff-buffer-C |
11042 | 475 (ediff-nuke-selective-display) |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
476 ;; the merge bufer should never be narrowed |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
477 ;; (it can happen if it is on rmail-mode or similar) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
478 (if (ediff-with-current-buffer control-buffer ediff-merge-job) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
479 (widen)) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
480 (run-hooks 'ediff-prepare-buffer-hook) |
11042 | 481 ;; add control-buffer to the list of sessions |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
482 (or (memq control-buffer ediff-this-buffer-ediff-sessions) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
483 (setq ediff-this-buffer-ediff-sessions |
11042 | 484 (cons control-buffer |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
485 ediff-this-buffer-ediff-sessions))) |
18839 | 486 (if ediff-make-buffers-readonly-at-startup |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
487 (setq buffer-read-only t) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
488 (setq buffer-read-only nil)) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
489 )) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
490 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
491 (if (ediff-buffer-live-p ediff-ancestor-buffer) |
19047 | 492 (ediff-with-current-buffer ediff-ancestor-buffer |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
493 (ediff-nuke-selective-display) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
494 (setq buffer-read-only t) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
495 (run-hooks 'ediff-prepare-buffer-hook) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
496 (or (memq control-buffer ediff-this-buffer-ediff-sessions) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
497 (setq ediff-this-buffer-ediff-sessions |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
498 (cons control-buffer |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
499 ediff-this-buffer-ediff-sessions))) |
11042 | 500 )) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
501 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
502 ;; the following must be after setting up ediff-narrow-bounds AND after |
11042 | 503 ;; nuking selective display |
504 (funcall ediff-setup-diff-regions-function file-A file-B file-C) | |
505 (setq ediff-number-of-differences (length ediff-difference-vector-A)) | |
506 (setq ediff-current-difference -1) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
507 |
11042 | 508 (ediff-make-current-diff-overlay 'A) |
509 (ediff-make-current-diff-overlay 'B) | |
510 (if ediff-3way-job | |
511 (ediff-make-current-diff-overlay 'C)) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
512 (if ediff-merge-with-ancestor-job |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
513 (ediff-make-current-diff-overlay 'Ancestor)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
514 |
11042 | 515 (ediff-setup-windows buffer-A buffer-B buffer-C control-buffer) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
516 |
11042 | 517 (let ((shift-A (ediff-overlay-start |
518 (ediff-get-value-according-to-buffer-type | |
519 'A ediff-narrow-bounds))) | |
520 (shift-B (ediff-overlay-start | |
521 (ediff-get-value-according-to-buffer-type | |
522 'B ediff-narrow-bounds))) | |
523 (shift-C (ediff-overlay-start | |
524 (ediff-get-value-according-to-buffer-type | |
525 'C ediff-narrow-bounds)))) | |
526 ;; position point in buf A | |
527 (save-excursion | |
528 (select-window ediff-window-A) | |
529 (goto-char shift-A)) | |
530 ;; position point in buf B | |
531 (save-excursion | |
532 (select-window ediff-window-B) | |
533 (goto-char shift-B)) | |
534 (if ediff-3way-job | |
535 (save-excursion | |
536 (select-window ediff-window-C) | |
537 (goto-char shift-C))) | |
538 ) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
539 |
11042 | 540 (select-window ediff-control-window) |
541 (ediff-visible-region) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
542 |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
543 (run-hooks 'startup-hooks) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
544 (ediff-arrange-autosave-in-merge-jobs merge-buffer-file) |
20206 | 545 |
11042 | 546 (ediff-refresh-mode-lines) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
547 (setq buffer-read-only t) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
548 (setq ediff-session-registry |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
549 (cons control-buffer ediff-session-registry)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
550 (ediff-update-registry) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
551 (if (ediff-buffer-live-p ediff-meta-buffer) |
20206 | 552 (ediff-update-meta-buffer |
553 ediff-meta-buffer nil ediff-meta-session-number)) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
554 (run-hooks 'ediff-startup-hook) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
555 ) ; eval in control-buffer |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
556 control-buffer)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
557 |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
558 |
11042 | 559 ;; This function assumes that we are in the window where control buffer is |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
560 ;; to reside. |
11042 | 561 (defun ediff-setup-control-buffer (ctl-buf) |
562 "Set up window for control buffer." | |
563 (if (window-dedicated-p (selected-window)) | |
564 (set-buffer ctl-buf) ; we are in control frame but just in case | |
565 (switch-to-buffer ctl-buf)) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
566 (let ((window-min-height 2)) |
11042 | 567 (erase-buffer) |
568 (ediff-set-help-message) | |
569 (insert ediff-help-message) | |
570 (shrink-window-if-larger-than-buffer) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
571 (or (ediff-multiframe-setup-p) |
11042 | 572 (ediff-indent-help-message)) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
573 (ediff-set-help-overlays) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
574 |
11042 | 575 (set-buffer-modified-p nil) |
576 (ediff-refresh-mode-lines) | |
577 (setq ediff-control-window (selected-window)) | |
578 (setq ediff-window-config-saved | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
579 (format "%S%S%S%S%S%S%S" |
11042 | 580 ediff-control-window |
581 ediff-window-A | |
582 ediff-window-B | |
583 ediff-window-C | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
584 ediff-split-window-function |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
585 (ediff-multiframe-setup-p) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
586 ediff-wide-display-p)) |
18054 | 587 |
588 ;; In multiframe, toolbar is set in ediff-setup-control-frame | |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
589 (if (not (ediff-multiframe-setup-p)) |
18054 | 590 (ediff-make-bottom-toolbar)) ; this checks if toolbar is requested |
11042 | 591 (goto-char (point-min)) |
592 (skip-chars-forward ediff-whitespace))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
593 |
20206 | 594 ;; This executes in control buffer and sets auto-save, visited file name, etc, |
595 ;; in the merge buffer | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
596 (defun ediff-arrange-autosave-in-merge-jobs (merge-buffer-file) |
20206 | 597 (if (not ediff-merge-job) |
598 () | |
599 (if (stringp merge-buffer-file) | |
600 (setq ediff-autostore-merges t | |
601 ediff-merge-store-file merge-buffer-file)) | |
602 (if (stringp ediff-merge-store-file) | |
603 (progn | |
604 ;; save before leaving ctl buffer | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
605 (ediff-verify-file-merge-buffer ediff-merge-store-file) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
606 (setq merge-buffer-file ediff-merge-store-file) |
20206 | 607 (ediff-with-current-buffer ediff-buffer-C |
608 (set-visited-file-name merge-buffer-file)))) | |
609 (ediff-with-current-buffer ediff-buffer-C | |
610 (setq buffer-offer-save t) ; ask before killing buffer | |
611 ;; make sure the contents is auto-saved | |
612 (auto-save-mode 1)) | |
613 )) | |
11042 | 614 |
615 | |
616 ;;; Commands for working with Ediff | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
617 |
11042 | 618 (defun ediff-update-diffs () |
619 "Recompute difference regions in buffers A, B, and C. | |
620 Buffers are not synchronized with their respective files, so changes done | |
621 to these buffers are not saved at this point---the user can do this later, | |
622 if necessary." | |
623 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
624 (ediff-barf-if-not-control-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
625 (if (and (ediff-buffer-live-p ediff-ancestor-buffer) |
19047 | 626 (not |
627 (y-or-n-p | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
628 "Ancestor buffer will not be used. Recompute diffs anyway? "))) |
19047 | 629 (error "Recomputation of differences canceled")) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
630 |
19047 | 631 (let ((point-A (ediff-with-current-buffer ediff-buffer-A (point))) |
632 ;;(point-B (ediff-with-current-buffer ediff-buffer-B (point))) | |
11042 | 633 (tmp-buffer (get-buffer-create ediff-tmp-buffer)) |
19047 | 634 (buf-A-file-name (buffer-file-name ediff-buffer-A)) |
635 (buf-B-file-name (buffer-file-name ediff-buffer-B)) | |
636 ;; (null ediff-buffer-C) is no problem, as we later check if | |
637 ;; ediff-buffer-C is alive | |
638 (buf-C-file-name (buffer-file-name ediff-buffer-C)) | |
11042 | 639 (overl-A (ediff-get-value-according-to-buffer-type |
640 'A ediff-narrow-bounds)) | |
641 (overl-B (ediff-get-value-according-to-buffer-type | |
642 'B ediff-narrow-bounds)) | |
643 (overl-C (ediff-get-value-according-to-buffer-type | |
644 'C ediff-narrow-bounds)) | |
645 beg-A end-A beg-B end-B beg-C end-C | |
646 file-A file-B file-C) | |
19047 | 647 |
648 (if (stringp buf-A-file-name) | |
649 (setq buf-A-file-name (file-name-nondirectory buf-A-file-name))) | |
650 (if (stringp buf-B-file-name) | |
651 (setq buf-B-file-name (file-name-nondirectory buf-B-file-name))) | |
652 (if (stringp buf-C-file-name) | |
653 (setq buf-C-file-name (file-name-nondirectory buf-C-file-name))) | |
654 | |
11042 | 655 (ediff-unselect-and-select-difference -1) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
656 |
11042 | 657 (setq beg-A (ediff-overlay-start overl-A) |
658 beg-B (ediff-overlay-start overl-B) | |
659 beg-C (ediff-overlay-start overl-C) | |
660 end-A (ediff-overlay-end overl-A) | |
661 end-B (ediff-overlay-end overl-B) | |
662 end-C (ediff-overlay-end overl-C)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
663 |
11042 | 664 (if ediff-word-mode |
665 (progn | |
666 (ediff-wordify beg-A end-A ediff-buffer-A tmp-buffer) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
667 (setq file-A (ediff-make-temp-file tmp-buffer "regA")) |
11042 | 668 (ediff-wordify beg-B end-B ediff-buffer-B tmp-buffer) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
669 (setq file-B (ediff-make-temp-file tmp-buffer "regB")) |
11042 | 670 (if ediff-3way-job |
671 (progn | |
672 (ediff-wordify beg-C end-C ediff-buffer-C tmp-buffer) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
673 (setq file-C (ediff-make-temp-file tmp-buffer "regC")))) |
11042 | 674 ) |
675 ;; not word-mode | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
676 (setq file-A (ediff-make-temp-file ediff-buffer-A buf-A-file-name)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
677 (setq file-B (ediff-make-temp-file ediff-buffer-B buf-B-file-name)) |
11042 | 678 (if ediff-3way-job |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
679 (setq file-C (ediff-make-temp-file ediff-buffer-C buf-C-file-name))) |
11042 | 680 ) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
681 |
11042 | 682 (ediff-clear-diff-vector 'ediff-difference-vector-A 'fine-diffs-also) |
683 (ediff-clear-diff-vector 'ediff-difference-vector-B 'fine-diffs-also) | |
684 (ediff-clear-diff-vector 'ediff-difference-vector-C 'fine-diffs-also) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
685 (ediff-clear-diff-vector |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
686 'ediff-difference-vector-Ancestor 'fine-diffs-also) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
687 ;; let them garbage collect. we can't use the ancestor after recomputing |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
688 ;; the diffs. |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
689 (setq ediff-difference-vector-Ancestor nil |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
690 ediff-ancestor-buffer nil |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
691 ediff-state-of-merge nil) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
692 |
11042 | 693 (setq ediff-killed-diffs-alist nil) ; invalidate saved killed diff regions |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
694 |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
695 ;; In case of merge job, fool it into thinking that it is just doing |
11042 | 696 ;; comparison |
697 (let ((ediff-setup-diff-regions-function ediff-setup-diff-regions-function) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
698 (ediff-3way-comparison-job ediff-3way-comparison-job) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
699 (ediff-merge-job ediff-merge-job) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
700 (ediff-merge-with-ancestor-job ediff-merge-with-ancestor-job) |
11042 | 701 (ediff-job-name ediff-job-name)) |
702 (if ediff-merge-job | |
703 (setq ediff-setup-diff-regions-function 'ediff-setup-diff-regions3 | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
704 ediff-3way-comparison-job t |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
705 ediff-merge-job nil |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
706 ediff-merge-with-ancestor-job nil |
11042 | 707 ediff-job-name 'ediff-files3)) |
708 (funcall ediff-setup-diff-regions-function file-A file-B file-C)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
709 |
11042 | 710 (setq ediff-number-of-differences (length ediff-difference-vector-A)) |
711 (delete-file file-A) | |
712 (delete-file file-B) | |
713 (if file-C | |
714 (delete-file file-C)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
715 |
11042 | 716 (if ediff-3way-job |
717 (ediff-set-state-of-all-diffs-in-all-buffers ediff-control-buffer)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
718 |
11042 | 719 (ediff-jump-to-difference (ediff-diff-at-point 'A point-A)) |
720 (message "") | |
721 )) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
722 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
723 ;; Not bound to any key---to dangerous. A user can do it if necessary. |
11042 | 724 (defun ediff-revert-buffers-then-recompute-diffs (noconfirm) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
725 "Revert buffers A, B and C. Then rerun Ediff on file A and file B." |
11042 | 726 (interactive "P") |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
727 (ediff-barf-if-not-control-buffer) |
11042 | 728 (let ((bufA ediff-buffer-A) |
729 (bufB ediff-buffer-B) | |
730 (bufC ediff-buffer-C) | |
731 (ctl-buf ediff-control-buffer) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
732 (keep-variants ediff-keep-variants) |
11042 | 733 (ancestor-buf ediff-ancestor-buffer) |
734 (ancestor-job ediff-merge-with-ancestor-job) | |
735 (merge ediff-merge-job) | |
736 (comparison ediff-3way-comparison-job)) | |
19047 | 737 (ediff-with-current-buffer bufA |
11042 | 738 (revert-buffer t noconfirm)) |
19047 | 739 (ediff-with-current-buffer bufB |
11042 | 740 (revert-buffer t noconfirm)) |
741 ;; this should only be executed in a 3way comparison, not in merge | |
742 (if comparison | |
19047 | 743 (ediff-with-current-buffer bufC |
11042 | 744 (revert-buffer t noconfirm))) |
745 (if merge | |
746 (progn | |
747 (set-buffer ctl-buf) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
748 ;; the argument says whether to reverse the meaning of |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
749 ;; ediff-keep-variants, i.e., ediff-really-quit runs here with |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
750 ;; variants kept. |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
751 (ediff-really-quit (not keep-variants)) |
11042 | 752 (kill-buffer bufC) |
753 (if ancestor-job | |
754 (ediff-merge-buffers-with-ancestor bufA bufB ancestor-buf) | |
755 (ediff-merge-buffers bufA bufB))) | |
756 (ediff-update-diffs)))) | |
757 | |
758 | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
759 ;; optional NO-REHIGHLIGHT says to not rehighlight buffers |
11042 | 760 (defun ediff-recenter (&optional no-rehighlight) |
761 "Bring the highlighted region of all buffers being compared into view. | |
762 Reestablish the default three-window display." | |
763 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
764 (ediff-barf-if-not-control-buffer) |
11042 | 765 (let (buffer-read-only) |
766 (if (and (ediff-buffer-live-p ediff-buffer-A) | |
767 (ediff-buffer-live-p ediff-buffer-B) | |
768 (or (not ediff-3way-job) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
769 (ediff-buffer-live-p ediff-buffer-C))) |
11042 | 770 (ediff-setup-windows |
771 ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-control-buffer) | |
772 (or (eq this-command 'ediff-quit) | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
773 (message ediff-KILLED-VITAL-BUFFER |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
774 (beep 1))) |
11042 | 775 )) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
776 |
11042 | 777 ;; set visibility range appropriate to this invocation of Ediff. |
778 (ediff-visible-region) | |
779 ;; raise | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
780 (if (and (ediff-window-display-p) |
11042 | 781 (symbolp this-command) |
782 (symbolp last-command) | |
783 ;; Either one of the display-changing commands | |
784 (or (memq this-command | |
785 '(ediff-recenter | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
786 ediff-dir-action ediff-registry-action |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
787 ediff-patch-action |
11042 | 788 ediff-toggle-wide-display ediff-toggle-multiframe)) |
789 ;; Or one of the movement cmds and prev cmd was an Ediff cmd | |
14040 | 790 ;; This avoids raising frames unnecessarily. |
11042 | 791 (and (memq this-command |
792 '(ediff-next-difference | |
793 ediff-previous-difference | |
794 ediff-jump-to-difference | |
795 ediff-jump-to-difference-at-point)) | |
796 (not (string-match "^ediff-" (symbol-name last-command))) | |
797 ))) | |
798 (progn | |
799 (if (window-live-p ediff-window-A) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
800 (raise-frame (window-frame ediff-window-A))) |
11042 | 801 (if (window-live-p ediff-window-B) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
802 (raise-frame (window-frame ediff-window-B))) |
11042 | 803 (if (window-live-p ediff-window-C) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
804 (raise-frame (window-frame ediff-window-C))))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
805 (if (and (ediff-window-display-p) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
806 (frame-live-p ediff-control-frame) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
807 (not ediff-use-long-help-message) |
11042 | 808 (not (ediff-frame-iconified-p ediff-control-frame))) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
809 (raise-frame ediff-control-frame)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
810 |
11042 | 811 ;; Redisplay whatever buffers are showing, if there is a selected difference |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
812 (let ((control-frame ediff-control-frame) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
813 (control-buf ediff-control-buffer)) |
11042 | 814 (if (and (ediff-buffer-live-p ediff-buffer-A) |
815 (ediff-buffer-live-p ediff-buffer-B) | |
816 (or (not ediff-3way-job) | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
817 (ediff-buffer-live-p ediff-buffer-C))) |
11042 | 818 (progn |
819 (or no-rehighlight | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
820 (ediff-select-difference ediff-current-difference)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
821 |
11042 | 822 (ediff-recenter-one-window 'A) |
823 (ediff-recenter-one-window 'B) | |
824 (if ediff-3way-job | |
825 (ediff-recenter-one-window 'C)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
826 |
19047 | 827 (ediff-with-current-buffer control-buf |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
828 (ediff-recenter-ancestor) ; check if ancestor is alive |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
829 |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
830 (if (and (ediff-multiframe-setup-p) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
831 (not ediff-use-long-help-message) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
832 (not (ediff-frame-iconified-p ediff-control-frame))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
833 ;; never grab mouse on quit in this place |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
834 (ediff-reset-mouse |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
835 control-frame |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
836 (eq this-command 'ediff-quit)))) |
11042 | 837 )) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
838 |
52828
d08ef8842be1
2003-10-12 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
839 (or no-rehighlight |
d08ef8842be1
2003-10-12 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
840 (ediff-restore-highlighting)) |
19047 | 841 (ediff-with-current-buffer control-buf (ediff-refresh-mode-lines)) |
11042 | 842 )) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
843 |
11042 | 844 ;; this function returns to the window it was called from |
845 ;; (which was the control window) | |
846 (defun ediff-recenter-one-window (buf-type) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
847 (if (ediff-valid-difference-p) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
848 ;; context must be saved before switching to windows A/B/C |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
849 (let* ((ctl-wind (selected-window)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
850 (shift (ediff-overlay-start |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
851 (ediff-get-value-according-to-buffer-type |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
852 buf-type ediff-narrow-bounds))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
853 (job-name ediff-job-name) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
854 (control-buf ediff-control-buffer) |
19047 | 855 (window-name (ediff-get-symbol-from-alist |
856 buf-type ediff-window-alist)) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
857 (window (if (window-live-p (symbol-value window-name)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
858 (symbol-value window-name)))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
859 |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
860 (if (and window ediff-windows-job) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
861 (set-window-start window shift)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
862 (if window |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
863 (progn |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
864 (select-window window) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
865 (ediff-deactivate-mark) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
866 (ediff-position-region |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
867 (ediff-get-diff-posn buf-type 'beg nil control-buf) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
868 (ediff-get-diff-posn buf-type 'end nil control-buf) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
869 (ediff-get-diff-posn buf-type 'beg nil control-buf) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
870 job-name |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
871 ))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
872 (select-window ctl-wind) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
873 ))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
874 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
875 (defun ediff-recenter-ancestor () |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
876 ;; do half-hearted job by recentering the ancestor buffer, if it is alive and |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
877 ;; visible. |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
878 (if (and (ediff-buffer-live-p ediff-ancestor-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
879 (ediff-valid-difference-p)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
880 (let ((window (ediff-get-visible-buffer-window ediff-ancestor-buffer)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
881 (ctl-wind (selected-window)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
882 (job-name ediff-job-name) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
883 (ctl-buf ediff-control-buffer)) |
19047 | 884 (ediff-with-current-buffer ediff-ancestor-buffer |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
885 (goto-char (ediff-get-diff-posn 'Ancestor 'beg nil ctl-buf)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
886 (if window |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
887 (progn |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
888 (select-window window) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
889 (ediff-position-region |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
890 (ediff-get-diff-posn 'Ancestor 'beg nil ctl-buf) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
891 (ediff-get-diff-posn 'Ancestor 'end nil ctl-buf) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
892 (ediff-get-diff-posn 'Ancestor 'beg nil ctl-buf) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
893 job-name)))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
894 (select-window ctl-wind) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
895 ))) |
11042 | 896 |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
897 |
11042 | 898 ;; This will have to be refined for 3way jobs |
899 (defun ediff-toggle-split () | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
900 "Toggle vertical/horizontal window split. |
11042 | 901 Does nothing if file-A and file-B are in different frames." |
902 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
903 (ediff-barf-if-not-control-buffer) |
11042 | 904 (let* ((wind-A (if (window-live-p ediff-window-A) ediff-window-A)) |
905 (wind-B (if (window-live-p ediff-window-B) ediff-window-B)) | |
906 (wind-C (if (window-live-p ediff-window-C) ediff-window-C)) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
907 (frame-A (if wind-A (window-frame wind-A))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
908 (frame-B (if wind-B (window-frame wind-B))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
909 (frame-C (if wind-C (window-frame wind-C)))) |
11042 | 910 (if (or (eq frame-A frame-B) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
911 (not (frame-live-p frame-A)) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
912 (not (frame-live-p frame-B)) |
11042 | 913 (if ediff-3way-comparison-job |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
914 (or (not (frame-live-p frame-C)) |
11042 | 915 (eq frame-A frame-C) (eq frame-B frame-C)))) |
916 (setq ediff-split-window-function | |
917 (if (eq ediff-split-window-function 'split-window-vertically) | |
918 'split-window-horizontally | |
919 'split-window-vertically)) | |
920 (message "Buffers being compared are in different frames")) | |
921 (ediff-recenter 'no-rehighlight))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
922 |
11042 | 923 (defun ediff-toggle-hilit () |
924 "Switch between highlighting using ASCII flags and highlighting using faces. | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
925 On a dumb terminal, switches between ASCII highlighting and no highlighting." |
11042 | 926 (interactive) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
927 (ediff-barf-if-not-control-buffer) |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
928 |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
929 (ediff-unselect-and-select-difference |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
930 ediff-current-difference 'unselect-only) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
931 ;; cycle through highlighting |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
932 (cond ((and ediff-use-faces |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
933 (ediff-has-face-support-p) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
934 ediff-highlight-all-diffs) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
935 (message "Unhighlighting unselected difference regions") |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
936 (setq ediff-highlight-all-diffs nil |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
937 ediff-highlighting-style 'face)) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
938 ((or (and ediff-use-faces (ediff-has-face-support-p) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
939 (eq ediff-highlighting-style 'face)) ; has face support |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
940 (and (not (ediff-has-face-support-p)) ; no face support |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
941 (eq ediff-highlighting-style 'off))) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
942 (message "Highlighting with ASCII flags") |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
943 (setq ediff-highlighting-style 'ascii |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
944 ediff-highlight-all-diffs nil |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
945 ediff-use-faces nil)) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
946 ((eq ediff-highlighting-style 'ascii) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
947 (message "ASCII highlighting flags removed") |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
948 (setq ediff-highlighting-style 'off |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
949 ediff-highlight-all-diffs nil)) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
950 ((ediff-has-face-support-p) ; catch-all for cases with face support |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
951 (message "Re-highlighting all difference regions") |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
952 (setq ediff-use-faces t |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
953 ediff-highlighting-style 'face |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
954 ediff-highlight-all-diffs t))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
955 |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
956 (if (and ediff-use-faces ediff-highlight-all-diffs) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
957 (ediff-paint-background-regions) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
958 (ediff-paint-background-regions 'unhighlight)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
959 |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
960 (ediff-unselect-and-select-difference |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
961 ediff-current-difference 'select-only)) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
962 |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
963 |
11042 | 964 (defun ediff-toggle-autorefine () |
965 "Toggle auto-refine mode." | |
966 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
967 (ediff-barf-if-not-control-buffer) |
11042 | 968 (if ediff-word-mode |
969 (error "No fine differences in this mode")) | |
970 (cond ((eq ediff-auto-refine 'nix) | |
971 (setq ediff-auto-refine 'on) | |
972 (ediff-make-fine-diffs ediff-current-difference 'noforce) | |
973 (message "Auto-refining is ON")) | |
974 ((eq ediff-auto-refine 'on) | |
975 (message "Auto-refining is OFF") | |
976 (setq ediff-auto-refine 'off)) | |
977 (t ;; nix 'em | |
978 (ediff-set-fine-diff-properties ediff-current-difference 'default) | |
979 (message "Refinements are HIDDEN") | |
980 (setq ediff-auto-refine 'nix)) | |
981 )) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
982 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
983 (defun ediff-show-ancestor () |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
984 "Show the ancestor buffer in a suitable window." |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
985 (interactive) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
986 (ediff-recenter) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
987 (or (ediff-buffer-live-p ediff-ancestor-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
988 (if ediff-merge-with-ancestor-job |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
989 (error "Lost connection to ancestor buffer...sorry") |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
990 (error "Not merging with ancestor"))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
991 (let (wind) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
992 (cond ((setq wind (ediff-get-visible-buffer-window ediff-ancestor-buffer)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
993 (raise-frame (window-frame wind))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
994 (t (set-window-buffer ediff-window-C ediff-ancestor-buffer))))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
995 |
11042 | 996 (defun ediff-make-or-kill-fine-diffs (arg) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
997 "Compute fine diffs. With negative prefix arg, kill fine diffs. |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
998 In both cases, operates on the current difference region." |
11042 | 999 (interactive "P") |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1000 (ediff-barf-if-not-control-buffer) |
11042 | 1001 (cond ((eq arg '-) |
1002 (ediff-clear-fine-differences ediff-current-difference)) | |
1003 ((and (numberp arg) (< arg 0)) | |
1004 (ediff-clear-fine-differences ediff-current-difference)) | |
1005 (t (ediff-make-fine-diffs)))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1006 |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1007 |
11042 | 1008 (defun ediff-toggle-help () |
1009 "Toggle short/long help message." | |
1010 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1011 (ediff-barf-if-not-control-buffer) |
11042 | 1012 (let (buffer-read-only) |
1013 (erase-buffer) | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1014 (setq ediff-use-long-help-message (not ediff-use-long-help-message)) |
11042 | 1015 (ediff-set-help-message)) |
1016 ;; remember the icon status of the control frame when the user requested | |
1017 ;; full control message | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1018 (if (and ediff-use-long-help-message (ediff-multiframe-setup-p)) |
11042 | 1019 (setq ediff-prefer-iconified-control-frame |
1020 (ediff-frame-iconified-p ediff-control-frame))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1021 |
11042 | 1022 (setq ediff-window-config-saved "") ; force redisplay |
1023 (ediff-recenter 'no-rehighlight)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1024 |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1025 |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1026 ;; If BUF, this is the buffer to toggle, not current buffer. |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1027 (defun ediff-toggle-read-only (&optional buf) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1028 "Toggle read-only in current buffer. |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1029 If buffer is under version control and locked, check it out first. |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1030 If optional argument BUF is specified, toggle read-only in that buffer instead |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1031 of the current buffer." |
11042 | 1032 (interactive) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1033 (ediff-barf-if-not-control-buffer) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1034 (let ((ctl-buf (if (null buf) (current-buffer))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1035 (buf-type (ediff-char-to-buftype last-command-char))) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1036 (or buf (ediff-recenter)) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1037 (or buf |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1038 (setq buf (ediff-get-buffer buf-type))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1039 |
19047 | 1040 (ediff-with-current-buffer buf ; eval in buf A/B/C |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1041 (let* ((file (buffer-file-name buf)) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1042 (file-writable (and file |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1043 (file-exists-p file) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1044 (file-writable-p file))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1045 (toggle-ro-cmd (cond (ediff-toggle-read-only-function) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1046 ((ediff-file-checked-out-p file) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1047 'toggle-read-only) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1048 (file-writable 'toggle-read-only) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1049 (t (key-binding "\C-x\C-q"))))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1050 ;; If the file is checked in, make sure we don't make buffer modifiable |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1051 ;; without warning the user. The user can fool our checks by making the |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1052 ;; buffer non-RO without checking the file out. We regard this as a |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1053 ;; user problem. |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1054 (if (and (ediff-file-checked-in-p file) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1055 ;; If ctl-buf is null, this means we called this |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1056 ;; non-interactively, in which case don't ask questions |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1057 ctl-buf) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1058 (cond ((not buffer-read-only) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1059 (setq toggle-ro-cmd 'toggle-read-only)) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1060 ((and (or (beep 1) t) ; always beep |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1061 (y-or-n-p |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1062 (format |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1063 "File %s is under version control. Check it out? " |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1064 (ediff-abbreviate-file-name file)))) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1065 ;; if we checked the file out, we should also change the |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1066 ;; original state of buffer-read-only to nil. If we don't |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1067 ;; do this, the mode line will show %%, since the file was |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1068 ;; RO before ediff started, so the user will think the file |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1069 ;; is checked in. |
19047 | 1070 (ediff-with-current-buffer ctl-buf |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1071 (ediff-change-saved-variable |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1072 'buffer-read-only nil buf-type))) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1073 (t |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1074 (setq toggle-ro-cmd 'toggle-read-only) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1075 (beep 1) (beep 1) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1076 (message |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1077 "Boy, this is risky! Don't modify this file...") |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1078 (sit-for 3)))) ; let the user see the warning |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1079 (if (and toggle-ro-cmd |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1080 (string-match "toggle-read-only" (symbol-name toggle-ro-cmd))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1081 (save-excursion |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1082 (save-window-excursion |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1083 (select-window (ediff-get-visible-buffer-window buf)) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1084 (command-execute toggle-ro-cmd))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1085 (error "Don't know how to toggle read-only in buffer %S" buf)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1086 |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1087 ;; Check if we made the current buffer updatable, but its file is RO. |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1088 ;; Signal a warning in this case. |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1089 (if (and file (not buffer-read-only) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1090 (eq this-command 'ediff-toggle-read-only) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1091 (file-exists-p file) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1092 (not (file-writable-p file))) |
53865
6a6dc234f296
(ediff-toggle-read-only): Remove extra format
Andreas Schwab <schwab@suse.de>
parents:
52828
diff
changeset
|
1093 (progn |
6a6dc234f296
(ediff-toggle-read-only): Remove extra format
Andreas Schwab <schwab@suse.de>
parents:
52828
diff
changeset
|
1094 (beep 1) |
6a6dc234f296
(ediff-toggle-read-only): Remove extra format
Andreas Schwab <schwab@suse.de>
parents:
52828
diff
changeset
|
1095 (message "Warning: file %s is read-only" |
6a6dc234f296
(ediff-toggle-read-only): Remove extra format
Andreas Schwab <schwab@suse.de>
parents:
52828
diff
changeset
|
1096 (ediff-abbreviate-file-name file)))) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1097 )))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1098 |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1099 ;; checkout if visited file is checked in |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1100 (defun ediff-maybe-checkout (buf) |
21940 | 1101 (let ((file (expand-file-name (buffer-file-name buf))) |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1102 (checkout-function (key-binding "\C-x\C-q"))) |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1103 (if (and (ediff-file-checked-in-p file) |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1104 (or (beep 1) t) |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1105 (y-or-n-p |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1106 (format |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1107 "File %s is under version control. Check it out? " |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1108 (ediff-abbreviate-file-name file)))) |
19047 | 1109 (ediff-with-current-buffer buf |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1110 (command-execute checkout-function))))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1111 |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1112 |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1113 ;; This is a simple-minded check for whether a file is under version control. |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1114 ;; If file,v exists but file doesn't, this file is considered to be not checked |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1115 ;; in and not checked out for the purpose of patching (since patch won't be |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1116 ;; able to read such a file anyway). |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1117 ;; FILE is a string representing file name |
21940 | 1118 ;;(defun ediff-file-under-version-control (file) |
1119 ;; (let* ((filedir (file-name-directory file)) | |
1120 ;; (file-nondir (file-name-nondirectory file)) | |
1121 ;; (trial (concat file-nondir ",v")) | |
1122 ;; (full-trial (concat filedir trial)) | |
1123 ;; (full-rcs-trial (concat filedir "RCS/" trial))) | |
1124 ;; (and (stringp file) | |
1125 ;; (file-exists-p file) | |
1126 ;; (or | |
1127 ;; (and | |
1128 ;; (file-exists-p full-trial) | |
1129 ;; ;; in FAT FS, `file,v' and `file' may turn out to be the same! | |
1130 ;; ;; don't be fooled by this! | |
1131 ;; (not (equal (file-attributes file) | |
1132 ;; (file-attributes full-trial)))) | |
1133 ;; ;; check if a version is in RCS/ directory | |
1134 ;; (file-exists-p full-rcs-trial))) | |
1135 ;; )) | |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1136 |
21940 | 1137 |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68651
diff
changeset
|
1138 (defun ediff-file-checked-out-p (file) |
21940 | 1139 (or (not (featurep 'vc-hooks)) |
1140 (and (vc-backend file) | |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
1141 (if (fboundp 'vc-state) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
1142 (or (memq (vc-state file) '(edited needs-merge)) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
1143 (stringp (vc-state file))) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
1144 ;; XEmacs has no vc-state |
85838
6852207d73f3
(ediff-file-checked-out-p)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
84864
diff
changeset
|
1145 (when (featurep 'xemacs) (vc-locking-user file))) |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
1146 ))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1147 |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68651
diff
changeset
|
1148 (defun ediff-file-checked-in-p (file) |
21940 | 1149 (and (featurep 'vc-hooks) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1150 ;; CVS files are considered not checked in |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1151 (not (memq (vc-backend file) '(nil CVS))) |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
1152 (if (fboundp 'vc-state) |
47846
8e6ed5c1f142
2002-10-12 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
47520
diff
changeset
|
1153 (and |
8e6ed5c1f142
2002-10-12 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
47520
diff
changeset
|
1154 (not (memq (vc-state file) '(edited needs-merge))) |
8e6ed5c1f142
2002-10-12 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
47520
diff
changeset
|
1155 (not (stringp (vc-state file)))) |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
1156 ;; XEmacs has no vc-state |
85838
6852207d73f3
(ediff-file-checked-out-p)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
84864
diff
changeset
|
1157 (when (featurep 'xemacs) (not (vc-locking-user file)))) |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
1158 )) |
21940 | 1159 |
1160 (defun ediff-file-compressed-p (file) | |
1161 (condition-case nil | |
1162 (require 'jka-compr) | |
1163 (error)) | |
1164 (if (featurep 'jka-compr) | |
1165 (string-match (jka-compr-build-file-regexp) file))) | |
1166 | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1167 |
11042 | 1168 (defun ediff-swap-buffers () |
1169 "Rotate the display of buffers A, B, and C." | |
1170 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1171 (ediff-barf-if-not-control-buffer) |
11042 | 1172 (if (and (window-live-p ediff-window-A) (window-live-p ediff-window-B)) |
1173 (let ((buf ediff-buffer-A) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1174 (values ediff-buffer-values-orig-A) |
11042 | 1175 (diff-vec ediff-difference-vector-A) |
1176 (hide-regexp ediff-regexp-hide-A) | |
1177 (focus-regexp ediff-regexp-focus-A) | |
1178 (wide-visibility-p (eq ediff-visible-bounds ediff-wide-bounds)) | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1179 (overlay (if (ediff-has-face-support-p) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1180 ediff-current-diff-overlay-A))) |
11042 | 1181 (if ediff-3way-comparison-job |
1182 (progn | |
1183 (set-window-buffer ediff-window-A ediff-buffer-C) | |
1184 (set-window-buffer ediff-window-B ediff-buffer-A) | |
1185 (set-window-buffer ediff-window-C ediff-buffer-B) | |
1186 ) | |
1187 (set-window-buffer ediff-window-A ediff-buffer-B) | |
1188 (set-window-buffer ediff-window-B ediff-buffer-A)) | |
1189 ;; swap diff buffers | |
1190 (if ediff-3way-comparison-job | |
1191 (setq ediff-buffer-A ediff-buffer-C | |
1192 ediff-buffer-C ediff-buffer-B | |
1193 ediff-buffer-B buf) | |
1194 (setq ediff-buffer-A ediff-buffer-B | |
1195 ediff-buffer-B buf)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1196 |
11042 | 1197 ;; swap saved buffer characteristics |
1198 (if ediff-3way-comparison-job | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1199 (setq ediff-buffer-values-orig-A ediff-buffer-values-orig-C |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1200 ediff-buffer-values-orig-C ediff-buffer-values-orig-B |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1201 ediff-buffer-values-orig-B values) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1202 (setq ediff-buffer-values-orig-A ediff-buffer-values-orig-B |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1203 ediff-buffer-values-orig-B values)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1204 |
11042 | 1205 ;; swap diff vectors |
1206 (if ediff-3way-comparison-job | |
1207 (setq ediff-difference-vector-A ediff-difference-vector-C | |
1208 ediff-difference-vector-C ediff-difference-vector-B | |
1209 ediff-difference-vector-B diff-vec) | |
1210 (setq ediff-difference-vector-A ediff-difference-vector-B | |
1211 ediff-difference-vector-B diff-vec)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1212 |
11042 | 1213 ;; swap hide/focus regexp |
1214 (if ediff-3way-comparison-job | |
1215 (setq ediff-regexp-hide-A ediff-regexp-hide-C | |
1216 ediff-regexp-hide-C ediff-regexp-hide-B | |
1217 ediff-regexp-hide-B hide-regexp | |
1218 ediff-regexp-focus-A ediff-regexp-focus-C | |
1219 ediff-regexp-focus-C ediff-regexp-focus-B | |
1220 ediff-regexp-focus-B focus-regexp) | |
1221 (setq ediff-regexp-hide-A ediff-regexp-hide-B | |
1222 ediff-regexp-hide-B hide-regexp | |
1223 ediff-regexp-focus-A ediff-regexp-focus-B | |
1224 ediff-regexp-focus-B focus-regexp)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1225 |
11042 | 1226 ;; The following is needed for XEmacs, since there one can't move |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1227 ;; overlay to another buffer. In Emacs, this swap is redundant. |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1228 (if (ediff-has-face-support-p) |
11042 | 1229 (if ediff-3way-comparison-job |
1230 (setq ediff-current-diff-overlay-A ediff-current-diff-overlay-C | |
1231 ediff-current-diff-overlay-C ediff-current-diff-overlay-B | |
1232 ediff-current-diff-overlay-B overlay) | |
1233 (setq ediff-current-diff-overlay-A ediff-current-diff-overlay-B | |
1234 ediff-current-diff-overlay-B overlay))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1235 |
11042 | 1236 ;; swap wide bounds |
1237 (setq ediff-wide-bounds | |
1238 (cond (ediff-3way-comparison-job | |
1239 (list (nth 2 ediff-wide-bounds) | |
1240 (nth 0 ediff-wide-bounds) | |
1241 (nth 1 ediff-wide-bounds))) | |
1242 (ediff-3way-job | |
1243 (list (nth 1 ediff-wide-bounds) | |
1244 (nth 0 ediff-wide-bounds) | |
1245 (nth 2 ediff-wide-bounds))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1246 (t |
11042 | 1247 (list (nth 1 ediff-wide-bounds) |
1248 (nth 0 ediff-wide-bounds))))) | |
1249 ;; swap narrow bounds | |
1250 (setq ediff-narrow-bounds | |
1251 (cond (ediff-3way-comparison-job | |
1252 (list (nth 2 ediff-narrow-bounds) | |
1253 (nth 0 ediff-narrow-bounds) | |
1254 (nth 1 ediff-narrow-bounds))) | |
1255 (ediff-3way-job | |
1256 (list (nth 1 ediff-narrow-bounds) | |
1257 (nth 0 ediff-narrow-bounds) | |
1258 (nth 2 ediff-narrow-bounds))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1259 (t |
11042 | 1260 (list (nth 1 ediff-narrow-bounds) |
1261 (nth 0 ediff-narrow-bounds))))) | |
1262 (if wide-visibility-p | |
1263 (setq ediff-visible-bounds ediff-wide-bounds) | |
1264 (setq ediff-visible-bounds ediff-narrow-bounds)) | |
1265 )) | |
1266 (if ediff-3way-job | |
1267 (ediff-set-state-of-all-diffs-in-all-buffers ediff-control-buffer)) | |
1268 (ediff-recenter 'no-rehighlight) | |
1269 ) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1270 |
11042 | 1271 |
1272 (defun ediff-toggle-wide-display () | |
1273 "Toggle wide/regular display. | |
1274 This is especially useful when comparing buffers side-by-side." | |
1275 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1276 (ediff-barf-if-not-control-buffer) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1277 (or (ediff-window-display-p) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1278 (error "%sEmacs is not running as a window application" |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85890
diff
changeset
|
1279 (if (featurep 'emacs) "" "X"))) |
11042 | 1280 (ediff-recenter 'no-rehighlight) ; make sure buffs are displayed in windows |
1281 (let ((ctl-buf ediff-control-buffer)) | |
1282 (setq ediff-wide-display-p (not ediff-wide-display-p)) | |
1283 (if (not ediff-wide-display-p) | |
19047 | 1284 (ediff-with-current-buffer ctl-buf |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1285 (modify-frame-parameters |
11042 | 1286 ediff-wide-display-frame ediff-wide-display-orig-parameters) |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85890
diff
changeset
|
1287 ;;(sit-for (if (featurep 'xemacs) 0.4 0)) |
11042 | 1288 ;; restore control buf, since ctl window may have been deleted |
1289 ;; during resizing | |
1290 (set-buffer ctl-buf) | |
1291 (setq ediff-wide-display-orig-parameters nil | |
1292 ediff-window-B nil) ; force update of window config | |
1293 (ediff-recenter 'no-rehighlight)) | |
1294 (funcall ediff-make-wide-display-function) | |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85890
diff
changeset
|
1295 ;;(sit-for (if (featurep 'xemacs) 0.4 0)) |
19047 | 1296 (ediff-with-current-buffer ctl-buf |
11042 | 1297 (setq ediff-window-B nil) ; force update of window config |
1298 (ediff-recenter 'no-rehighlight))))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1299 |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1300 ;;;###autoload |
11042 | 1301 (defun ediff-toggle-multiframe () |
18054 | 1302 "Switch from multiframe display to single-frame display and back. |
1303 To change the default, set the variable `ediff-window-setup-function', | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1304 which see." |
11042 | 1305 (interactive) |
18054 | 1306 (let (window-setup-func) |
1307 (or (ediff-window-display-p) | |
1308 (error "%sEmacs is not running as a window application" | |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85890
diff
changeset
|
1309 (if (featurep 'emacs) "" "X"))) |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1310 |
11042 | 1311 (cond ((eq ediff-window-setup-function 'ediff-setup-windows-multiframe) |
18054 | 1312 (setq window-setup-func 'ediff-setup-windows-plain)) |
11042 | 1313 ((eq ediff-window-setup-function 'ediff-setup-windows-plain) |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1314 (if (ediff-in-control-buffer-p) |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1315 (ediff-kill-bottom-toolbar)) |
18054 | 1316 (setq window-setup-func 'ediff-setup-windows-multiframe))) |
1317 | |
1318 ;; change default | |
1319 (setq-default ediff-window-setup-function window-setup-func) | |
1320 ;; change in all active ediff sessions | |
84864
cac94194ce6d
(ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents:
82467
diff
changeset
|
1321 (mapc (lambda(buf) (ediff-with-current-buffer buf |
cac94194ce6d
(ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents:
82467
diff
changeset
|
1322 (setq ediff-window-setup-function window-setup-func |
cac94194ce6d
(ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents:
82467
diff
changeset
|
1323 ediff-window-B nil))) |
cac94194ce6d
(ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents:
82467
diff
changeset
|
1324 ediff-session-registry) |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1325 (if (ediff-in-control-buffer-p) |
18054 | 1326 (ediff-recenter 'no-rehighlight)))) |
1327 | |
1328 | |
1329 ;;;###autoload | |
1330 (defun ediff-toggle-use-toolbar () | |
1331 "Enable or disable Ediff toolbar. | |
1332 Works only in versions of Emacs that support toolbars. | |
1333 To change the default, set the variable `ediff-use-toolbar-p', which see." | |
1334 (interactive) | |
1335 (if (featurep 'ediff-tbar) | |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1336 (progn |
18054 | 1337 (or (ediff-window-display-p) |
1338 (error "%sEmacs is not running as a window application" | |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85890
diff
changeset
|
1339 (if (featurep 'emacs) "" "X"))) |
18054 | 1340 (if (ediff-use-toolbar-p) |
1341 (ediff-kill-bottom-toolbar)) | |
1342 ;; do this only after killing the toolbar | |
1343 (setq ediff-use-toolbar-p (not ediff-use-toolbar-p)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1344 |
84864
cac94194ce6d
(ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents:
82467
diff
changeset
|
1345 (mapc (lambda(buf) |
cac94194ce6d
(ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents:
82467
diff
changeset
|
1346 (ediff-with-current-buffer buf |
cac94194ce6d
(ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents:
82467
diff
changeset
|
1347 ;; force redisplay |
cac94194ce6d
(ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents:
82467
diff
changeset
|
1348 (setq ediff-window-config-saved "") |
cac94194ce6d
(ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents:
82467
diff
changeset
|
1349 )) |
cac94194ce6d
(ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents:
82467
diff
changeset
|
1350 ediff-session-registry) |
18054 | 1351 (if (ediff-in-control-buffer-p) |
1352 (ediff-recenter 'no-rehighlight))))) | |
1353 | |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1354 |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1355 ;; if was using toolbar, kill it |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1356 (defun ediff-kill-bottom-toolbar () |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1357 ;; Using ctl-buffer or ediff-control-window for LOCALE does not |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1358 ;; work properly in XEmacs 19.14: we have to use |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1359 ;;(selected-frame). |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1360 ;; The problem with this is that any previous bottom-toolbar |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1361 ;; will not re-appear after our cleanup here. Is there a way |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1362 ;; to do "push" and "pop" toolbars ? --marcpa |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1363 (if (ediff-use-toolbar-p) |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1364 (ediff-cond-compile-for-xemacs-or-emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1365 (progn ; xemacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1366 (set-specifier bottom-toolbar (list (selected-frame) nil)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1367 (set-specifier bottom-toolbar-visible-p (list (selected-frame) nil))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1368 nil ; emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1369 ) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1370 )) |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1371 |
18054 | 1372 ;; If wants to use toolbar, make it. |
1373 ;; If not, zero the toolbar for XEmacs. | |
1374 ;; Do nothing for Emacs. | |
1375 (defun ediff-make-bottom-toolbar (&optional frame) | |
1376 (if (ediff-window-display-p) | |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1377 (progn |
18054 | 1378 (setq frame (or frame (selected-frame))) |
1379 (cond ((ediff-use-toolbar-p) ; this checks for XEmacs | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1380 (ediff-cond-compile-for-xemacs-or-emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1381 (progn ; xemacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1382 (set-specifier |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1383 bottom-toolbar |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1384 (list frame (if (ediff-3way-comparison-job) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1385 ediff-toolbar-3way ediff-toolbar))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1386 (set-specifier bottom-toolbar-visible-p (list frame t)) |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1387 (set-specifier bottom-toolbar-height |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1388 (list frame ediff-toolbar-height))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1389 nil ; emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1390 ) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1391 ) |
21940 | 1392 ((ediff-has-toolbar-support-p) |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1393 (ediff-cond-compile-for-xemacs-or-emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1394 (set-specifier bottom-toolbar-height (list frame 0)) ; xemacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1395 nil ; emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1396 ) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1397 ) |
18054 | 1398 )) |
1399 )) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1400 |
11042 | 1401 ;; Merging |
1402 | |
1403 (defun ediff-toggle-show-clashes-only () | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1404 "Toggle the mode that shows only the merge regions where both variants differ from the ancestor." |
11042 | 1405 (interactive) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1406 (ediff-barf-if-not-control-buffer) |
11042 | 1407 (if (not ediff-merge-with-ancestor-job) |
1408 (error "This command makes sense only when merging with an ancestor")) | |
1409 (setq ediff-show-clashes-only (not ediff-show-clashes-only)) | |
1410 (if ediff-show-clashes-only | |
1411 (message "Focus on regions where both buffers differ from the ancestor") | |
1412 (message "Canceling focus on regions where changes clash"))) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1413 |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1414 (defun ediff-toggle-skip-changed-regions () |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1415 "Toggle the mode that skips the merge regions that differ from the default." |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1416 (interactive) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1417 (ediff-barf-if-not-control-buffer) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1418 (setq ediff-skip-merge-regions-that-differ-from-default |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1419 (not ediff-skip-merge-regions-that-differ-from-default)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1420 (if ediff-skip-merge-regions-that-differ-from-default |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1421 (message "Skipping regions that differ from default setting") |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1422 (message "Showing regions that differ from default setting"))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1423 |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1424 |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1425 |
11042 | 1426 ;; Widening/narrowing |
1427 | |
1428 (defun ediff-toggle-narrow-region () | |
1429 "Toggle narrowing in buffers A, B, and C. | |
1430 Used in ediff-windows/regions only." | |
1431 (interactive) | |
1432 (if (eq ediff-buffer-A ediff-buffer-B) | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1433 (error ediff-NO-DIFFERENCES)) |
11042 | 1434 (if (eq ediff-visible-bounds ediff-wide-bounds) |
1435 (setq ediff-visible-bounds ediff-narrow-bounds) | |
1436 (setq ediff-visible-bounds ediff-wide-bounds)) | |
1437 (ediff-recenter 'no-rehighlight)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1438 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1439 ;; Narrow bufs A/B/C to ediff-visible-bounds. If this is currently set to |
11042 | 1440 ;; ediff-wide-bounds, then this actually widens. |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1441 ;; This function does nothing if job-name is not |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1442 ;; ediff-regions-wordwise/linewise or ediff-windows-wordwise/linewise. |
11042 | 1443 ;; Does nothing if buffer-A = buffer-B since we can't narrow |
1444 ;; to two different regions in one buffer. | |
1445 (defun ediff-visible-region () | |
1446 (if (or (eq ediff-buffer-A ediff-buffer-B) | |
1447 (eq ediff-buffer-A ediff-buffer-C) | |
1448 (eq ediff-buffer-C ediff-buffer-B)) | |
1449 () | |
1450 ;; If ediff-*-regions/windows, ediff-visible-bounds is already set | |
1451 ;; Otherwise, always use full range. | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1452 (if (not ediff-narrow-job) |
11042 | 1453 (setq ediff-visible-bounds ediff-wide-bounds)) |
1454 (let ((overl-A (ediff-get-value-according-to-buffer-type | |
1455 'A ediff-visible-bounds)) | |
1456 (overl-B (ediff-get-value-according-to-buffer-type | |
1457 'B ediff-visible-bounds)) | |
1458 (overl-C (ediff-get-value-according-to-buffer-type | |
1459 'C ediff-visible-bounds)) | |
1460 ) | |
19047 | 1461 (ediff-with-current-buffer ediff-buffer-A |
20206 | 1462 (if (ediff-overlay-buffer overl-A) |
1463 (narrow-to-region | |
1464 (ediff-overlay-start overl-A) (ediff-overlay-end overl-A)))) | |
19047 | 1465 (ediff-with-current-buffer ediff-buffer-B |
20206 | 1466 (if (ediff-overlay-buffer overl-B) |
1467 (narrow-to-region | |
1468 (ediff-overlay-start overl-B) (ediff-overlay-end overl-B)))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1469 |
20206 | 1470 (if (and ediff-3way-job (ediff-overlay-buffer overl-C)) |
19047 | 1471 (ediff-with-current-buffer ediff-buffer-C |
11042 | 1472 (narrow-to-region |
1473 (ediff-overlay-start overl-C) (ediff-overlay-end overl-C)))) | |
1474 ))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1475 |
11042 | 1476 |
1477 ;; Window scrolling operations | |
1478 | |
1479 ;; Performs some operation on the two file windows (if they are showing). | |
1480 ;; Traps all errors on the operation in windows A/B/C. | |
1481 ;; Usually, errors come from scrolling off the | |
1482 ;; beginning or end of the buffer, and this gives error messages. | |
1483 (defun ediff-operate-on-windows (operation arg) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1484 |
11042 | 1485 ;; make sure windows aren't dead |
1486 (if (not (and (window-live-p ediff-window-A) (window-live-p ediff-window-B))) | |
1487 (ediff-recenter 'no-rehighlight)) | |
1488 (if (not (and (ediff-buffer-live-p ediff-buffer-A) | |
1489 (ediff-buffer-live-p ediff-buffer-B) | |
1490 (or (not ediff-3way-job) ediff-buffer-C) | |
1491 )) | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1492 (error ediff-KILLED-VITAL-BUFFER)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1493 |
11042 | 1494 (let* ((wind (selected-window)) |
1495 (wind-A ediff-window-A) | |
1496 (wind-B ediff-window-B) | |
1497 (wind-C ediff-window-C) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1498 (coefA (ediff-get-region-size-coefficient 'A operation)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1499 (coefB (ediff-get-region-size-coefficient 'B operation)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1500 (three-way ediff-3way-job) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1501 (coefC (if three-way |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1502 (ediff-get-region-size-coefficient 'C operation)))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1503 |
11042 | 1504 (select-window wind-A) |
1505 (condition-case nil | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1506 (funcall operation (round (* coefA arg))) |
11042 | 1507 (error)) |
1508 (select-window wind-B) | |
1509 (condition-case nil | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1510 (funcall operation (round (* coefB arg))) |
11042 | 1511 (error)) |
1512 (if three-way | |
1513 (progn | |
1514 (select-window wind-C) | |
1515 (condition-case nil | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1516 (funcall operation (round (* coefC arg))) |
11042 | 1517 (error)))) |
1518 (select-window wind))) | |
1519 | |
1520 (defun ediff-scroll-vertically (&optional arg) | |
1521 "Vertically scroll buffers A, B \(and C if appropriate\). | |
1522 With optional argument ARG, scroll ARG lines; otherwise scroll by nearly | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1523 the one half of the height of window-A." |
11042 | 1524 (interactive "P") |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1525 (ediff-barf-if-not-control-buffer) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1526 |
11042 | 1527 ;; make sure windows aren't dead |
1528 (if (not (and (window-live-p ediff-window-A) (window-live-p ediff-window-B))) | |
1529 (ediff-recenter 'no-rehighlight)) | |
1530 (if (not (and (ediff-buffer-live-p ediff-buffer-A) | |
1531 (ediff-buffer-live-p ediff-buffer-B) | |
1532 (or (not ediff-3way-job) | |
1533 (ediff-buffer-live-p ediff-buffer-C)) | |
1534 )) | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1535 (error ediff-KILLED-VITAL-BUFFER)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1536 |
11042 | 1537 (ediff-operate-on-windows |
1538 (if (memq last-command-char '(?v ?\C-v)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1539 'scroll-up |
11042 | 1540 'scroll-down) |
1541 ;; calculate argument to scroll-up/down | |
1542 ;; if there is an explicit argument | |
1543 (if (and arg (not (equal arg '-))) | |
1544 ;; use it | |
1545 (prefix-numeric-value arg) | |
1546 ;; if not, see if we can determine a default amount (the window height) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1547 (let (default-amount) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1548 (setq default-amount |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1549 (- (/ (min (window-height ediff-window-A) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1550 (window-height ediff-window-B) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1551 (if ediff-3way-job |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1552 (window-height ediff-window-C) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1553 500)) ; some large number |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1554 2) |
11042 | 1555 1 next-screen-context-lines)) |
1556 ;; window found | |
1557 (if arg | |
1558 ;; C-u as argument means half of default amount | |
1559 (/ default-amount 2) | |
1560 ;; no argument means default amount | |
1561 default-amount))))) | |
1562 | |
1563 | |
1564 (defun ediff-scroll-horizontally (&optional arg) | |
1565 "Horizontally scroll buffers A, B \(and C if appropriate\). | |
1566 If an argument is given, that is how many columns are scrolled, else nearly | |
1567 the width of the A/B/C windows." | |
1568 (interactive "P") | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1569 (ediff-barf-if-not-control-buffer) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1570 |
11042 | 1571 ;; make sure windows aren't dead |
1572 (if (not (and (window-live-p ediff-window-A) (window-live-p ediff-window-B))) | |
1573 (ediff-recenter 'no-rehighlight)) | |
1574 (if (not (and (ediff-buffer-live-p ediff-buffer-A) | |
1575 (ediff-buffer-live-p ediff-buffer-B) | |
1576 (or (not ediff-3way-job) | |
1577 (ediff-buffer-live-p ediff-buffer-C)) | |
1578 )) | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1579 (error ediff-KILLED-VITAL-BUFFER)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1580 |
11042 | 1581 (ediff-operate-on-windows |
36456
1474cd438ac1
(ediff-scroll-horizontally): Arrange for
Gerd Moellmann <gerd@gnu.org>
parents:
36043
diff
changeset
|
1582 ;; Arrange for scroll-left and scroll-right being called |
1474cd438ac1
(ediff-scroll-horizontally): Arrange for
Gerd Moellmann <gerd@gnu.org>
parents:
36043
diff
changeset
|
1583 ;; interactively so that they set the window's min_hscroll. |
1474cd438ac1
(ediff-scroll-horizontally): Arrange for
Gerd Moellmann <gerd@gnu.org>
parents:
36043
diff
changeset
|
1584 ;; Otherwise, automatic hscrolling will undo the effect of |
1474cd438ac1
(ediff-scroll-horizontally): Arrange for
Gerd Moellmann <gerd@gnu.org>
parents:
36043
diff
changeset
|
1585 ;; hscrolling. |
11042 | 1586 (if (= last-command-char ?<) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1587 (lambda (arg) |
36456
1474cd438ac1
(ediff-scroll-horizontally): Arrange for
Gerd Moellmann <gerd@gnu.org>
parents:
36043
diff
changeset
|
1588 (let ((prefix-arg arg)) |
1474cd438ac1
(ediff-scroll-horizontally): Arrange for
Gerd Moellmann <gerd@gnu.org>
parents:
36043
diff
changeset
|
1589 (call-interactively 'scroll-left))) |
1474cd438ac1
(ediff-scroll-horizontally): Arrange for
Gerd Moellmann <gerd@gnu.org>
parents:
36043
diff
changeset
|
1590 (lambda (arg) |
1474cd438ac1
(ediff-scroll-horizontally): Arrange for
Gerd Moellmann <gerd@gnu.org>
parents:
36043
diff
changeset
|
1591 (let ((prefix-arg arg)) |
1474cd438ac1
(ediff-scroll-horizontally): Arrange for
Gerd Moellmann <gerd@gnu.org>
parents:
36043
diff
changeset
|
1592 (call-interactively 'scroll-right)))) |
11042 | 1593 ;; calculate argument to scroll-left/right |
1594 ;; if there is an explicit argument | |
1595 (if (and arg (not (equal arg '-))) | |
1596 ;; use it | |
1597 (prefix-numeric-value arg) | |
1598 ;; if not, see if we can determine a default amount | |
1599 ;; (half the window width) | |
1600 (if (null ediff-control-window) | |
1601 ;; no control window, use nil | |
1602 nil | |
1603 (let ((default-amount | |
1604 (- (/ (min (window-width ediff-window-A) | |
1605 (window-width ediff-window-B) | |
1606 (if ediff-3way-comparison-job | |
1607 (window-width ediff-window-C) | |
1608 500) ; some large number | |
1609 ) | |
1610 2) | |
1611 3))) | |
1612 ;; window found | |
1613 (if arg | |
1614 ;; C-u as argument means half of default amount | |
1615 (/ default-amount 2) | |
1616 ;; no argument means default amount | |
1617 default-amount)))))) | |
1618 | |
1619 | |
1620 ;;BEG, END show the region to be positioned. | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1621 ;;JOB-NAME holds ediff-job-name. The ediff-windows job positions regions |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1622 ;;differently. |
11042 | 1623 (defun ediff-position-region (beg end pos job-name) |
1624 (if (> end (point-max)) | |
1625 (setq end (point-max))) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1626 (if ediff-windows-job |
11042 | 1627 (if (pos-visible-in-window-p end) |
1628 () ; do nothing, wind is already positioned | |
1629 ;; at this point, windows are positioned at the beginning of the | |
1630 ;; file regions (not diff-regions) being compared. | |
1631 (save-excursion | |
1632 (move-to-window-line (- (window-height) 2)) | |
1633 (let ((amount (+ 2 (count-lines (point) end)))) | |
1634 (scroll-up amount)))) | |
1635 (set-window-start (selected-window) beg) | |
1636 (if (pos-visible-in-window-p end) | |
1637 ;; Determine the number of lines that the region occupies | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1638 (let ((lines 0) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1639 (prev-point 0)) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1640 (while ( and (> end (progn |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1641 (move-to-window-line lines) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1642 (point))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1643 ;; `end' may be beyond the window bottom, so check |
14040 | 1644 ;; that we are making progress |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1645 (< prev-point (point))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1646 (setq prev-point (point)) |
11042 | 1647 (setq lines (1+ lines))) |
1648 ;; And position the beginning on the right line | |
1649 (goto-char beg) | |
1650 (recenter (/ (1+ (max (- (1- (window-height (selected-window))) | |
1651 lines) | |
1652 1) | |
1653 ) | |
1654 2)))) | |
1655 (goto-char pos) | |
1656 )) | |
1657 | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1658 ;; get number of lines from window start to region end |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1659 (defun ediff-get-lines-to-region-end (buf-type &optional n ctl-buf) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1660 (or n (setq n ediff-current-difference)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1661 (or ctl-buf (setq ctl-buf ediff-control-buffer)) |
19047 | 1662 (ediff-with-current-buffer ctl-buf |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1663 (let* ((buf (ediff-get-buffer buf-type)) |
19047 | 1664 (wind (eval (ediff-get-symbol-from-alist |
1665 buf-type ediff-window-alist))) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1666 (beg (window-start wind)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1667 (end (ediff-get-diff-posn buf-type 'end)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1668 lines) |
19047 | 1669 (ediff-with-current-buffer buf |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1670 (if (< beg end) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1671 (setq lines (count-lines beg end)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1672 (setq lines 0)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1673 lines |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1674 )))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1675 |
21940 | 1676 ;; Calculate the number of lines from window end to the start of diff region |
1677 (defun ediff-get-lines-to-region-start (buf-type &optional diff-num ctl-buf) | |
1678 (or diff-num (setq diff-num ediff-current-difference)) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1679 (or ctl-buf (setq ctl-buf ediff-control-buffer)) |
19047 | 1680 (ediff-with-current-buffer ctl-buf |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1681 (let* ((buf (ediff-get-buffer buf-type)) |
19047 | 1682 (wind (eval (ediff-get-symbol-from-alist |
1683 buf-type ediff-window-alist))) | |
21940 | 1684 (end (or (window-end wind) (window-end wind t))) |
1685 (beg (ediff-get-diff-posn buf-type 'beg diff-num))) | |
19047 | 1686 (ediff-with-current-buffer buf |
21940 | 1687 (if (< beg end) |
1688 (count-lines (max beg (point-min)) (min end (point-max))) 0)) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1689 ))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1690 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1691 |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1692 ;; region size coefficient is a coefficient by which to adjust scrolling |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1693 ;; up/down of the window displaying buffer of type BUFTYPE. |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1694 ;; The purpose of this coefficient is to make the windows scroll in sync, so |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1695 ;; that it won't happen that one diff region is scrolled off while the other is |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1696 ;; still seen. |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1697 ;; |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1698 ;; If the difference region is invalid, the coefficient is 1 |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1699 (defun ediff-get-region-size-coefficient (buf-type op &optional n ctl-buf) |
19047 | 1700 (ediff-with-current-buffer (or ctl-buf ediff-control-buffer) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1701 (if (ediff-valid-difference-p n) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1702 (let* ((func (cond ((eq op 'scroll-down) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1703 'ediff-get-lines-to-region-start) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1704 ((eq op 'scroll-up) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1705 'ediff-get-lines-to-region-end) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1706 (t '(lambda (a b c) 0)))) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1707 (max-lines (max (funcall func 'A n ctl-buf) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1708 (funcall func 'B n ctl-buf) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1709 (if (ediff-buffer-live-p ediff-buffer-C) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1710 (funcall func 'C n ctl-buf) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1711 0)))) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1712 ;; this covers the horizontal coefficient as well: |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1713 ;; if max-lines = 0 then coef = 1 |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1714 (if (> max-lines 0) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1715 (/ (+ (funcall func buf-type n ctl-buf) 0.0) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1716 (+ max-lines 0.0)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1717 1)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1718 1))) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1719 |
11042 | 1720 |
1721 (defun ediff-next-difference (&optional arg) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1722 "Advance to the next difference. |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1723 With a prefix argument, go forward that many differences." |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1724 (interactive "p") |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1725 (ediff-barf-if-not-control-buffer) |
11042 | 1726 (if (< ediff-current-difference ediff-number-of-differences) |
1727 (let ((n (min ediff-number-of-differences | |
23017
3261e4a5f472
(ediff-next-difference, ediff-previous-difference): Handle nil as arg.
Richard M. Stallman <rms@gnu.org>
parents:
21940
diff
changeset
|
1728 (+ ediff-current-difference (or arg 1)))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1729 non-clash-skip skip-changed regexp-skip) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1730 |
18054 | 1731 (ediff-visible-region) |
11042 | 1732 (or (>= n ediff-number-of-differences) |
1733 (setq regexp-skip (funcall ediff-skip-diff-region-function n)) | |
20003 | 1734 ;; this won't exec if regexp-skip is t |
65856
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65689
diff
changeset
|
1735 (setq non-clash-skip (ediff-merge-region-is-non-clash-to-skip n) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1736 skip-changed |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1737 (ediff-skip-merge-region-if-changed-from-default-p n)) |
11042 | 1738 (ediff-install-fine-diff-if-necessary n)) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1739 ;; Skip loop |
11042 | 1740 (while (and (< n ediff-number-of-differences) |
1741 (or | |
1742 ;; regexp skip | |
1743 regexp-skip | |
1744 ;; skip clashes, if necessary | |
20003 | 1745 non-clash-skip |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1746 ;; skip processed regions |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1747 skip-changed |
11042 | 1748 ;; skip difference regions that differ in white space |
1749 (and ediff-ignore-similar-regions | |
65856
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65689
diff
changeset
|
1750 (ediff-merge-region-is-non-clash n) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1751 (or (eq (ediff-no-fine-diffs-p n) t) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1752 (and (ediff-merge-job) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1753 (eq (ediff-no-fine-diffs-p n) 'C))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1754 ))) |
11042 | 1755 (setq n (1+ n)) |
1756 (if (= 0 (mod n 20)) | |
1757 (message "Skipped over region %d and counting ..." n)) | |
1758 (or (>= n ediff-number-of-differences) | |
1759 (setq regexp-skip (funcall ediff-skip-diff-region-function n)) | |
20003 | 1760 ;; this won't exec if regexp-skip is t |
65856
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65689
diff
changeset
|
1761 (setq non-clash-skip (ediff-merge-region-is-non-clash-to-skip n) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1762 skip-changed |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1763 (ediff-skip-merge-region-if-changed-from-default-p n)) |
11042 | 1764 (ediff-install-fine-diff-if-necessary n)) |
1765 ) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1766 (message "") |
11042 | 1767 (ediff-unselect-and-select-difference n) |
1768 ) ; let | |
1769 (ediff-visible-region) | |
1770 (error "At end of the difference list"))) | |
1771 | |
1772 (defun ediff-previous-difference (&optional arg) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1773 "Go to the previous difference. |
11042 | 1774 With a prefix argument, go back that many differences." |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1775 (interactive "p") |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1776 (ediff-barf-if-not-control-buffer) |
11042 | 1777 (if (> ediff-current-difference -1) |
23017
3261e4a5f472
(ediff-next-difference, ediff-previous-difference): Handle nil as arg.
Richard M. Stallman <rms@gnu.org>
parents:
21940
diff
changeset
|
1778 (let ((n (max -1 (- ediff-current-difference (or arg 1)))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1779 non-clash-skip skip-changed regexp-skip) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1780 |
18054 | 1781 (ediff-visible-region) |
11042 | 1782 (or (< n 0) |
1783 (setq regexp-skip (funcall ediff-skip-diff-region-function n)) | |
20003 | 1784 ;; this won't exec if regexp-skip is t |
65856
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65689
diff
changeset
|
1785 (setq non-clash-skip (ediff-merge-region-is-non-clash-to-skip n) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1786 skip-changed |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1787 (ediff-skip-merge-region-if-changed-from-default-p n)) |
11042 | 1788 (ediff-install-fine-diff-if-necessary n)) |
1789 (while (and (> n -1) | |
1790 (or | |
1791 ;; regexp skip | |
1792 regexp-skip | |
1793 ;; skip clashes, if necessary | |
20003 | 1794 non-clash-skip |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1795 ;; skipp changed regions |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1796 skip-changed |
11042 | 1797 ;; skip difference regions that differ in white space |
1798 (and ediff-ignore-similar-regions | |
66687
26faad662ac6
2005-11-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65856
diff
changeset
|
1799 (ediff-merge-region-is-non-clash n) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1800 (or (eq (ediff-no-fine-diffs-p n) t) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1801 (and (ediff-merge-job) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1802 (eq (ediff-no-fine-diffs-p n) 'C))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1803 ))) |
11042 | 1804 (if (= 0 (mod (1+ n) 20)) |
1805 (message "Skipped over region %d and counting ..." (1+ n))) | |
1806 (setq n (1- n)) | |
1807 (or (< n 0) | |
1808 (setq regexp-skip (funcall ediff-skip-diff-region-function n)) | |
20003 | 1809 ;; this won't exec if regexp-skip is t |
65856
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65689
diff
changeset
|
1810 (setq non-clash-skip (ediff-merge-region-is-non-clash-to-skip n) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1811 skip-changed |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1812 (ediff-skip-merge-region-if-changed-from-default-p n)) |
11042 | 1813 (ediff-install-fine-diff-if-necessary n)) |
1814 ) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1815 (message "") |
11042 | 1816 (ediff-unselect-and-select-difference n) |
1817 ) ; let | |
1818 (ediff-visible-region) | |
1819 (error "At beginning of the difference list"))) | |
1820 | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1821 ;; The diff number is as perceived by the user (i.e., 1+ the internal |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1822 ;; representation) |
11042 | 1823 (defun ediff-jump-to-difference (difference-number) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1824 "Go to the difference specified as a prefix argument. |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1825 If the prefix is negative, count differences from the end." |
11042 | 1826 (interactive "p") |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1827 (ediff-barf-if-not-control-buffer) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1828 (setq difference-number |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1829 (cond ((< difference-number 0) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1830 (+ ediff-number-of-differences difference-number)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1831 ((> difference-number 0) (1- difference-number)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1832 (t -1))) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1833 ;; -1 is allowed by ediff-unselect-and-select-difference --- it is the |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1834 ;; position before the first one. |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1835 (if (and (>= difference-number -1) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1836 (<= difference-number ediff-number-of-differences)) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1837 (ediff-unselect-and-select-difference difference-number) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1838 (error ediff-BAD-DIFF-NUMBER |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1839 this-command (1+ difference-number) ediff-number-of-differences))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1840 |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1841 (defun ediff-jump-to-difference-at-point (arg) |
11042 | 1842 "Go to difference closest to the point in buffer A, B, or C. |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1843 The buffer depends on last command character \(a, b, or c\) that invoked this |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1844 command. For instance, if the command was `ga' then the point value in buffer |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1845 A is used. |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1846 With a prefix argument, synchronize all files around the current point position |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1847 in the specified buffer." |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1848 (interactive "P") |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1849 (ediff-barf-if-not-control-buffer) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1850 (let* ((buf-type (ediff-char-to-buftype last-command-char)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1851 (buffer (ediff-get-buffer buf-type)) |
19047 | 1852 (pt (ediff-with-current-buffer buffer (point))) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1853 (diff-no (ediff-diff-at-point buf-type nil (if arg 'after))) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1854 (past-last-diff (< ediff-number-of-differences diff-no)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1855 (beg (if past-last-diff |
19047 | 1856 (ediff-with-current-buffer buffer (point-max)) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1857 (ediff-get-diff-posn buf-type 'beg (1- diff-no)))) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1858 ctl-wind wind-A wind-B wind-C |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1859 shift) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1860 (if past-last-diff |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1861 (ediff-jump-to-difference -1) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1862 (ediff-jump-to-difference diff-no)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1863 (setq ctl-wind (selected-window) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1864 wind-A ediff-window-A |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1865 wind-B ediff-window-B |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1866 wind-C ediff-window-C) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1867 (if arg |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1868 (progn |
19047 | 1869 (ediff-with-current-buffer buffer |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1870 (setq shift (- beg pt))) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1871 (select-window wind-A) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1872 (if past-last-diff (goto-char (point-max))) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1873 (condition-case nil |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1874 (backward-char shift) ; noerror, if beginning of buffer |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1875 (error)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1876 (recenter) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1877 (select-window wind-B) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1878 (if past-last-diff (goto-char (point-max))) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1879 (condition-case nil |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1880 (backward-char shift) ; noerror, if beginning of buffer |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1881 (error)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1882 (recenter) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1883 (if (window-live-p wind-C) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1884 (progn |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1885 (select-window wind-C) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1886 (if past-last-diff (goto-char (point-max))) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1887 (condition-case nil |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1888 (backward-char shift) ; noerror, if beginning of buffer |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1889 (error)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1890 (recenter) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1891 )) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1892 (select-window ctl-wind) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1893 )) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1894 )) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1895 |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1896 |
11042 | 1897 ;; find region most related to the current point position (or POS, if given) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1898 ;; returns diff number as seen by the user (i.e., 1+ the internal |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1899 ;; representation) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1900 ;; The optional argument WHICH-DIFF can be `after' or `before'. If `after', |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1901 ;; find the diff after the point. If `before', find the diff before the |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1902 ;; point. If the point is inside a diff, return that diff. |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1903 (defun ediff-diff-at-point (buf-type &optional pos which-diff) |
11042 | 1904 (let ((buffer (ediff-get-buffer buf-type)) |
1905 (ctl-buffer ediff-control-buffer) | |
1906 (max-dif-num (1- ediff-number-of-differences)) | |
1907 (diff-no -1) | |
1908 (prev-beg 0) | |
1909 (prev-end 0) | |
1910 (beg 0) | |
1911 (end 0)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1912 |
19047 | 1913 (ediff-with-current-buffer buffer |
11042 | 1914 (setq pos (or pos (point))) |
1915 (while (and (or (< pos prev-beg) (> pos beg)) | |
1916 (< diff-no max-dif-num)) | |
1917 (setq diff-no (1+ diff-no)) | |
1918 (setq prev-beg beg | |
1919 prev-end end) | |
1920 (setq beg (ediff-get-diff-posn buf-type 'beg diff-no ctl-buffer) | |
1921 end (ediff-get-diff-posn buf-type 'end diff-no ctl-buffer)) | |
1922 ) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1923 |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1924 ;; boost diff-no by 1, if past the last diff region |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1925 (if (and (memq which-diff '(after before)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1926 (> pos beg) (= diff-no max-dif-num)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1927 (setq diff-no (1+ diff-no))) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1928 |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1929 (cond ((eq which-diff 'after) (1+ diff-no)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1930 ((eq which-diff 'before) diff-no) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1931 ((< (abs (count-lines pos (max 1 prev-end))) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1932 (abs (count-lines pos (max 1 beg)))) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1933 diff-no) ; choose prev difference |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1934 (t |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1935 (1+ diff-no))) ; choose next difference |
11042 | 1936 ))) |
1937 | |
1938 | |
1939 ;;; Copying diffs. | |
1940 | |
1941 (defun ediff-diff-to-diff (arg &optional keys) | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1942 "Copy buffer-X'th difference region to buffer Y \(X,Y are A, B, or C\). |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1943 If numerical prefix argument, copy the difference specified in the arg. |
11042 | 1944 Otherwise, copy the difference given by `ediff-current-difference'. |
1945 This command assumes it is bound to a 2-character key sequence, `ab', `ba', | |
1946 `ac', etc., which is used to determine the types of buffers to be used for | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1947 copying difference regions. The first character in the sequence specifies |
11042 | 1948 the source buffer and the second specifies the target. |
1949 | |
1950 If the second optional argument, a 2-character string, is given, use it to | |
1951 determine the source and the target buffers instead of the command keys." | |
1952 (interactive "P") | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1953 (ediff-barf-if-not-control-buffer) |
11042 | 1954 (or keys (setq keys (this-command-keys))) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1955 (if (eq arg '-) (setq arg -1)) ; translate neg arg to -1 |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1956 (if (numberp arg) (ediff-jump-to-difference arg)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1957 |
11042 | 1958 (let* ((key1 (aref keys 0)) |
1959 (key2 (aref keys 1)) | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1960 (char1 (ediff-event-key key1)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1961 (char2 (ediff-event-key key2)) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1962 ediff-verbose-p) |
11042 | 1963 (ediff-copy-diff ediff-current-difference |
1964 (ediff-char-to-buftype char1) | |
1965 (ediff-char-to-buftype char2)) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1966 ;; recenter with rehighlighting, but no messages |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1967 (ediff-recenter))) |
11042 | 1968 |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1969 (defun ediff-copy-A-to-B (arg) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1970 "Copy ARGth difference region from buffer A to B. |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1971 ARG is a prefix argument. If nil, copy the current difference region." |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1972 (interactive "P") |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1973 (ediff-diff-to-diff arg "ab")) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1974 |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1975 (defun ediff-copy-B-to-A (arg) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1976 "Copy ARGth difference region from buffer B to A. |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1977 ARG is a prefix argument. If nil, copy the current difference region." |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1978 (interactive "P") |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1979 (ediff-diff-to-diff arg "ba")) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1980 |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1981 (defun ediff-copy-A-to-C (arg) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1982 "Copy ARGth difference region from buffer A to buffer C. |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1983 ARG is a prefix argument. If nil, copy the current difference region." |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1984 (interactive "P") |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1985 (ediff-diff-to-diff arg "ac")) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1986 |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1987 (defun ediff-copy-B-to-C (arg) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1988 "Copy ARGth difference region from buffer B to buffer C. |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1989 ARG is a prefix argument. If nil, copy the current difference region." |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1990 (interactive "P") |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1991 (ediff-diff-to-diff arg "bc")) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1992 |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1993 (defun ediff-copy-C-to-B (arg) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1994 "Copy ARGth difference region from buffer C to B. |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1995 ARG is a prefix argument. If nil, copy the current difference region." |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1996 (interactive "P") |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1997 (ediff-diff-to-diff arg "cb")) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1998 |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1999 (defun ediff-copy-C-to-A (arg) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2000 "Copy ARGth difference region from buffer C to A. |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2001 ARG is a prefix argument. If nil, copy the current difference region." |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2002 (interactive "P") |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2003 (ediff-diff-to-diff arg "ca")) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2004 |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2005 |
11042 | 2006 |
2007 ;; Copy diff N from FROM-BUF-TYPE \(given as A, B or C\) to TO-BUF-TYPE. | |
2008 ;; If optional DO-NOT-SAVE is non-nil, do not save the old value of the | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2009 ;; target diff. This is used in merging, when constructing the merged |
11042 | 2010 ;; version. |
2011 (defun ediff-copy-diff (n from-buf-type to-buf-type | |
2012 &optional batch-invocation reg-to-copy) | |
2013 (let* ((to-buf (ediff-get-buffer to-buf-type)) | |
2014 ;;(from-buf (if (not reg-to-copy) (ediff-get-buffer from-buf-type))) | |
2015 (ctrl-buf ediff-control-buffer) | |
2016 (saved-p t) | |
2017 (three-way ediff-3way-job) | |
2018 messg | |
2019 ediff-verbose-p | |
2020 reg-to-delete reg-to-delete-beg reg-to-delete-end) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2021 |
11042 | 2022 (setq reg-to-delete-beg |
2023 (ediff-get-diff-posn to-buf-type 'beg n ctrl-buf)) | |
2024 (setq reg-to-delete-end | |
2025 (ediff-get-diff-posn to-buf-type 'end n ctrl-buf)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2026 |
11042 | 2027 (if reg-to-copy |
2028 (setq from-buf-type nil) | |
2029 (setq reg-to-copy (ediff-get-region-contents n from-buf-type ctrl-buf))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2030 |
11042 | 2031 (setq reg-to-delete (ediff-get-region-contents |
2032 n to-buf-type ctrl-buf | |
2033 reg-to-delete-beg reg-to-delete-end)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2034 |
11042 | 2035 (if (string= reg-to-delete reg-to-copy) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2036 (setq saved-p nil) ; don't copy identical buffers |
11042 | 2037 ;; seems ok to copy |
2038 (if (or batch-invocation (ediff-test-save-region n to-buf-type)) | |
2039 (condition-case conds | |
2040 (progn | |
19047 | 2041 (ediff-with-current-buffer to-buf |
11042 | 2042 ;; to prevent flags from interfering if buffer is writable |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2043 (let ((inhibit-read-only (null buffer-read-only))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2044 |
11042 | 2045 (goto-char reg-to-delete-end) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2046 (insert reg-to-copy) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2047 |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2048 (if (> reg-to-delete-end reg-to-delete-beg) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2049 (kill-region reg-to-delete-beg reg-to-delete-end)) |
11042 | 2050 )) |
2051 (or batch-invocation | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2052 (setq |
11042 | 2053 messg |
2054 (ediff-save-diff-region n to-buf-type reg-to-delete)))) | |
2055 (error (message "ediff-copy-diff: %s %s" | |
2056 (car conds) | |
2057 (mapconcat 'prin1-to-string (cdr conds) " ")) | |
2058 (beep 1) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2059 (sit-for 2) ; let the user see the error msg |
11042 | 2060 (setq saved-p nil) |
2061 ))) | |
2062 ) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2063 |
11042 | 2064 ;; adjust state of difference in case 3-way and diff was copied ok |
2065 (if (and saved-p three-way) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2066 (ediff-set-state-of-diff-in-all-buffers n ctrl-buf)) |
11042 | 2067 |
2068 (if batch-invocation | |
2069 (ediff-clear-fine-differences n) | |
2070 ;; If diff3 job, we should recompute fine diffs so we clear them | |
2071 ;; before reinserting flags (and thus before ediff-recenter). | |
2072 (if (and saved-p three-way) | |
2073 (ediff-clear-fine-differences n)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2074 |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2075 (ediff-refresh-mode-lines) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2076 |
11042 | 2077 ;; For diff2 jobs, don't recompute fine diffs, since we know there |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2078 ;; aren't any. So we clear diffs after ediff-recenter. |
11042 | 2079 (if (and saved-p (not three-way)) |
2080 (ediff-clear-fine-differences n)) | |
2081 ;; Make sure that the message about saving and how to restore is seen | |
2082 ;; by the user | |
65582
4d1085b02d64
Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents:
64762
diff
changeset
|
2083 (message "%s" messg)) |
11042 | 2084 )) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2085 |
11042 | 2086 ;; Save Nth diff of buffer BUF-TYPE \(A, B, or C\). |
2087 ;; That is to say, the Nth diff on the `ediff-killed-diffs-alist'. REG | |
2088 ;; is the region to save. It is redundant here, but is passed anyway, for | |
2089 ;; convenience. | |
2090 (defun ediff-save-diff-region (n buf-type reg) | |
2091 (let* ((n-th-diff-saved (assoc n ediff-killed-diffs-alist)) | |
2092 (buf (ediff-get-buffer buf-type)) | |
2093 (this-buf-n-th-diff-saved (assoc buf (cdr n-th-diff-saved)))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2094 |
11042 | 2095 (if this-buf-n-th-diff-saved |
2096 ;; either nothing saved for n-th diff and buffer or we OK'ed | |
2097 ;; overriding | |
2098 (setcdr this-buf-n-th-diff-saved reg) | |
2099 (if n-th-diff-saved ;; n-th diff saved, but for another buffer | |
2100 (nconc n-th-diff-saved (list (cons buf reg))) | |
2101 (setq ediff-killed-diffs-alist ;; create record for n-th diff | |
2102 (cons (list n (cons buf reg)) | |
2103 ediff-killed-diffs-alist)))) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2104 (message "Saving old diff region #%d of buffer %S. To recover, type `r%s'" |
11042 | 2105 (1+ n) buf-type |
2106 (if ediff-merge-job | |
2107 "" (downcase (symbol-name buf-type)))) | |
2108 )) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2109 |
11042 | 2110 ;; Test if saving Nth difference region of buffer BUF-TYPE is possible. |
2111 (defun ediff-test-save-region (n buf-type) | |
2112 (let* ((n-th-diff-saved (assoc n ediff-killed-diffs-alist)) | |
2113 (buf (ediff-get-buffer buf-type)) | |
2114 (this-buf-n-th-diff-saved (assoc buf (cdr n-th-diff-saved)))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2115 |
11042 | 2116 (if this-buf-n-th-diff-saved |
2117 (if (yes-or-no-p | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2118 (format |
65689
96187e7edd1b
2005-09-25 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents:
65680
diff
changeset
|
2119 "You've previously copied diff region %d to buffer %S. Confirm? " |
11042 | 2120 (1+ n) buf-type)) |
2121 t | |
2122 (error "Quit")) | |
2123 t))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2124 |
11042 | 2125 (defun ediff-pop-diff (n buf-type) |
2126 "Pop last killed Nth diff region from buffer BUF-TYPE." | |
2127 (let* ((n-th-record (assoc n ediff-killed-diffs-alist)) | |
2128 (buf (ediff-get-buffer buf-type)) | |
2129 (saved-rec (assoc buf (cdr n-th-record))) | |
2130 (three-way ediff-3way-job) | |
2131 (ctl-buf ediff-control-buffer) | |
2132 ediff-verbose-p | |
2133 saved-diff reg-beg reg-end recovered) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2134 |
11042 | 2135 (if (cdr saved-rec) |
2136 (setq saved-diff (cdr saved-rec)) | |
2137 (if (> ediff-number-of-differences 0) | |
2138 (error "Nothing saved for diff %d in buffer %S" (1+ n) buf-type) | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2139 (error ediff-NO-DIFFERENCES))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2140 |
11042 | 2141 (setq reg-beg (ediff-get-diff-posn buf-type 'beg n ediff-control-buffer)) |
2142 (setq reg-end (ediff-get-diff-posn buf-type 'end n ediff-control-buffer)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2143 |
11042 | 2144 (condition-case conds |
19047 | 2145 (ediff-with-current-buffer buf |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2146 (let ((inhibit-read-only (null buffer-read-only))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2147 |
11042 | 2148 (goto-char reg-end) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2149 (insert saved-diff) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2150 |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2151 (if (> reg-end reg-beg) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2152 (kill-region reg-beg reg-end)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2153 |
11042 | 2154 (setq recovered t) |
2155 )) | |
2156 (error (message "ediff-pop-diff: %s %s" | |
2157 (car conds) | |
2158 (mapconcat 'prin1-to-string (cdr conds) " ")) | |
2159 (beep 1))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2160 |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2161 ;; Clearing fine diffs is necessary for |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2162 ;; ediff-unselect-and-select-difference to properly recompute them. We |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2163 ;; can't rely on ediff-copy-diff to clear this vector, as the user might |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2164 ;; have modified diff regions after copying and, thus, may have recomputed |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2165 ;; fine diffs. |
11042 | 2166 (if recovered |
2167 (ediff-clear-fine-differences n)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2168 |
11042 | 2169 ;; adjust state of difference |
2170 (if (and three-way recovered) | |
2171 (ediff-set-state-of-diff-in-all-buffers n ctl-buf)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2172 |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2173 (ediff-refresh-mode-lines) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2174 |
11042 | 2175 (if recovered |
2176 (progn | |
2177 (setq n-th-record (delq saved-rec n-th-record)) | |
2178 (message "Diff region %d in buffer %S restored" (1+ n) buf-type) | |
2179 )) | |
2180 )) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2181 |
11042 | 2182 (defun ediff-restore-diff (arg &optional key) |
2183 "Restore ARGth diff from `ediff-killed-diffs-alist'. | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2184 ARG is a prefix argument. If ARG is nil, restore the current-difference. |
11042 | 2185 If the second optional argument, a character, is given, use it to |
2186 determine the target buffer instead of last-command-char" | |
2187 (interactive "P") | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2188 (ediff-barf-if-not-control-buffer) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2189 (if (numberp arg) |
11042 | 2190 (ediff-jump-to-difference arg)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2191 (ediff-pop-diff ediff-current-difference |
11042 | 2192 (ediff-char-to-buftype (or key last-command-char))) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2193 ;; recenter with rehighlighting, but no messages |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2194 (let (ediff-verbose-p) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2195 (ediff-recenter))) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2196 |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2197 (defun ediff-restore-diff-in-merge-buffer (arg) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2198 "Restore ARGth diff in the merge buffer. |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2199 ARG is a prefix argument. If nil, restore the current diff." |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2200 (interactive "P") |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2201 (ediff-restore-diff arg ?c)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2202 |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2203 |
11042 | 2204 (defun ediff-toggle-regexp-match () |
2205 "Toggle between focusing and hiding of difference regions that match | |
2206 a regular expression typed in by the user." | |
2207 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2208 (ediff-barf-if-not-control-buffer) |
11042 | 2209 (let ((regexp-A "") |
2210 (regexp-B "") | |
2211 (regexp-C "") | |
2212 msg-connective alt-msg-connective alt-connective) | |
2213 (cond | |
2214 ((or (and (eq ediff-skip-diff-region-function | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
2215 ediff-focus-on-regexp-matches-function) |
11042 | 2216 (eq last-command-char ?f)) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2217 (and (eq ediff-skip-diff-region-function |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2218 ediff-hide-regexp-matches-function) |
11042 | 2219 (eq last-command-char ?h))) |
2220 (message "Selective browsing by regexp turned off") | |
2221 (setq ediff-skip-diff-region-function 'ediff-show-all-diffs)) | |
2222 ((eq last-command-char ?h) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2223 (setq ediff-skip-diff-region-function ediff-hide-regexp-matches-function |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2224 regexp-A |
11042 | 2225 (read-string |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2226 (format |
65680
ed770a0a7846
2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents:
65627
diff
changeset
|
2227 "Ignore A-regions matching this regexp (default %s): " |
11042 | 2228 ediff-regexp-hide-A)) |
2229 regexp-B | |
2230 (read-string | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2231 (format |
65680
ed770a0a7846
2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents:
65627
diff
changeset
|
2232 "Ignore B-regions matching this regexp (default %s): " |
11042 | 2233 ediff-regexp-hide-B))) |
2234 (if ediff-3way-comparison-job | |
2235 (setq regexp-C | |
2236 (read-string | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2237 (format |
65680
ed770a0a7846
2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents:
65627
diff
changeset
|
2238 "Ignore C-regions matching this regexp (default %s): " |
11042 | 2239 ediff-regexp-hide-C)))) |
2240 (if (eq ediff-hide-regexp-connective 'and) | |
2241 (setq msg-connective "BOTH" | |
2242 alt-msg-connective "ONE OF" | |
2243 alt-connective 'or) | |
2244 (setq msg-connective "ONE OF" | |
2245 alt-msg-connective "BOTH" | |
2246 alt-connective 'and)) | |
2247 (if (y-or-n-p | |
2248 (format | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2249 "Ignore regions that match %s regexps, OK? " |
53865
6a6dc234f296
(ediff-toggle-read-only): Remove extra format
Andreas Schwab <schwab@suse.de>
parents:
52828
diff
changeset
|
2250 msg-connective)) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2251 (message "Will ignore regions that match %s regexps" msg-connective) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2252 (setq ediff-hide-regexp-connective alt-connective) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2253 (message "Will ignore regions that match %s regexps" |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2254 alt-msg-connective)) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2255 |
11042 | 2256 (or (string= regexp-A "") (setq ediff-regexp-hide-A regexp-A)) |
2257 (or (string= regexp-B "") (setq ediff-regexp-hide-B regexp-B)) | |
2258 (or (string= regexp-C "") (setq ediff-regexp-hide-C regexp-C))) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2259 |
11042 | 2260 ((eq last-command-char ?f) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2261 (setq ediff-skip-diff-region-function |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2262 ediff-focus-on-regexp-matches-function |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2263 regexp-A |
11042 | 2264 (read-string |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2265 (format |
65680
ed770a0a7846
2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents:
65627
diff
changeset
|
2266 "Focus on A-regions matching this regexp (default %s): " |
11042 | 2267 ediff-regexp-focus-A)) |
2268 regexp-B | |
2269 (read-string | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2270 (format |
65680
ed770a0a7846
2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents:
65627
diff
changeset
|
2271 "Focus on B-regions matching this regexp (default %s): " |
11042 | 2272 ediff-regexp-focus-B))) |
2273 (if ediff-3way-comparison-job | |
2274 (setq regexp-C | |
2275 (read-string | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2276 (format |
65680
ed770a0a7846
2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents:
65627
diff
changeset
|
2277 "Focus on C-regions matching this regexp (default %s): " |
11042 | 2278 ediff-regexp-focus-C)))) |
2279 (if (eq ediff-focus-regexp-connective 'and) | |
2280 (setq msg-connective "BOTH" | |
2281 alt-msg-connective "ONE OF" | |
2282 alt-connective 'or) | |
2283 (setq msg-connective "ONE OF" | |
2284 alt-msg-connective "BOTH" | |
2285 alt-connective 'and)) | |
2286 (if (y-or-n-p | |
2287 (format | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2288 "Focus on regions that match %s regexps, OK? " |
53865
6a6dc234f296
(ediff-toggle-read-only): Remove extra format
Andreas Schwab <schwab@suse.de>
parents:
52828
diff
changeset
|
2289 msg-connective)) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2290 (message "Will focus on regions that match %s regexps" |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2291 msg-connective) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2292 (setq ediff-focus-regexp-connective alt-connective) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2293 (message "Will focus on regions that match %s regexps" |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2294 alt-msg-connective)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2295 |
11042 | 2296 (or (string= regexp-A "") (setq ediff-regexp-focus-A regexp-A)) |
2297 (or (string= regexp-B "") (setq ediff-regexp-focus-B regexp-B)) | |
2298 (or (string= regexp-C "") (setq ediff-regexp-focus-C regexp-C)))))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2299 |
11042 | 2300 (defun ediff-toggle-skip-similar () |
2301 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2302 (ediff-barf-if-not-control-buffer) |
11042 | 2303 (if (not (eq ediff-auto-refine 'on)) |
2304 (error | |
2305 "Can't skip over whitespace regions: first turn auto-refining on")) | |
2306 (setq ediff-ignore-similar-regions (not ediff-ignore-similar-regions)) | |
2307 (if ediff-ignore-similar-regions | |
2308 (message | |
2309 "Skipping regions that differ only in white space & line breaks") | |
2310 (message "Skipping over white-space differences turned off"))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2311 |
11042 | 2312 (defun ediff-focus-on-regexp-matches (n) |
2313 "Focus on diffs that match regexp `ediff-regexp-focus-A/B'. | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2314 Regions to be ignored according to this function are those where |
11042 | 2315 buf A region doesn't match `ediff-regexp-focus-A' and buf B region |
2316 doesn't match `ediff-regexp-focus-B'. | |
2317 This function returns nil if the region number N (specified as | |
2318 an argument) is not to be ignored and t if region N is to be ignored. | |
2319 | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2320 N is a region number used by Ediff internally. It is 1 less |
11042 | 2321 the number seen by the user." |
2322 (if (ediff-valid-difference-p n) | |
2323 (let* ((ctl-buf ediff-control-buffer) | |
2324 (regex-A ediff-regexp-focus-A) | |
2325 (regex-B ediff-regexp-focus-B) | |
2326 (regex-C ediff-regexp-focus-C) | |
19047 | 2327 (reg-A-match (ediff-with-current-buffer ediff-buffer-A |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2328 (save-restriction |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2329 (narrow-to-region |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2330 (ediff-get-diff-posn 'A 'beg n ctl-buf) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2331 (ediff-get-diff-posn 'A 'end n ctl-buf)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2332 (goto-char (point-min)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2333 (re-search-forward regex-A nil t)))) |
19047 | 2334 (reg-B-match (ediff-with-current-buffer ediff-buffer-B |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2335 (save-restriction |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2336 (narrow-to-region |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2337 (ediff-get-diff-posn 'B 'beg n ctl-buf) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2338 (ediff-get-diff-posn 'B 'end n ctl-buf)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2339 (re-search-forward regex-B nil t)))) |
11042 | 2340 (reg-C-match (if ediff-3way-comparison-job |
19047 | 2341 (ediff-with-current-buffer ediff-buffer-C |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2342 (save-restriction |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2343 (narrow-to-region |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2344 (ediff-get-diff-posn 'C 'beg n ctl-buf) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2345 (ediff-get-diff-posn 'C 'end n ctl-buf)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2346 (re-search-forward regex-C nil t)))))) |
11042 | 2347 (not (eval (if ediff-3way-comparison-job |
2348 (list ediff-focus-regexp-connective | |
2349 reg-A-match reg-B-match reg-C-match) | |
2350 (list ediff-focus-regexp-connective | |
2351 reg-A-match reg-B-match)))) | |
2352 ))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2353 |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2354 (defun ediff-hide-regexp-matches (n) |
11042 | 2355 "Hide diffs that match regexp `ediff-regexp-hide-A/B/C'. |
2356 Regions to be ignored are those where buf A region matches | |
2357 `ediff-regexp-hide-A' and buf B region matches `ediff-regexp-hide-B'. | |
2358 This function returns nil if the region number N (specified as | |
2359 an argument) is not to be ignored and t if region N is to be ignored. | |
2360 | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2361 N is a region number used by Ediff internally. It is 1 less |
11042 | 2362 the number seen by the user." |
2363 (if (ediff-valid-difference-p n) | |
2364 (let* ((ctl-buf ediff-control-buffer) | |
2365 (regex-A ediff-regexp-hide-A) | |
2366 (regex-B ediff-regexp-hide-B) | |
2367 (regex-C ediff-regexp-hide-C) | |
19047 | 2368 (reg-A-match (ediff-with-current-buffer ediff-buffer-A |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2369 (save-restriction |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2370 (narrow-to-region |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2371 (ediff-get-diff-posn 'A 'beg n ctl-buf) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2372 (ediff-get-diff-posn 'A 'end n ctl-buf)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2373 (goto-char (point-min)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2374 (re-search-forward regex-A nil t)))) |
19047 | 2375 (reg-B-match (ediff-with-current-buffer ediff-buffer-B |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2376 (save-restriction |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2377 (narrow-to-region |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2378 (ediff-get-diff-posn 'B 'beg n ctl-buf) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2379 (ediff-get-diff-posn 'B 'end n ctl-buf)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2380 (goto-char (point-min)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2381 (re-search-forward regex-B nil t)))) |
11042 | 2382 (reg-C-match (if ediff-3way-comparison-job |
19047 | 2383 (ediff-with-current-buffer ediff-buffer-C |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2384 (save-restriction |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2385 (narrow-to-region |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2386 (ediff-get-diff-posn 'C 'beg n ctl-buf) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2387 (ediff-get-diff-posn 'C 'end n ctl-buf)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2388 (goto-char (point-min)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2389 (re-search-forward regex-C nil t)))))) |
11042 | 2390 (eval (if ediff-3way-comparison-job |
2391 (list ediff-hide-regexp-connective | |
2392 reg-A-match reg-B-match reg-C-match) | |
2393 (list ediff-hide-regexp-connective reg-A-match reg-B-match))) | |
2394 ))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2395 |
11042 | 2396 |
2397 | |
2398 ;;; Quitting, suspending, etc. | |
2399 | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2400 (defun ediff-quit (reverse-default-keep-variants) |
11042 | 2401 "Finish an Ediff session and exit Ediff. |
2402 Unselects the selected difference, if any, restores the read-only and modified | |
2403 flags of the compared file buffers, kills Ediff buffers for this session | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2404 \(but not buffers A, B, C\). |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2405 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2406 If `ediff-keep-variants' is nil, the user will be asked whether the buffers |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2407 containing the variants should be removed \(if they haven't been modified\). |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2408 If it is t, they will be preserved unconditionally. A prefix argument, |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2409 temporarily reverses the meaning of this variable." |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2410 (interactive "P") |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2411 (ediff-barf-if-not-control-buffer) |
87678
ae3fe9150b36
2008-01-09 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
87649
diff
changeset
|
2412 (let ((ctl-buf (current-buffer)) |
ae3fe9150b36
2008-01-09 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
87649
diff
changeset
|
2413 (ctl-frm (selected-frame)) |
ae3fe9150b36
2008-01-09 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
87649
diff
changeset
|
2414 (minibuffer-auto-raise t)) |
18054 | 2415 (if (y-or-n-p (format "Quit this Ediff session%s? " |
2416 (if (ediff-buffer-live-p ediff-meta-buffer) | |
2417 " & show containing session group" ""))) | |
2418 (progn | |
2419 (message "") | |
2420 (set-buffer ctl-buf) | |
2421 (ediff-really-quit reverse-default-keep-variants)) | |
87678
ae3fe9150b36
2008-01-09 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
87649
diff
changeset
|
2422 (select-frame ctl-frm) |
ae3fe9150b36
2008-01-09 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
87649
diff
changeset
|
2423 (raise-frame ctl-frm) |
18054 | 2424 (message "")))) |
11042 | 2425 |
2426 | |
2427 ;; Perform the quit operations. | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2428 (defun ediff-really-quit (reverse-default-keep-variants) |
11042 | 2429 (ediff-unhighlight-diffs-totally) |
2430 (ediff-clear-diff-vector 'ediff-difference-vector-A 'fine-diffs-also) | |
2431 (ediff-clear-diff-vector 'ediff-difference-vector-B 'fine-diffs-also) | |
2432 (ediff-clear-diff-vector 'ediff-difference-vector-C 'fine-diffs-also) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2433 (ediff-clear-diff-vector 'ediff-difference-vector-Ancestor 'fine-diffs-also) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2434 |
11042 | 2435 (ediff-delete-temp-files) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2436 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2437 ;; Restore the visibility range. This affects only ediff-*-regions/windows. |
11042 | 2438 ;; Since for other job names ediff-visible-region sets |
2439 ;; ediff-visible-bounds to ediff-wide-bounds, the settings below are | |
2440 ;; ignored for such jobs. | |
2441 (if ediff-quit-widened | |
2442 (setq ediff-visible-bounds ediff-wide-bounds) | |
2443 (setq ediff-visible-bounds ediff-narrow-bounds)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2444 |
11042 | 2445 ;; Apply selective display to narrow or widen |
2446 (ediff-visible-region) | |
84864
cac94194ce6d
(ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents:
82467
diff
changeset
|
2447 (mapc (lambda (overl) |
cac94194ce6d
(ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents:
82467
diff
changeset
|
2448 (if (ediff-overlayp overl) |
cac94194ce6d
(ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents:
82467
diff
changeset
|
2449 (ediff-delete-overlay overl))) |
cac94194ce6d
(ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents:
82467
diff
changeset
|
2450 ediff-wide-bounds) |
cac94194ce6d
(ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents:
82467
diff
changeset
|
2451 (mapc (lambda (overl) |
cac94194ce6d
(ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents:
82467
diff
changeset
|
2452 (if (ediff-overlayp overl) |
cac94194ce6d
(ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents:
82467
diff
changeset
|
2453 (ediff-delete-overlay overl))) |
cac94194ce6d
(ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents:
82467
diff
changeset
|
2454 ediff-narrow-bounds) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2455 |
11042 | 2456 ;; restore buffer mode line id's in buffer-A/B/C |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2457 (let ((control-buffer ediff-control-buffer) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2458 (meta-buffer ediff-meta-buffer) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2459 (after-quit-hook-internal ediff-after-quit-hook-internal) |
20206 | 2460 (session-number ediff-meta-session-number) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2461 ;; suitable working frame |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2462 (warp-frame (if (and (ediff-window-display-p) (eq ediff-grab-mouse t)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2463 (cond ((window-live-p ediff-window-A) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2464 (window-frame ediff-window-A)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2465 ((window-live-p ediff-window-B) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2466 (window-frame ediff-window-B)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2467 (t (next-frame)))))) |
11042 | 2468 (condition-case nil |
19047 | 2469 (ediff-with-current-buffer ediff-buffer-A |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2470 (setq ediff-this-buffer-ediff-sessions |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2471 (delq control-buffer ediff-this-buffer-ediff-sessions)) |
11042 | 2472 (kill-local-variable 'mode-line-buffer-identification) |
2473 (kill-local-variable 'mode-line-format) | |
2474 ) | |
2475 (error)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2476 |
11042 | 2477 (condition-case nil |
19047 | 2478 (ediff-with-current-buffer ediff-buffer-B |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2479 (setq ediff-this-buffer-ediff-sessions |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2480 (delq control-buffer ediff-this-buffer-ediff-sessions)) |
11042 | 2481 (kill-local-variable 'mode-line-buffer-identification) |
2482 (kill-local-variable 'mode-line-format) | |
2483 ) | |
2484 (error)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2485 |
11042 | 2486 (condition-case nil |
19047 | 2487 (ediff-with-current-buffer ediff-buffer-C |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2488 (setq ediff-this-buffer-ediff-sessions |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2489 (delq control-buffer ediff-this-buffer-ediff-sessions)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2490 (kill-local-variable 'mode-line-buffer-identification) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2491 (kill-local-variable 'mode-line-format) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2492 ) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2493 (error)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2494 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2495 (condition-case nil |
19047 | 2496 (ediff-with-current-buffer ediff-ancestor-buffer |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2497 (setq ediff-this-buffer-ediff-sessions |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2498 (delq control-buffer ediff-this-buffer-ediff-sessions)) |
11042 | 2499 (kill-local-variable 'mode-line-buffer-identification) |
2500 (kill-local-variable 'mode-line-format) | |
2501 ) | |
2502 (error)) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2503 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2504 (setq ediff-session-registry |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2505 (delq ediff-control-buffer ediff-session-registry)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2506 (ediff-update-registry) |
11042 | 2507 ;; restore state of buffers to what it was before ediff |
2508 (ediff-restore-protected-variables) | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2509 |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2510 ;; If the user interrupts (canceling saving the merge buffer), continue |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2511 ;; normally. |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2512 (condition-case nil |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2513 (if (ediff-merge-job) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2514 (run-hooks 'ediff-quit-merge-hook)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2515 (quit)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2516 |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2517 (run-hooks 'ediff-cleanup-hook) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2518 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2519 (ediff-janitor |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2520 'ask |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2521 ;; reverse-default-keep-variants is t if the user quits with a prefix arg |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2522 (if reverse-default-keep-variants |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2523 (not ediff-keep-variants) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2524 ediff-keep-variants)) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2525 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2526 ;; one hook here is ediff-cleanup-mess, which kills the control buffer and |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2527 ;; other auxiliary buffers. we made it into a hook to let the users do their |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2528 ;; own cleanup, if needed. |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2529 (run-hooks 'ediff-quit-hook) |
20206 | 2530 (ediff-update-meta-buffer meta-buffer nil session-number) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2531 |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2532 ;; warp mouse into a working window |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2533 (setq warp-frame ; if mouse is over a reasonable frame, use it |
19870 | 2534 (cond ((ediff-good-frame-under-mouse)) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2535 (t warp-frame))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2536 (if (and (ediff-window-display-p) (frame-live-p warp-frame) ediff-grab-mouse) |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85890
diff
changeset
|
2537 (set-mouse-position (if (featurep 'emacs) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2538 warp-frame |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2539 (frame-selected-window warp-frame)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2540 2 1)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2541 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2542 (run-hooks 'after-quit-hook-internal) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2543 )) |
19870 | 2544 |
2545 ;; Returns frame under mouse, if this frame is not a minibuffer | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2546 ;; frame. Otherwise: nil |
19870 | 2547 (defun ediff-good-frame-under-mouse () |
2548 (let ((frame-or-win (car (mouse-position))) | |
2549 (buf-name "") | |
2550 frame obj-ok) | |
2551 (setq obj-ok | |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85890
diff
changeset
|
2552 (if (featurep 'emacs) |
19870 | 2553 (frame-live-p frame-or-win) |
2554 (window-live-p frame-or-win))) | |
2555 (if obj-ok | |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85890
diff
changeset
|
2556 (setq frame (if (featurep 'emacs) frame-or-win (window-frame frame-or-win)) |
19870 | 2557 buf-name |
2558 (buffer-name (window-buffer (frame-selected-window frame))))) | |
2559 (if (string-match "Minibuf" buf-name) | |
2560 nil | |
2561 frame))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2562 |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2563 |
11042 | 2564 (defun ediff-delete-temp-files () |
20206 | 2565 (if (and (stringp ediff-temp-file-A) (file-exists-p ediff-temp-file-A)) |
11042 | 2566 (delete-file ediff-temp-file-A)) |
20206 | 2567 (if (and (stringp ediff-temp-file-B) (file-exists-p ediff-temp-file-B)) |
11042 | 2568 (delete-file ediff-temp-file-B)) |
20206 | 2569 (if (and (stringp ediff-temp-file-C) (file-exists-p ediff-temp-file-C)) |
11042 | 2570 (delete-file ediff-temp-file-C))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2571 |
11042 | 2572 |
2573 ;; Kill control buffer, other auxiliary Ediff buffers. | |
2574 ;; Leave one of the frames split between buffers A/B/C | |
2575 (defun ediff-cleanup-mess () | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2576 (let* ((buff-A ediff-buffer-A) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2577 (buff-B ediff-buffer-B) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2578 (buff-C ediff-buffer-C) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2579 (ctl-buf ediff-control-buffer) |
44615
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
2580 (ctl-wind (ediff-get-visible-buffer-window ctl-buf)) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2581 (ctl-frame ediff-control-frame) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2582 (three-way-job ediff-3way-job) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2583 (main-frame (cond ((window-live-p ediff-window-A) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2584 (window-frame ediff-window-A)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2585 ((window-live-p ediff-window-B) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2586 (window-frame ediff-window-B))))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2587 |
11042 | 2588 (ediff-kill-buffer-carefully ediff-diff-buffer) |
2589 (ediff-kill-buffer-carefully ediff-custom-diff-buffer) | |
2590 (ediff-kill-buffer-carefully ediff-fine-diff-buffer) | |
2591 (ediff-kill-buffer-carefully ediff-tmp-buffer) | |
2592 (ediff-kill-buffer-carefully ediff-error-buffer) | |
2593 (ediff-kill-buffer-carefully ediff-msg-buffer) | |
2594 (ediff-kill-buffer-carefully ediff-debug-buffer) | |
18054 | 2595 (if (boundp 'ediff-patch-diagnostics) |
2596 (ediff-kill-buffer-carefully ediff-patch-diagnostics)) | |
11042 | 2597 |
44615
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
2598 ;; delete control frame or window |
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
2599 (cond ((and (ediff-window-display-p) (frame-live-p ctl-frame)) |
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
2600 (delete-frame ctl-frame)) |
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
2601 ((window-live-p ctl-wind) |
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
2602 (delete-window ctl-wind))) |
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
2603 |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
2604 ;; Hide bottom toolbar. --marcpa |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
2605 (if (not (ediff-multiframe-setup-p)) |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
2606 (ediff-kill-bottom-toolbar)) |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
2607 |
11042 | 2608 (ediff-kill-buffer-carefully ctl-buf) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2609 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2610 (if (frame-live-p main-frame) |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2611 (select-frame main-frame)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2612 |
11042 | 2613 ;; display only if not visible |
2614 (condition-case nil | |
2615 (or (ediff-get-visible-buffer-window buff-B) | |
2616 (switch-to-buffer buff-B)) | |
2617 (error)) | |
2618 (condition-case nil | |
2619 (or (ediff-get-visible-buffer-window buff-A) | |
2620 (progn | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2621 (if (and (ediff-get-visible-buffer-window buff-B) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2622 (ediff-buffer-live-p buff-A)) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2623 (funcall ediff-split-window-function)) |
11042 | 2624 (switch-to-buffer buff-A))) |
2625 (error)) | |
2626 (if three-way-job | |
2627 (condition-case nil | |
2628 (or (ediff-get-visible-buffer-window buff-C) | |
2629 (progn | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2630 (if (and (or (ediff-get-visible-buffer-window buff-A) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2631 (ediff-get-visible-buffer-window buff-B)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2632 (ediff-buffer-live-p buff-C)) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2633 (funcall ediff-split-window-function)) |
44615
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
2634 (switch-to-buffer buff-C))) |
11042 | 2635 (error))) |
44615
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
2636 (balance-windows) |
11042 | 2637 (message "") |
2638 )) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2639 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2640 (defun ediff-janitor (ask keep-variants) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2641 "Kill buffers A, B, and, possibly, C, if these buffers aren't modified. |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2642 In merge jobs, buffer C is not deleted here, but rather according to |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2643 ediff-quit-merge-hook. |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2644 A side effect of cleaning up may be that you should be careful when comparing |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2645 the same buffer in two separate Ediff sessions: quitting one of them might |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2646 delete this buffer in another session as well." |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2647 (ediff-dispose-of-variant-according-to-user |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2648 ediff-buffer-A 'A ask keep-variants) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2649 (ediff-dispose-of-variant-according-to-user |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2650 ediff-buffer-B 'B ask keep-variants) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2651 (if ediff-merge-job ; don't del buf C if merging--del ancestor buf instead |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2652 (ediff-dispose-of-variant-according-to-user |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2653 ediff-ancestor-buffer 'Ancestor ask keep-variants) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2654 (ediff-dispose-of-variant-according-to-user |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2655 ediff-buffer-C 'C ask keep-variants) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2656 )) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2657 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2658 ;; Kill the variant buffer, according to user directives (ask, kill |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2659 ;; unconditionaly, keep) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2660 ;; BUFF is the buffer, BUFF-TYPE is either 'A, or 'B, 'C, 'Ancestor |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2661 (defun ediff-dispose-of-variant-according-to-user (buff bufftype ask keep-variants) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2662 ;; if this is indirect buffer, kill it and substitute with direct buf |
43220
69c91aaa067a
2002-02-10 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
2663 (if (and (ediff-buffer-live-p buff) |
69c91aaa067a
2002-02-10 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42602
diff
changeset
|
2664 (ediff-with-current-buffer buff ediff-temp-indirect-buffer)) |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2665 (let ((wind (ediff-get-visible-buffer-window buff)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2666 (base (buffer-base-buffer buff)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2667 (modified-p (buffer-modified-p buff))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2668 (if (and (window-live-p wind) (ediff-buffer-live-p base)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2669 (set-window-buffer wind base)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2670 ;; Kill indirect buffer even if it is modified, because the base buffer |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2671 ;; is still there. Note that if the base buffer is dead then so will be |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2672 ;; the indirect buffer |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2673 (ediff-with-current-buffer buff |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2674 (set-buffer-modified-p nil)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2675 (ediff-kill-buffer-carefully buff) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2676 (ediff-with-current-buffer base |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2677 (set-buffer-modified-p modified-p))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2678 ;; otherwise, ask or use the value of keep-variants |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2679 (or (not (ediff-buffer-live-p buff)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2680 keep-variants |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2681 (buffer-modified-p buff) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2682 (and ask |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2683 (not (y-or-n-p (format "Kill buffer %S [%s]? " |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2684 bufftype (buffer-name buff))))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2685 (ediff-kill-buffer-carefully buff)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2686 )) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2687 |
18054 | 2688 (defun ediff-maybe-save-and-delete-merge (&optional save-and-continue) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2689 "Default hook to run on quitting a merge job. |
18054 | 2690 This can also be used to save merge buffer in the middle of an Ediff session. |
2691 | |
2692 If the optional SAVE-AND-CONTINUE argument is non-nil, save merge buffer and | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2693 continue. Otherwise: |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2694 If `ediff-autostore-merges' is nil, this does nothing. |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2695 If it is t, it saves the merge buffer in the file `ediff-merge-store-file' |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2696 or asks the user, if the latter is nil. It then asks the user whether to |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2697 delete the merge buffer. |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2698 If `ediff-autostore-merges' is neither nil nor t, the merge buffer is saved |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2699 only if this merge job is part of a group, i.e., was invoked from within |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2700 `ediff-merge-directories', `ediff-merge-directory-revisions', and such." |
18054 | 2701 (let ((merge-store-file ediff-merge-store-file) |
2702 (ediff-autostore-merges ; fake ediff-autostore-merges, if necessary | |
2703 (if save-and-continue t ediff-autostore-merges))) | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2704 (if ediff-autostore-merges |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2705 (cond ((stringp merge-store-file) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2706 ;; store, ask to delete |
18054 | 2707 (ediff-write-merge-buffer-and-maybe-kill |
2708 ediff-buffer-C merge-store-file 'show-file save-and-continue)) | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2709 ((eq ediff-autostore-merges t) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2710 ;; ask for file name |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2711 (setq merge-store-file |
51072
52709955c5a5
2003-05-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
49588
diff
changeset
|
2712 (read-file-name "Save the result of the merge in file: ")) |
18054 | 2713 (ediff-write-merge-buffer-and-maybe-kill |
2714 ediff-buffer-C merge-store-file nil save-and-continue)) | |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
2715 ((and (ediff-buffer-live-p ediff-meta-buffer) |
19047 | 2716 (ediff-with-current-buffer ediff-meta-buffer |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
2717 (ediff-merge-metajob))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2718 ;; The parent metajob passed nil as the autostore file. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2719 nil))) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2720 )) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2721 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2722 ;; write merge buffer. If the optional argument save-and-continue is non-nil, |
18054 | 2723 ;; then don't kill the merge buffer |
2724 (defun ediff-write-merge-buffer-and-maybe-kill (buf file | |
2725 &optional | |
2726 show-file save-and-continue) | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2727 (if (not (eq (find-buffer-visiting file) buf)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2728 (let ((warn-message |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2729 (format "Another buffer is visiting file %s. Too dangerous to save the merge buffer" |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2730 file))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2731 (beep) |
65582
4d1085b02d64
Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents:
64762
diff
changeset
|
2732 (message "%s" warn-message) |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2733 (with-output-to-temp-buffer ediff-msg-buffer |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2734 (princ "\n\n") |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2735 (princ warn-message) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2736 (princ "\n\n") |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2737 ) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2738 (sit-for 2)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2739 (ediff-with-current-buffer buf |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2740 (if (or (not (file-exists-p file)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2741 (y-or-n-p (format "File %s exists, overwrite? " file))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2742 (progn |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2743 ;;(write-region (point-min) (point-max) file) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2744 (ediff-with-current-buffer buf |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2745 (set-visited-file-name file) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2746 (save-buffer)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2747 (if show-file |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2748 (progn |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2749 (message "Merge buffer saved in: %s" file) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2750 (set-buffer-modified-p nil) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2751 (sit-for 3))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2752 (if (and |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2753 (not save-and-continue) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2754 (y-or-n-p "Merge buffer saved. Now kill the buffer? ")) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2755 (ediff-kill-buffer-carefully buf))))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2756 )) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2757 |
11042 | 2758 ;; The default way of suspending Ediff. |
2759 ;; Buries Ediff buffers, kills all windows. | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2760 (defun ediff-default-suspend-function () |
11042 | 2761 (let* ((buf-A ediff-buffer-A) |
2762 (buf-B ediff-buffer-B) | |
2763 (buf-C ediff-buffer-C) | |
2764 (buf-A-wind (ediff-get-visible-buffer-window buf-A)) | |
2765 (buf-B-wind (ediff-get-visible-buffer-window buf-B)) | |
2766 (buf-C-wind (ediff-get-visible-buffer-window buf-C)) | |
18054 | 2767 (buf-patch (if (boundp 'ediff-patchbufer) ediff-patchbufer nil)) |
2768 (buf-patch-diag (if (boundp 'ediff-patch-diagnostics) | |
2769 ediff-patch-diagnostics nil)) | |
11042 | 2770 (buf-err ediff-error-buffer) |
2771 (buf-diff ediff-diff-buffer) | |
2772 (buf-custom-diff ediff-custom-diff-buffer) | |
2773 (buf-fine-diff ediff-fine-diff-buffer)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2774 |
11042 | 2775 ;; hide the control panel |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2776 (if (and (ediff-window-display-p) (frame-live-p ediff-control-frame)) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2777 (iconify-frame ediff-control-frame) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2778 (bury-buffer)) |
11042 | 2779 (if buf-err (bury-buffer buf-err)) |
2780 (if buf-diff (bury-buffer buf-diff)) | |
2781 (if buf-custom-diff (bury-buffer buf-custom-diff)) | |
2782 (if buf-fine-diff (bury-buffer buf-fine-diff)) | |
2783 (if buf-patch (bury-buffer buf-patch)) | |
2784 (if buf-patch-diag (bury-buffer buf-patch-diag)) | |
2785 (if (window-live-p buf-A-wind) | |
2786 (progn | |
2787 (select-window buf-A-wind) | |
2788 (delete-other-windows) | |
2789 (bury-buffer)) | |
18054 | 2790 (if (ediff-buffer-live-p buf-A) |
2791 (progn | |
2792 (set-buffer buf-A) | |
2793 (bury-buffer)))) | |
11042 | 2794 (if (window-live-p buf-B-wind) |
2795 (progn | |
2796 (select-window buf-B-wind) | |
2797 (delete-other-windows) | |
2798 (bury-buffer)) | |
18054 | 2799 (if (ediff-buffer-live-p buf-B) |
2800 (progn | |
2801 (set-buffer buf-B) | |
2802 (bury-buffer)))) | |
11042 | 2803 (if (window-live-p buf-C-wind) |
2804 (progn | |
2805 (select-window buf-C-wind) | |
2806 (delete-other-windows) | |
2807 (bury-buffer)) | |
18054 | 2808 (if (ediff-buffer-live-p buf-C) |
2809 (progn | |
2810 (set-buffer buf-C) | |
2811 (bury-buffer)))) | |
11042 | 2812 )) |
2813 | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2814 |
11042 | 2815 (defun ediff-suspend () |
2816 "Suspend Ediff. | |
2817 To resume, switch to the appropriate `Ediff Control Panel' | |
2818 buffer and then type \\[ediff-recenter]. Ediff will automatically set | |
2819 up an appropriate window config." | |
2820 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2821 (ediff-barf-if-not-control-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2822 (run-hooks 'ediff-suspend-hook) |
11042 | 2823 (message |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2824 "To resume, type M-x eregistry and select the desired Ediff session")) |
11042 | 2825 |
87058
20301f27964f
(ediff-version): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
87009
diff
changeset
|
2826 ;; ediff-barf-if-not-control-buffer ensures only called from ediff. |
87691
f2c8fd594360
2008-01-10 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
87678
diff
changeset
|
2827 (declare-function ediff-version "ediff" ()) |
87058
20301f27964f
(ediff-version): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
87009
diff
changeset
|
2828 |
11042 | 2829 (defun ediff-status-info () |
2830 "Show the names of the buffers or files being operated on by Ediff. | |
2831 Hit \\[ediff-recenter] to reset the windows afterward." | |
2832 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2833 (ediff-barf-if-not-control-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2834 (save-excursion |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2835 (ediff-skip-unsuitable-frames)) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
2836 (with-output-to-temp-buffer ediff-msg-buffer |
33392
25fb6fc4f66b
(ediff-status-info, ediff-debug-info): Put temp
Dave Love <fx@gnu.org>
parents:
33019
diff
changeset
|
2837 (ediff-with-current-buffer standard-output |
25fb6fc4f66b
(ediff-status-info, ediff-debug-info): Put temp
Dave Love <fx@gnu.org>
parents:
33019
diff
changeset
|
2838 (fundamental-mode)) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
2839 (raise-frame (selected-frame)) |
11042 | 2840 (princ (ediff-version)) |
2841 (princ "\n\n") | |
19047 | 2842 (ediff-with-current-buffer ediff-buffer-A |
11042 | 2843 (if buffer-file-name |
2844 (princ | |
2845 (format "File A = %S\n" buffer-file-name)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2846 (princ |
11042 | 2847 (format "Buffer A = %S\n" (buffer-name))))) |
19047 | 2848 (ediff-with-current-buffer ediff-buffer-B |
11042 | 2849 (if buffer-file-name |
2850 (princ | |
2851 (format "File B = %S\n" buffer-file-name)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2852 (princ |
11042 | 2853 (format "Buffer B = %S\n" (buffer-name))))) |
2854 (if ediff-3way-job | |
19047 | 2855 (ediff-with-current-buffer ediff-buffer-C |
11042 | 2856 (if buffer-file-name |
2857 (princ | |
2858 (format "File C = %S\n" buffer-file-name)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2859 (princ |
11042 | 2860 (format "Buffer C = %S\n" (buffer-name)))))) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2861 (princ (format "Customized diff output %s\n" |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2862 (if (ediff-buffer-live-p ediff-custom-diff-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2863 (concat "\tin buffer " |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2864 (buffer-name ediff-custom-diff-buffer)) |
18054 | 2865 " is not available"))) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2866 (princ (format "Plain diff output %s\n" |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2867 (if (ediff-buffer-live-p ediff-diff-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2868 (concat "\tin buffer " |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2869 (buffer-name ediff-diff-buffer)) |
18054 | 2870 " is not available"))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2871 |
19047 | 2872 (let* ((A-line (ediff-with-current-buffer ediff-buffer-A |
11042 | 2873 (1+ (count-lines (point-min) (point))))) |
19047 | 2874 (B-line (ediff-with-current-buffer ediff-buffer-B |
11042 | 2875 (1+ (count-lines (point-min) (point))))) |
2876 C-line) | |
2877 (princ (format "\Buffer A's point is on line %d\n" A-line)) | |
2878 (princ (format "Buffer B's point is on line %d\n" B-line)) | |
2879 (if ediff-3way-job | |
2880 (progn | |
19047 | 2881 (setq C-line (ediff-with-current-buffer ediff-buffer-C |
11042 | 2882 (1+ (count-lines (point-min) (point))))) |
2883 (princ (format "Buffer C's point is on line %d\n" C-line))))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2884 |
11042 | 2885 (princ (format "\nCurrent difference number = %S\n" |
2886 (cond ((< ediff-current-difference 0) 'start) | |
2887 ((>= ediff-current-difference | |
2888 ediff-number-of-differences) 'end) | |
2889 (t (1+ ediff-current-difference))))) | |
2890 | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2891 (princ |
18054 | 2892 (format "\n%s regions that differ in white space & line breaks only" |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2893 (if ediff-ignore-similar-regions |
18054 | 2894 "Ignoring" "Showing"))) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2895 (if (and ediff-merge-job ediff-show-clashes-only) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2896 (princ |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2897 "\nFocusing on regions where both buffers differ from the ancestor")) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2898 (if (and ediff-skip-merge-regions-that-differ-from-default ediff-merge-job) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2899 (princ |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2900 "\nSkipping merge regions that differ from default setting")) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2901 |
11042 | 2902 (cond ((eq ediff-skip-diff-region-function 'ediff-show-all-diffs) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2903 (princ "\nSelective browsing by regexp is off\n")) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2904 ((eq ediff-skip-diff-region-function |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2905 ediff-hide-regexp-matches-function) |
11042 | 2906 (princ |
2907 "\nIgnoring regions that match") | |
2908 (princ | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2909 (format |
11042 | 2910 "\n\t regexp `%s' in buffer A %S\n\t regexp `%s' in buffer B\n" |
2911 ediff-regexp-hide-A ediff-hide-regexp-connective | |
2912 ediff-regexp-hide-B))) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2913 ((eq ediff-skip-diff-region-function |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2914 ediff-focus-on-regexp-matches-function) |
11042 | 2915 (princ |
2916 "\nFocusing on regions that match") | |
2917 (princ | |
2918 (format | |
2919 "\n\t regexp `%s' in buffer A %S\n\t regexp `%s' in buffer B\n" | |
2920 ediff-regexp-focus-A ediff-focus-regexp-connective | |
2921 ediff-regexp-focus-B))) | |
2922 (t (princ "\nSelective browsing via a user-defined method.\n"))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2923 |
11042 | 2924 (princ |
2925 (format "\nBugs/suggestions: type `%s' while in Ediff Control Panel." | |
2926 (substitute-command-keys "\\[ediff-submit-report]"))) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2927 ) ; with output |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2928 (if (frame-live-p ediff-control-frame) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2929 (ediff-reset-mouse ediff-control-frame)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2930 (if (window-live-p ediff-control-window) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2931 (select-window ediff-control-window))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2932 |
11042 | 2933 |
2934 | |
2935 | |
2936 ;;; Support routines | |
2937 | |
2938 ;; Select a difference by placing the ASCII flags around the appropriate | |
2939 ;; group of lines in the A, B buffers | |
2940 ;; This may have to be modified for buffer C, when it will be supported. | |
2941 (defun ediff-select-difference (n) | |
2942 (if (and (ediff-buffer-live-p ediff-buffer-A) | |
2943 (ediff-buffer-live-p ediff-buffer-B) | |
2944 (ediff-valid-difference-p n)) | |
2945 (progn | |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
2946 (cond |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
2947 ((and (ediff-has-face-support-p) ediff-use-faces) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
2948 (ediff-highlight-diff n)) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
2949 ((eq ediff-highlighting-style 'ascii) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
2950 (ediff-place-flags-in-buffer |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
2951 'A ediff-buffer-A ediff-control-buffer n) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
2952 (ediff-place-flags-in-buffer |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
2953 'B ediff-buffer-B ediff-control-buffer n) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
2954 (if ediff-3way-job |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
2955 (ediff-place-flags-in-buffer |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
2956 'C ediff-buffer-C ediff-control-buffer n)) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
2957 (if (ediff-buffer-live-p ediff-ancestor-buffer) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
2958 (ediff-place-flags-in-buffer |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
2959 'Ancestor ediff-ancestor-buffer |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
2960 ediff-control-buffer n)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2961 )) |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2962 |
11042 | 2963 (ediff-install-fine-diff-if-necessary n) |
52828
d08ef8842be1
2003-10-12 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
2964 ;; set current difference here so the hook will be able to refer to it |
d08ef8842be1
2003-10-12 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
2965 (setq ediff-current-difference n) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2966 (run-hooks 'ediff-select-hook)))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2967 |
11042 | 2968 |
2969 ;; Unselect a difference by removing the ASCII flags in the buffers. | |
2970 ;; This may have to be modified for buffer C, when it will be supported. | |
2971 (defun ediff-unselect-difference (n) | |
2972 (if (ediff-valid-difference-p n) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2973 (progn |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2974 (cond ((and (ediff-has-face-support-p) ediff-use-faces) |
11042 | 2975 (ediff-unhighlight-diff)) |
2976 ((eq ediff-highlighting-style 'ascii) | |
2977 (ediff-remove-flags-from-buffer | |
2978 ediff-buffer-A | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2979 (ediff-get-diff-overlay n 'A)) |
11042 | 2980 (ediff-remove-flags-from-buffer |
2981 ediff-buffer-B | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2982 (ediff-get-diff-overlay n 'B)) |
11042 | 2983 (if ediff-3way-job |
2984 (ediff-remove-flags-from-buffer | |
2985 ediff-buffer-C | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2986 (ediff-get-diff-overlay n 'C))) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2987 (if (ediff-buffer-live-p ediff-ancestor-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2988 (ediff-remove-flags-from-buffer |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2989 ediff-ancestor-buffer |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2990 (ediff-get-diff-overlay n 'Ancestor))) |
11042 | 2991 )) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2992 |
11042 | 2993 ;; unhighlight fine diffs |
2994 (ediff-set-fine-diff-properties ediff-current-difference 'default) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2995 (run-hooks 'ediff-unselect-hook)))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2996 |
11042 | 2997 |
2998 ;; Unselects prev diff and selects a new one, if FLAG has value other than | |
2999 ;; 'select-only or 'unselect-only. If FLAG is 'select-only, the | |
3000 ;; next difference is selected, but the current selection is not | |
3001 ;; unselected. If FLAG is 'unselect-only then the current selection is | |
3002 ;; unselected, but the next one is not selected. If NO-RECENTER is non-nil, | |
3003 ;; don't recenter buffers after selecting/unselecting. | |
3004 (defun ediff-unselect-and-select-difference (n &optional flag no-recenter) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3005 (let ((ediff-current-difference n)) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3006 (or no-recenter |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3007 (ediff-recenter 'no-rehighlight))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3008 |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3009 (let ((control-buf ediff-control-buffer)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3010 (unwind-protect |
11042 | 3011 (progn |
3012 (or (eq flag 'select-only) | |
3013 (ediff-unselect-difference ediff-current-difference)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3014 |
11042 | 3015 (or (eq flag 'unselect-only) |
3016 (ediff-select-difference n)) | |
52828
d08ef8842be1
2003-10-12 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3017 ;; need to set current diff here even though it is also set in |
d08ef8842be1
2003-10-12 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3018 ;; ediff-select-difference because ediff-select-difference might not |
d08ef8842be1
2003-10-12 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
3019 ;; be called if unselect-only is specified |
11042 | 3020 (setq ediff-current-difference n) |
3021 ) ; end protected section | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3022 |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3023 (ediff-with-current-buffer control-buf (ediff-refresh-mode-lines))) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3024 )) |
11042 | 3025 |
3026 | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3027 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3028 (defun ediff-highlight-diff-in-one-buffer (n buf-type) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3029 (if (ediff-buffer-live-p (ediff-get-buffer buf-type)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3030 (let* ((buff (ediff-get-buffer buf-type)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3031 (last (ediff-with-current-buffer buff (point-max))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3032 (begin (ediff-get-diff-posn buf-type 'beg n)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3033 (end (ediff-get-diff-posn buf-type 'end n)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3034 (xtra (if (equal begin end) 1 0)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3035 (end-hilit (min last (+ end xtra))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3036 (current-diff-overlay |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3037 (symbol-value |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3038 (ediff-get-symbol-from-alist |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3039 buf-type ediff-current-diff-overlay-alist)))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3040 |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85890
diff
changeset
|
3041 (if (featurep 'xemacs) |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3042 (ediff-move-overlay current-diff-overlay begin end-hilit) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3043 (ediff-move-overlay current-diff-overlay begin end-hilit buff)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3044 (ediff-overlay-put current-diff-overlay 'priority |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3045 (ediff-highest-priority begin end-hilit buff)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3046 (ediff-overlay-put current-diff-overlay 'ediff-diff-num n) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3047 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3048 ;; unhighlight the background overlay for diff n so it won't |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3049 ;; interfere with the current diff overlay |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3050 (ediff-set-overlay-face (ediff-get-diff-overlay n buf-type) nil) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3051 ))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3052 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3053 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3054 (defun ediff-unhighlight-diff-in-one-buffer (buf-type) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3055 (if (ediff-buffer-live-p (ediff-get-buffer buf-type)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3056 (let ((current-diff-overlay |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3057 (symbol-value |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3058 (ediff-get-symbol-from-alist |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3059 buf-type ediff-current-diff-overlay-alist))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3060 (overlay |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3061 (ediff-get-diff-overlay ediff-current-difference buf-type)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3062 ) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3063 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3064 (ediff-move-overlay current-diff-overlay 1 1) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3065 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3066 ;; rehighlight the overlay in the background of the |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3067 ;; current difference region |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3068 (ediff-set-overlay-face |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3069 overlay |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3070 (if (and (ediff-has-face-support-p) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3071 ediff-use-faces ediff-highlight-all-diffs) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3072 (ediff-background-face buf-type ediff-current-difference))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3073 ))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3074 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3075 (defun ediff-unhighlight-diffs-totally-in-one-buffer (buf-type) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3076 (ediff-unselect-and-select-difference -1) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3077 (if (and (ediff-has-face-support-p) ediff-use-faces) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3078 (let* ((inhibit-quit t) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3079 (current-diff-overlay-var |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3080 (ediff-get-symbol-from-alist |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3081 buf-type ediff-current-diff-overlay-alist)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3082 (current-diff-overlay (symbol-value current-diff-overlay-var))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3083 (ediff-paint-background-regions 'unhighlight) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3084 (if (ediff-overlayp current-diff-overlay) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3085 (ediff-delete-overlay current-diff-overlay)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3086 (set current-diff-overlay-var nil) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3087 ))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3088 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3089 |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68651
diff
changeset
|
3090 (defun ediff-highlight-diff (n) |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3091 "Put face on diff N. Invoked for X displays only." |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3092 (ediff-highlight-diff-in-one-buffer n 'A) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3093 (ediff-highlight-diff-in-one-buffer n 'B) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3094 (ediff-highlight-diff-in-one-buffer n 'C) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3095 (ediff-highlight-diff-in-one-buffer n 'Ancestor) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3096 ) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3097 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3098 |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68651
diff
changeset
|
3099 (defun ediff-unhighlight-diff () |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3100 "Remove overlays from buffers A, B, and C." |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3101 (ediff-unhighlight-diff-in-one-buffer 'A) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3102 (ediff-unhighlight-diff-in-one-buffer 'B) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3103 (ediff-unhighlight-diff-in-one-buffer 'C) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3104 (ediff-unhighlight-diff-in-one-buffer 'Ancestor) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3105 ) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3106 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3107 ;; delete highlighting overlays, restore faces to their original form |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68651
diff
changeset
|
3108 (defun ediff-unhighlight-diffs-totally () |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3109 (ediff-unhighlight-diffs-totally-in-one-buffer 'A) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3110 (ediff-unhighlight-diffs-totally-in-one-buffer 'B) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3111 (ediff-unhighlight-diffs-totally-in-one-buffer 'C) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3112 (ediff-unhighlight-diffs-totally-in-one-buffer 'Ancestor) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3113 ) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3114 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3115 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3116 ;; This is adapted from a similar function in `emerge.el'. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3117 ;; PROMPT should not have a trailing ': ', so that it can be modified |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3118 ;; according to context. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3119 ;; If DEFAULT-FILE is set, it should be used as the default value. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3120 ;; If DEFAULT-DIR is non-nil, use it as the default directory. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3121 ;; Otherwise, use the value of Emacs' variable `default-directory.' |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3122 (defun ediff-read-file-name (prompt default-dir default-file &optional no-dirs) |
11042 | 3123 ;; hack default-dir if it is not set |
3124 (setq default-dir | |
3125 (file-name-as-directory | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3126 (ediff-abbreviate-file-name |
11042 | 3127 (expand-file-name (or default-dir |
3128 (and default-file | |
3129 (file-name-directory default-file)) | |
3130 default-directory))))) | |
3131 | |
3132 ;; strip the directory from default-file | |
3133 (if default-file | |
3134 (setq default-file (file-name-nondirectory default-file))) | |
3135 (if (string= default-file "") | |
3136 (setq default-file nil)) | |
3137 | |
3138 (let (f) | |
3139 (setq f (expand-file-name | |
3140 (read-file-name | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3141 (format "%s%s " |
11042 | 3142 prompt |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3143 (cond (default-file |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3144 (concat " (default " default-file "):")) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3145 (t (concat " (default " default-dir "):")))) |
11042 | 3146 default-dir |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3147 (or default-file default-dir) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3148 t ; must match, no-confirm |
11042 | 3149 (if default-file (file-name-directory default-file)) |
3150 ) | |
3151 default-dir | |
3152 )) | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3153 ;; If user entered a directory name, expand the default file in that |
11042 | 3154 ;; directory. This allows the user to enter a directory name for the |
3155 ;; B-file and diff against the default-file in that directory instead | |
3156 ;; of a DIRED listing! | |
3157 (if (and (file-directory-p f) default-file) | |
3158 (setq f (expand-file-name | |
3159 (file-name-nondirectory default-file) f))) | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3160 (if (and no-dirs (file-directory-p f)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3161 (error "File %s is a directory" f)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3162 f)) |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3163 |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3164 ;; If PREFIX is given, then it is used as a prefix for the temp file |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3165 ;; name. Otherwise, `ediff' is used. If FILE is given, use this |
11042 | 3166 ;; file and don't create a new one. |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3167 ;; In MS-DOS, make sure the prefix isn't too long, or else |
23674
4b1d22478c9f
(ediff-make-temp-file): Run the prefix through
Eli Zaretskii <eliz@gnu.org>
parents:
23381
diff
changeset
|
3168 ;; `make-temp-name' isn't guaranteed to return a unique filename. |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3169 ;; Also, save buffer from START to END in the file. |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3170 ;; START defaults to (point-min), END to (point-max) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3171 (defun ediff-make-temp-file (buff &optional prefix given-file start end) |
23674
4b1d22478c9f
(ediff-make-temp-file): Run the prefix through
Eli Zaretskii <eliz@gnu.org>
parents:
23381
diff
changeset
|
3172 (let* ((p (ediff-convert-standard-filename (or prefix "ediff"))) |
4b1d22478c9f
(ediff-make-temp-file): Run the prefix through
Eli Zaretskii <eliz@gnu.org>
parents:
23381
diff
changeset
|
3173 (short-p p) |
82467
ff85cbd27ee2
2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82140
diff
changeset
|
3174 (coding-system-for-write |
ff85cbd27ee2
2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82140
diff
changeset
|
3175 (ediff-with-current-buffer buff |
ff85cbd27ee2
2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82140
diff
changeset
|
3176 (if (boundp 'buffer-file-coding-system) |
ff85cbd27ee2
2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82140
diff
changeset
|
3177 buffer-file-coding-system |
ff85cbd27ee2
2007-08-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
82140
diff
changeset
|
3178 ediff-coding-system-for-write))) |
23674
4b1d22478c9f
(ediff-make-temp-file): Run the prefix through
Eli Zaretskii <eliz@gnu.org>
parents:
23381
diff
changeset
|
3179 f short-f) |
4b1d22478c9f
(ediff-make-temp-file): Run the prefix through
Eli Zaretskii <eliz@gnu.org>
parents:
23381
diff
changeset
|
3180 (if (and (fboundp 'msdos-long-file-names) |
4b1d22478c9f
(ediff-make-temp-file): Run the prefix through
Eli Zaretskii <eliz@gnu.org>
parents:
23381
diff
changeset
|
3181 (not (msdos-long-file-names)) |
4b1d22478c9f
(ediff-make-temp-file): Run the prefix through
Eli Zaretskii <eliz@gnu.org>
parents:
23381
diff
changeset
|
3182 (> (length p) 2)) |
4b1d22478c9f
(ediff-make-temp-file): Run the prefix through
Eli Zaretskii <eliz@gnu.org>
parents:
23381
diff
changeset
|
3183 (setq short-p (substring p 0 2))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3184 |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3185 (setq f (concat ediff-temp-file-prefix p) |
23674
4b1d22478c9f
(ediff-make-temp-file): Run the prefix through
Eli Zaretskii <eliz@gnu.org>
parents:
23381
diff
changeset
|
3186 short-f (concat ediff-temp-file-prefix short-p) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3187 f (cond (given-file) |
66894
0b958d61a229
2005-11-15 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
66687
diff
changeset
|
3188 ((find-file-name-handler f 'insert-file-contents) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3189 ;; to thwart file handlers in write-region, e.g., if file |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3190 ;; name ends with .Z or .gz |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3191 ;; This is needed so that patches produced by ediff will |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3192 ;; have more meaningful names |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3193 (ediff-make-empty-tmp-file short-f)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3194 (prefix |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3195 ;; Prefix is most often the same as the file name for the |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3196 ;; variant. Here we are trying to use the original file |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3197 ;; name but in the temp directory. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3198 (ediff-make-empty-tmp-file f 'keep-name)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3199 (t |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3200 ;; If don't care about name, add some random stuff |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3201 ;; to proposed file name. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3202 (ediff-make-empty-tmp-file short-f)))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3203 |
11042 | 3204 ;; create the file |
19047 | 3205 (ediff-with-current-buffer buff |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3206 (write-region (if start start (point-min)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3207 (if end end (point-max)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3208 f |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3209 nil ; don't append---erase |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3210 'no-message) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3211 (set-file-modes f ediff-temp-file-mode) |
23674
4b1d22478c9f
(ediff-make-temp-file): Run the prefix through
Eli Zaretskii <eliz@gnu.org>
parents:
23381
diff
changeset
|
3212 (expand-file-name f)))) |
11042 | 3213 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3214 ;; Create a temporary file. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3215 ;; The returned file name (created by appending some random characters at the |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3216 ;; end of PROPOSED-NAME is guaranteed to point to a newly created empty file. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3217 ;; This is a replacement for make-temp-name, which eliminates a security hole. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3218 ;; If KEEP-PROPOSED-NAME isn't nil, try to keep PROPOSED-NAME, unless such file |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3219 ;; already exists. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3220 ;; It is a modified version of make-temp-file in emacs 20.5 |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3221 (defun ediff-make-empty-tmp-file (proposed-name &optional keep-proposed-name) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3222 (let ((file proposed-name)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3223 (while (condition-case () |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3224 (progn |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3225 (if (or (file-exists-p file) (not keep-proposed-name)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3226 (setq file (make-temp-name proposed-name))) |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3227 ;; the with-temp-buffer thing is a workaround for an XEmacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3228 ;; bug: write-region complains that we are trying to visit a |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3229 ;; file in an indirect buffer, failing to notice that the |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3230 ;; VISIT flag is unset and that we are actually writing from a |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3231 ;; string and not from any buffer. |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3232 (with-temp-buffer |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3233 (write-region "" nil file nil 'silent nil 'excl)) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3234 nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3235 (file-already-exists t)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3236 ;; the file was somehow created by someone else between |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3237 ;; `make-temp-name' and `write-region', let's try again. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3238 nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3239 file)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3240 |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3241 |
11042 | 3242 ;; Quote metacharacters (using \) when executing diff in Unix, but not in |
3243 ;; EMX OS/2 | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3244 ;;(defun ediff-protect-metachars (str) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3245 ;; (or (memq system-type '(emx vax-vms axp-vms)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3246 ;; (let ((limit 0)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3247 ;; (while (string-match ediff-metachars str limit) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3248 ;; (setq str (concat (substring str 0 (match-beginning 0)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3249 ;; "\\" |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3250 ;; (substring str (match-beginning 0)))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3251 ;; (setq limit (1+ (match-end 0)))))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3252 ;; str) |
11042 | 3253 |
3254 ;; Make sure the current buffer (for a file) has the same contents as the | |
3255 ;; file on disk, and attempt to remedy the situation if not. | |
3256 ;; Signal an error if we can't make them the same, or the user doesn't want | |
3257 ;; to do what is necessary to make them the same. | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3258 ;; Also, Ediff always offers to revert obsolete buffers, whether they |
11042 | 3259 ;; are modified or not. |
3260 (defun ediff-verify-file-buffer (&optional file-magic) | |
3261 ;; First check if the file has been modified since the buffer visited it. | |
3262 (if (verify-visited-file-modtime (current-buffer)) | |
3263 (if (buffer-modified-p) | |
3264 ;; If buffer is not obsolete and is modified, offer to save | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3265 (if (yes-or-no-p |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3266 (format "Buffer %s has been modified. Save it in file %s? " |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3267 (buffer-name) |
11042 | 3268 buffer-file-name)) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3269 (condition-case nil |
11042 | 3270 (save-buffer) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3271 (error |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3272 (beep) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3273 (message "Couldn't save %s" buffer-file-name))) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3274 (error "Buffer is out of sync for file %s" buffer-file-name)) |
11042 | 3275 ;; If buffer is not obsolete and is not modified, do nothing |
3276 nil) | |
3277 ;; If buffer is obsolete, offer to revert | |
3278 (if (yes-or-no-p | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3279 (format "File %s was modified since visited by buffer %s. REVERT file %s? " |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3280 buffer-file-name |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3281 (buffer-name) |
11042 | 3282 buffer-file-name)) |
3283 (progn | |
3284 (if file-magic | |
3285 (erase-buffer)) | |
3286 (revert-buffer t t)) | |
3287 (error "Buffer out of sync for file %s" buffer-file-name)))) | |
3288 | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3289 ;; if there is another buffer visiting the file of the merge buffer, offer to |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3290 ;; save and delete the buffer; else bark |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3291 (defun ediff-verify-file-merge-buffer (file) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3292 (let ((buff (if (stringp file) (find-buffer-visiting file))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3293 warn-message) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3294 (or (null buff) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3295 (progn |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3296 (setq warn-message |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3297 (format "Buffer %s is visiting %s. Save and kill the buffer? " |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3298 (buffer-name buff) file)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3299 (with-output-to-temp-buffer ediff-msg-buffer |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3300 (princ "\n\n") |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3301 (princ warn-message) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3302 (princ "\n\n")) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3303 (if (y-or-n-p |
65582
4d1085b02d64
Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents:
64762
diff
changeset
|
3304 (message "%s" warn-message)) |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3305 (with-current-buffer buff |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3306 (save-buffer) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3307 (kill-buffer (current-buffer))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3308 (error "Too dangerous to merge versions of a file visited by another buffer")))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3309 )) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3310 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3311 |
11042 | 3312 |
19774 | 3313 (defun ediff-filename-magic-p (file) |
3314 (or (ediff-file-compressed-p file) | |
3315 (ediff-file-remote-p file))) | |
3316 | |
3317 | |
11042 | 3318 (defun ediff-save-buffer (arg) |
3319 "Safe way of saving buffers A, B, C, and the diff output. | |
3320 `wa' saves buffer A, `wb' saves buffer B, `wc' saves buffer C, | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3321 and `wd' saves the diff output. |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3322 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3323 With prefix argument, `wd' saves plain diff output. |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3324 Without an argument, it saves customized diff argument, if available |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3325 \(and plain output, if customized output was not generated\)." |
11042 | 3326 (interactive "P") |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3327 (ediff-barf-if-not-control-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3328 (ediff-compute-custom-diffs-maybe) |
19047 | 3329 (ediff-with-current-buffer |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3330 (cond ((memq last-command-char '(?a ?b ?c)) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3331 (ediff-get-buffer |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3332 (ediff-char-to-buftype last-command-char))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3333 ((eq last-command-char ?d) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3334 (message "Saving diff output ...") |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3335 (sit-for 1) ; let the user see the message |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3336 (cond ((and arg (ediff-buffer-live-p ediff-diff-buffer)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3337 ediff-diff-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3338 ((ediff-buffer-live-p ediff-custom-diff-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3339 ediff-custom-diff-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3340 ((ediff-buffer-live-p ediff-diff-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3341 ediff-diff-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3342 (t (error "Output from `diff' not found")))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3343 ) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3344 (save-buffer))) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3345 |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3346 |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3347 ;; idea suggested by Hannu Koivisto <azure@iki.fi> |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3348 (defun ediff-clone-buffer-for-region-comparison (buff region-name) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3349 (let ((cloned-buff (ediff-make-cloned-buffer buff region-name)) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3350 (pop-up-windows t) |
44615
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
3351 wind |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3352 other-wind |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3353 msg-buf) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3354 (ediff-with-current-buffer cloned-buff |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3355 (setq ediff-temp-indirect-buffer t)) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3356 (pop-to-buffer cloned-buff) |
44615
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
3357 (setq wind (ediff-get-visible-buffer-window cloned-buff)) |
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
3358 (select-window wind) |
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
3359 (delete-other-windows) |
75389
11ae87f329da
2007-01-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
75347
diff
changeset
|
3360 (ediff-activate-mark) |
44615
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
3361 (split-window-vertically) |
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
3362 (ediff-select-lowest-window) |
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
3363 (setq other-wind (selected-window)) |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3364 (with-temp-buffer |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3365 (erase-buffer) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3366 (insert |
75389
11ae87f329da
2007-01-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
75347
diff
changeset
|
3367 (format "\n ******* Mark a region in buffer %s (or confirm the existing one) *******\n" |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3368 (buffer-name cloned-buff))) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3369 (insert |
44615
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
3370 (ediff-with-current-buffer buff |
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
3371 (format "\n\t When done, type %s Use %s to abort\n " |
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
3372 (ediff-format-bindings-of 'exit-recursive-edit) |
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
3373 (ediff-format-bindings-of 'abort-recursive-edit)))) |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3374 (goto-char (point-min)) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3375 (setq msg-buf (current-buffer)) |
44615
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
3376 (set-window-buffer other-wind msg-buf) |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3377 (shrink-window-if-larger-than-buffer) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3378 (if (window-live-p wind) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3379 (select-window wind)) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3380 (condition-case nil |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3381 (recursive-edit) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3382 (quit |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3383 (ediff-kill-buffer-carefully cloned-buff))) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3384 ) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3385 cloned-buff)) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3386 |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3387 |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3388 (defun ediff-clone-buffer-for-window-comparison (buff wind region-name) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3389 (let ((cloned-buff (ediff-make-cloned-buffer buff region-name))) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3390 (ediff-with-current-buffer cloned-buff |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3391 (setq ediff-temp-indirect-buffer t)) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3392 (set-window-buffer wind cloned-buff) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3393 cloned-buff)) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3394 |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3395 (defun ediff-clone-buffer-for-current-diff-comparison (buff buf-type reg-name) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3396 (let ((cloned-buff (ediff-make-cloned-buffer buff reg-name)) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3397 (reg-start (ediff-get-diff-posn buf-type 'beg)) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3398 (reg-end (ediff-get-diff-posn buf-type 'end))) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3399 (ediff-with-current-buffer cloned-buff |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3400 ;; set region to be the current diff region |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3401 (goto-char reg-start) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3402 (set-mark reg-end) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3403 (setq ediff-temp-indirect-buffer t)) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3404 cloned-buff)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3405 |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3406 |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3407 |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3408 (defun ediff-make-cloned-buffer (buff region-name) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3409 (ediff-make-indirect-buffer |
44615
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
3410 buff (generate-new-buffer-name |
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
3411 (concat (if (stringp buff) buff (buffer-name buff)) region-name)) |
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
3412 )) |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3413 |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3414 |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3415 (defun ediff-make-indirect-buffer (base-buf indirect-buf-name) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3416 (ediff-cond-compile-for-xemacs-or-emacs |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3417 (make-indirect-buffer base-buf indirect-buf-name) ; xemacs |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3418 (make-indirect-buffer base-buf indirect-buf-name 'clone) ; emacs |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3419 )) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3420 |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3421 |
43714
1c34b0b56515
* ediff-init.el: comments.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43220
diff
changeset
|
3422 ;; This function operates only from an ediff control buffer |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3423 (defun ediff-compute-custom-diffs-maybe () |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3424 (let ((buf-A-file-name (buffer-file-name ediff-buffer-A)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3425 (buf-B-file-name (buffer-file-name ediff-buffer-B)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3426 file-A file-B) |
54090
e83349d94786
* ediff-util.el (ediff-compute-custom-diffs-maybe): Avoid creating
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
53865
diff
changeset
|
3427 (unless (and buf-A-file-name (file-exists-p buf-A-file-name)) |
e83349d94786
* ediff-util.el (ediff-compute-custom-diffs-maybe): Avoid creating
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
53865
diff
changeset
|
3428 (setq file-A |
e83349d94786
* ediff-util.el (ediff-compute-custom-diffs-maybe): Avoid creating
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
53865
diff
changeset
|
3429 (ediff-make-temp-file ediff-buffer-A))) |
e83349d94786
* ediff-util.el (ediff-compute-custom-diffs-maybe): Avoid creating
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
53865
diff
changeset
|
3430 (unless (and buf-B-file-name (file-exists-p buf-B-file-name)) |
e83349d94786
* ediff-util.el (ediff-compute-custom-diffs-maybe): Avoid creating
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
53865
diff
changeset
|
3431 (setq file-B |
e83349d94786
* ediff-util.el (ediff-compute-custom-diffs-maybe): Avoid creating
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
53865
diff
changeset
|
3432 (ediff-make-temp-file ediff-buffer-B))) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3433 (or (ediff-buffer-live-p ediff-custom-diff-buffer) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3434 (setq ediff-custom-diff-buffer |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3435 (get-buffer-create |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3436 (ediff-unique-buffer-name "*ediff-custom-diff" "*")))) |
43714
1c34b0b56515
* ediff-init.el: comments.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43220
diff
changeset
|
3437 (ediff-with-current-buffer ediff-custom-diff-buffer |
54090
e83349d94786
* ediff-util.el (ediff-compute-custom-diffs-maybe): Avoid creating
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
53865
diff
changeset
|
3438 (setq buffer-read-only nil) |
e83349d94786
* ediff-util.el (ediff-compute-custom-diffs-maybe): Avoid creating
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
53865
diff
changeset
|
3439 (erase-buffer)) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3440 (ediff-exec-process |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3441 ediff-custom-diff-program ediff-custom-diff-buffer 'synchronize |
54090
e83349d94786
* ediff-util.el (ediff-compute-custom-diffs-maybe): Avoid creating
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
53865
diff
changeset
|
3442 ediff-custom-diff-options |
e83349d94786
* ediff-util.el (ediff-compute-custom-diffs-maybe): Avoid creating
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
53865
diff
changeset
|
3443 ;; repetition of buf-A-file-name is needed so it'll return a file |
e83349d94786
* ediff-util.el (ediff-compute-custom-diffs-maybe): Avoid creating
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
53865
diff
changeset
|
3444 (or (and buf-A-file-name (file-exists-p buf-A-file-name) buf-A-file-name) |
e83349d94786
* ediff-util.el (ediff-compute-custom-diffs-maybe): Avoid creating
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
53865
diff
changeset
|
3445 file-A) |
e83349d94786
* ediff-util.el (ediff-compute-custom-diffs-maybe): Avoid creating
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
53865
diff
changeset
|
3446 (or (and buf-B-file-name (file-exists-p buf-B-file-name) buf-B-file-name) |
e83349d94786
* ediff-util.el (ediff-compute-custom-diffs-maybe): Avoid creating
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
53865
diff
changeset
|
3447 file-B)) |
36043
5d6b76d28b83
2001-02-12 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
35411
diff
changeset
|
3448 ;; put the diff file in diff-mode, if it is available |
5d6b76d28b83
2001-02-12 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
35411
diff
changeset
|
3449 (if (fboundp 'diff-mode) |
5d6b76d28b83
2001-02-12 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
35411
diff
changeset
|
3450 (with-current-buffer ediff-custom-diff-buffer |
5d6b76d28b83
2001-02-12 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
35411
diff
changeset
|
3451 (diff-mode))) |
54090
e83349d94786
* ediff-util.el (ediff-compute-custom-diffs-maybe): Avoid creating
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
53865
diff
changeset
|
3452 (and file-A (file-exists-p file-A) (delete-file file-A)) |
e83349d94786
* ediff-util.el (ediff-compute-custom-diffs-maybe): Avoid creating
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
53865
diff
changeset
|
3453 (and file-B (file-exists-p file-B) (delete-file file-B)) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3454 )) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3455 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3456 (defun ediff-show-diff-output (arg) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3457 (interactive "P") |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3458 (ediff-barf-if-not-control-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3459 (ediff-compute-custom-diffs-maybe) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3460 (save-excursion |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3461 (ediff-skip-unsuitable-frames ' ok-unsplittable)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3462 (let ((buf (cond ((and arg (ediff-buffer-live-p ediff-diff-buffer)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3463 ediff-diff-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3464 ((ediff-buffer-live-p ediff-custom-diff-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3465 ediff-custom-diff-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3466 ((ediff-buffer-live-p ediff-diff-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3467 ediff-diff-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3468 (t |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3469 (beep) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3470 (message "Output from `diff' not found") |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3471 nil)))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3472 (if buf |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3473 (progn |
19047 | 3474 (ediff-with-current-buffer buf |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3475 (goto-char (point-min))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3476 (switch-to-buffer buf) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3477 (raise-frame (selected-frame))))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3478 (if (frame-live-p ediff-control-frame) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3479 (ediff-reset-mouse ediff-control-frame)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3480 (if (window-live-p ediff-control-window) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3481 (select-window ediff-control-window))) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3482 |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3483 |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3484 (defun ediff-inferior-compare-regions () |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3485 "Compare regions in an active Ediff session. |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3486 Like ediff-regions-linewise but is called from under an active Ediff session on |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3487 the files that belong to that session. |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3488 |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3489 After quitting the session invoked via this function, type C-l to the parent |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3490 Ediff Control Panel to restore highlighting." |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3491 (interactive) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3492 (let ((answer "") |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3493 (possibilities (list ?A ?B ?C)) |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
3494 (zmacs-regions t) |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3495 use-current-diff-p |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3496 begA begB endA endB bufA bufB) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3497 |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3498 (if (ediff-valid-difference-p ediff-current-difference) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3499 (progn |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3500 (ediff-set-fine-diff-properties ediff-current-difference 'default) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3501 (ediff-unhighlight-diff))) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3502 (ediff-paint-background-regions 'unhighlight) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3503 |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3504 (cond ((ediff-merge-job) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3505 (setq bufB ediff-buffer-C) |
43714
1c34b0b56515
* ediff-init.el: comments.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43220
diff
changeset
|
3506 ;; ask which buffer to compare to the merge buffer |
18054 | 3507 (while (cond ((eq answer ?A) |
3508 (setq bufA ediff-buffer-A | |
3509 possibilities '(?B)) | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3510 nil) |
18054 | 3511 ((eq answer ?B) |
3512 (setq bufA ediff-buffer-B | |
3513 possibilities '(?A)) | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3514 nil) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3515 ((equal answer "")) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3516 (t (beep 1) |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
3517 (message "Valid values are A or B") |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3518 (sit-for 2) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3519 t)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3520 (let ((cursor-in-echo-area t)) |
43714
1c34b0b56515
* ediff-init.el: comments.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43220
diff
changeset
|
3521 (message |
1c34b0b56515
* ediff-init.el: comments.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43220
diff
changeset
|
3522 "Which buffer to compare to the merge buffer (A or B)? ") |
18054 | 3523 (setq answer (capitalize (read-char-exclusive)))))) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3524 |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3525 ((ediff-3way-comparison-job) |
43714
1c34b0b56515
* ediff-init.el: comments.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43220
diff
changeset
|
3526 ;; ask which two buffers to compare |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3527 (while (cond ((memq answer possibilities) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3528 (setq possibilities (delq answer possibilities)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3529 (setq bufA |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3530 (eval |
19047 | 3531 (ediff-get-symbol-from-alist |
3532 answer ediff-buffer-alist))) | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3533 nil) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3534 ((equal answer "")) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3535 (t (beep 1) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3536 (message |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
3537 "Valid values are %s" |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3538 (mapconcat 'char-to-string possibilities " or ")) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3539 (sit-for 2) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3540 t)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3541 (let ((cursor-in-echo-area t)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3542 (message "Enter the 1st buffer you want to compare (%s): " |
43714
1c34b0b56515
* ediff-init.el: comments.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43220
diff
changeset
|
3543 (mapconcat 'char-to-string possibilities " or ")) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3544 (setq answer (capitalize (read-char-exclusive))))) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3545 (setq answer "") ; silence error msg |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3546 (while (cond ((memq answer possibilities) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3547 (setq possibilities (delq answer possibilities)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3548 (setq bufB |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3549 (eval |
19047 | 3550 (ediff-get-symbol-from-alist |
3551 answer ediff-buffer-alist))) | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3552 nil) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3553 ((equal answer "")) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3554 (t (beep 1) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3555 (message |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
3556 "Valid values are %s" |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3557 (mapconcat 'char-to-string possibilities " or ")) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3558 (sit-for 2) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3559 t)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3560 (let ((cursor-in-echo-area t)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3561 (message "Enter the 2nd buffer you want to compare (%s): " |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3562 (mapconcat 'char-to-string possibilities "/")) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3563 (setq answer (capitalize (read-char-exclusive)))))) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3564 (t ; 2way comparison |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3565 (setq bufA ediff-buffer-A |
18054 | 3566 bufB ediff-buffer-B |
3567 possibilities nil))) | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3568 |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3569 (if (and (ediff-valid-difference-p ediff-current-difference) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3570 (y-or-n-p "Compare currently highlighted difference regions? ")) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3571 (setq use-current-diff-p t)) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3572 |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3573 (setq bufA (if use-current-diff-p |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3574 (ediff-clone-buffer-for-current-diff-comparison |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3575 bufA 'A "-Region.A-") |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3576 (ediff-clone-buffer-for-region-comparison bufA "-Region.A-"))) |
19047 | 3577 (ediff-with-current-buffer bufA |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3578 (setq begA (region-beginning) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3579 endA (region-end)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3580 (goto-char begA) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3581 (beginning-of-line) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3582 (setq begA (point)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3583 (goto-char endA) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3584 (end-of-line) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3585 (or (eobp) (forward-char)) ; include the newline char |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3586 (setq endA (point))) |
43714
1c34b0b56515
* ediff-init.el: comments.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43220
diff
changeset
|
3587 |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3588 (setq bufB (if use-current-diff-p |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3589 (ediff-clone-buffer-for-current-diff-comparison |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3590 bufB 'B "-Region.B-") |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3591 (ediff-clone-buffer-for-region-comparison bufB "-Region.B-"))) |
19047 | 3592 (ediff-with-current-buffer bufB |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3593 (setq begB (region-beginning) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3594 endB (region-end)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3595 (goto-char begB) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3596 (beginning-of-line) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3597 (setq begB (point)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3598 (goto-char endB) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3599 (end-of-line) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3600 (or (eobp) (forward-char)) ; include the newline char |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3601 (setq endB (point))) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3602 |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3603 |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3604 (ediff-regions-internal |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3605 bufA begA endA bufB begB endB |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3606 nil ; setup-hook |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3607 (if use-current-diff-p ; job name |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3608 'ediff-regions-wordwise |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3609 'ediff-regions-linewise) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3610 (if use-current-diff-p ; word mode, if diffing current diff |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3611 t nil) |
18054 | 3612 ;; setup param to pass to ediff-setup |
3613 (list (cons 'ediff-split-window-function ediff-split-window-function))) | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3614 )) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3615 |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3616 |
11042 | 3617 |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3618 (defun ediff-remove-flags-from-buffer (buffer overlay) |
19047 | 3619 (ediff-with-current-buffer buffer |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3620 (let ((inhibit-read-only t)) |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85890
diff
changeset
|
3621 (if (featurep 'xemacs) |
11042 | 3622 (ediff-overlay-put overlay 'begin-glyph nil) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3623 (ediff-overlay-put overlay 'before-string nil)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3624 |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85890
diff
changeset
|
3625 (if (featurep 'xemacs) |
11042 | 3626 (ediff-overlay-put overlay 'end-glyph nil) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3627 (ediff-overlay-put overlay 'after-string nil)) |
11042 | 3628 ))) |
3629 | |
3630 | |
3631 | |
3632 (defun ediff-place-flags-in-buffer (buf-type buffer ctl-buffer diff) | |
19047 | 3633 (ediff-with-current-buffer buffer |
11042 | 3634 (ediff-place-flags-in-buffer1 buf-type ctl-buffer diff))) |
3635 | |
3636 | |
3637 (defun ediff-place-flags-in-buffer1 (buf-type ctl-buffer diff-no) | |
19047 | 3638 (let* ((curr-overl (ediff-with-current-buffer ctl-buffer |
11042 | 3639 (ediff-get-diff-overlay diff-no buf-type))) |
3640 (before (ediff-get-diff-posn buf-type 'beg diff-no ctl-buffer)) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3641 after beg-of-line flag) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3642 |
11042 | 3643 ;; insert flag before the difference |
3644 (goto-char before) | |
3645 (setq beg-of-line (bolp)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3646 |
19047 | 3647 (setq flag (ediff-with-current-buffer ctl-buffer |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3648 (if (eq ediff-highlighting-style 'ascii) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3649 (if beg-of-line |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3650 ediff-before-flag-bol ediff-before-flag-mol)))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3651 |
11042 | 3652 ;; insert the flag itself |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85890
diff
changeset
|
3653 (if (featurep 'xemacs) |
11042 | 3654 (ediff-overlay-put curr-overl 'begin-glyph flag) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3655 (ediff-overlay-put curr-overl 'before-string flag)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3656 |
11042 | 3657 ;; insert the flag after the difference |
3658 ;; `after' must be set here, after the before-flag was inserted | |
3659 (setq after (ediff-get-diff-posn buf-type 'end diff-no ctl-buffer)) | |
3660 (goto-char after) | |
3661 (setq beg-of-line (bolp)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3662 |
19047 | 3663 (setq flag (ediff-with-current-buffer ctl-buffer |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3664 (if (eq ediff-highlighting-style 'ascii) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3665 (if beg-of-line |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3666 ediff-after-flag-eol ediff-after-flag-mol)))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3667 |
11042 | 3668 ;; insert the flag itself |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85890
diff
changeset
|
3669 (if (featurep 'xemacs) |
11042 | 3670 (ediff-overlay-put curr-overl 'end-glyph flag) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3671 (ediff-overlay-put curr-overl 'after-string flag)) |
11042 | 3672 )) |
3673 | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3674 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3675 ;;; Some diff region tests |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3676 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3677 ;; t if diff region is empty. |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3678 ;; In case of buffer C, t also if it is not a 3way |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3679 ;; comparison job (merging jobs return t as well). |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3680 (defun ediff-empty-diff-region-p (n buf-type) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3681 (if (eq buf-type 'C) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3682 (or (not ediff-3way-comparison-job) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3683 (= (ediff-get-diff-posn 'C 'beg n) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3684 (ediff-get-diff-posn 'C 'end n))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3685 (= (ediff-get-diff-posn buf-type 'beg n) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3686 (ediff-get-diff-posn buf-type 'end n)))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3687 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3688 ;; Test if diff region is white space only. |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3689 ;; If 2-way job and buf-type = C, then returns t. |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3690 (defun ediff-whitespace-diff-region-p (n buf-type) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3691 (or (and (eq buf-type 'C) (not ediff-3way-job)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3692 (ediff-empty-diff-region-p n buf-type) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3693 (let ((beg (ediff-get-diff-posn buf-type 'beg n)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3694 (end (ediff-get-diff-posn buf-type 'end n))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3695 (ediff-with-current-buffer (ediff-get-buffer buf-type) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3696 (save-excursion |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3697 (goto-char beg) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3698 (skip-chars-forward ediff-whitespace) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3699 (>= (point) end)))))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3700 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3701 |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68651
diff
changeset
|
3702 (defun ediff-get-region-contents (n buf-type ctrl-buf &optional start end) |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3703 (ediff-with-current-buffer |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3704 (ediff-with-current-buffer ctrl-buf (ediff-get-buffer buf-type)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3705 (buffer-substring |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3706 (or start (ediff-get-diff-posn buf-type 'beg n ctrl-buf)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3707 (or end (ediff-get-diff-posn buf-type 'end n ctrl-buf))))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3708 |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3709 ;; Returns positions of difference sectors in the BUF-TYPE buffer. |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3710 ;; BUF-TYPE should be a symbol -- `A', `B', or `C'. |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3711 ;; POS is either `beg' or `end'--it specifies whether you want the position at |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3712 ;; the beginning of a difference or at the end. |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3713 ;; |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3714 ;; The optional argument N says which difference (default: |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3715 ;; `ediff-current-difference'). N is the internal difference number (1- what |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3716 ;; the user sees). The optional argument CONTROL-BUF says |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3717 ;; which control buffer is in effect in case it is not the current |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3718 ;; buffer. |
11042 | 3719 (defun ediff-get-diff-posn (buf-type pos &optional n control-buf) |
3720 (let (diff-overlay) | |
3721 (or control-buf | |
3722 (setq control-buf (current-buffer))) | |
3723 | |
19047 | 3724 (ediff-with-current-buffer control-buf |
11042 | 3725 (or n (setq n ediff-current-difference)) |
3726 (if (or (< n 0) (>= n ediff-number-of-differences)) | |
3727 (if (> ediff-number-of-differences 0) | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3728 (error ediff-BAD-DIFF-NUMBER |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3729 this-command (1+ n) ediff-number-of-differences) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3730 (error ediff-NO-DIFFERENCES))) |
11042 | 3731 (setq diff-overlay (ediff-get-diff-overlay n buf-type))) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3732 (if (not (ediff-buffer-live-p (ediff-overlay-buffer diff-overlay))) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3733 (error ediff-KILLED-VITAL-BUFFER)) |
11042 | 3734 (if (eq pos 'beg) |
3735 (ediff-overlay-start diff-overlay) | |
3736 (ediff-overlay-end diff-overlay)) | |
3737 )) | |
3738 | |
3739 | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3740 ;; Restore highlighting to what it should be according to ediff-use-faces, |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3741 ;; ediff-highlighting-style, and ediff-highlight-all-diffs variables. |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3742 (defun ediff-restore-highlighting (&optional ctl-buf) |
19047 | 3743 (ediff-with-current-buffer (or ctl-buf (current-buffer)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3744 (if (and (ediff-has-face-support-p) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3745 ediff-use-faces |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3746 ediff-highlight-all-diffs) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3747 (ediff-paint-background-regions)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3748 (ediff-select-difference ediff-current-difference))) |
11042 | 3749 |
3750 | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3751 |
11042 | 3752 ;; null out difference overlays so they won't slow down future |
3753 ;; editing operations | |
3754 ;; VEC is either a difference vector or a fine-diff vector | |
3755 (defun ediff-clear-diff-vector (vec-var &optional fine-diffs-also) | |
3756 (if (vectorp (symbol-value vec-var)) | |
84864
cac94194ce6d
(ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents:
82467
diff
changeset
|
3757 (mapc (lambda (elt) |
cac94194ce6d
(ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents:
82467
diff
changeset
|
3758 (ediff-delete-overlay |
cac94194ce6d
(ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents:
82467
diff
changeset
|
3759 (ediff-get-diff-overlay-from-diff-record elt)) |
cac94194ce6d
(ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents:
82467
diff
changeset
|
3760 (if fine-diffs-also |
cac94194ce6d
(ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents:
82467
diff
changeset
|
3761 (ediff-clear-fine-diff-vector elt)) |
cac94194ce6d
(ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents:
82467
diff
changeset
|
3762 ) |
cac94194ce6d
(ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
Juanma Barranquero <lekktu@gmail.com>
parents:
82467
diff
changeset
|
3763 (symbol-value vec-var))) |
11042 | 3764 ;; allow them to be garbage collected |
3765 (set vec-var nil)) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3766 |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3767 |
11042 | 3768 |
3769 ;;; Misc | |
3770 | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3771 ;; In Emacs, this just makes overlay. In the future, when Emacs will start |
11042 | 3772 ;; supporting sticky overlays, this function will make a sticky overlay. |
3773 ;; BEG and END are expressions telling where overlay starts. | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3774 ;; If they are numbers or buffers, then all is well. Otherwise, they must |
11042 | 3775 ;; be expressions to be evaluated in buffer BUF in order to get the overlay |
3776 ;; bounds. | |
3777 ;; If BUFF is not a live buffer, then return nil; otherwise, return the | |
3778 ;; newly created overlay. | |
3779 (defun ediff-make-bullet-proof-overlay (beg end buff) | |
3780 (if (ediff-buffer-live-p buff) | |
3781 (let (overl) | |
19047 | 3782 (ediff-with-current-buffer buff |
11042 | 3783 (or (number-or-marker-p beg) |
3784 (setq beg (eval beg))) | |
3785 (or (number-or-marker-p end) | |
3786 (setq end (eval end))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3787 (setq overl |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3788 (ediff-cond-compile-for-xemacs-or-emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3789 (make-extent beg end buff) ; xemacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3790 ;; advance front and rear of the overlay |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3791 (make-overlay beg end buff nil 'rear-advance) ; emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3792 )) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3793 |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3794 ;; never detach |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3795 (ediff-overlay-put |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85890
diff
changeset
|
3796 overl (if (featurep 'emacs) 'evaporate 'detachable) nil) |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
3797 ;; make overlay open-ended |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3798 ;; In emacs, it is made open ended at creation time |
85972
51aa47312c4b
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85890
diff
changeset
|
3799 (if (featurep 'xemacs) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3800 (progn |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3801 (ediff-overlay-put overl 'start-open nil) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3802 (ediff-overlay-put overl 'end-open nil))) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3803 (ediff-overlay-put overl 'ediff-diff-num 0) |
11042 | 3804 overl)))) |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3805 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3806 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3807 (defun ediff-make-current-diff-overlay (type) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3808 (if (ediff-has-face-support-p) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3809 (let ((overlay (ediff-get-symbol-from-alist |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3810 type ediff-current-diff-overlay-alist)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3811 (buffer (ediff-get-buffer type)) |
85890
d505125b0b46
2007-11-02 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
85847
diff
changeset
|
3812 (face (ediff-get-symbol-from-alist |
d505125b0b46
2007-11-02 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
85847
diff
changeset
|
3813 type ediff-current-diff-face-alist))) |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3814 (set overlay |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3815 (ediff-make-bullet-proof-overlay (point-max) (point-max) buffer)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3816 (ediff-set-overlay-face (symbol-value overlay) face) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3817 (ediff-overlay-put (symbol-value overlay) 'ediff ediff-control-buffer)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3818 )) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3819 |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3820 |
11042 | 3821 ;; Like other-buffer, but prefers visible buffers and ignores temporary or |
3822 ;; other insignificant buffers (those beginning with "^[ *]"). | |
3823 ;; Gets one arg--buffer name or a list of buffer names (it won't return | |
3824 ;; these buffers). | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3825 ;; EXCL-BUFF-LIST is an exclusion list. |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3826 (defun ediff-other-buffer (excl-buff-lst) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3827 (or (listp excl-buff-lst) (setq excl-buff-lst (list excl-buff-lst))) |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3828 (let* ((all-buffers (nconc (ediff-get-selected-buffers) (buffer-list))) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3829 ;; we compute this the second time because we need to do memq on it |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3830 ;; later, and nconc above will break it. Either this or use slow |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3831 ;; append instead of nconc |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3832 (selected-buffers (ediff-get-selected-buffers)) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3833 (prefered-buffer (car all-buffers)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3834 visible-dired-buffers |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3835 (excl-buff-name-list |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3836 (mapcar |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3837 (lambda (b) (cond ((stringp b) b) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3838 ((bufferp b) (buffer-name b)))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3839 excl-buff-lst)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3840 ;; if at least one buffer on the exclusion list is dired, then force |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3841 ;; all others to be dired. This is because this means that the user |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3842 ;; has already chosen a dired buffer before |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3843 (use-dired-major-mode |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3844 (cond ((null (ediff-buffer-live-p (car excl-buff-lst))) 'unknown) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3845 ((eq (ediff-with-current-buffer (car excl-buff-lst) major-mode) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3846 'dired-mode) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3847 'yes) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3848 (t 'no))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3849 ;; significant-buffers must be visible and not belong |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3850 ;; to the exclusion list `buff-list' |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3851 ;; We also exclude temporary buffers, but keep mail and gnus buffers |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3852 ;; Furthermore, we exclude dired buffers, unless they are the only |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3853 ;; ones visible (and there are at least two of them). |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3854 ;; Also, any visible window not on the exclusion list that is first in |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3855 ;; the buffer list is chosen regardless. (This is because the user |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3856 ;; clicked on it or did something to distinguish it). |
11042 | 3857 (significant-buffers |
3858 (mapcar | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3859 (lambda (x) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3860 (cond ((member (buffer-name x) excl-buff-name-list) nil) |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3861 ((memq x selected-buffers) x) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3862 ((not (ediff-get-visible-buffer-window x)) nil) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3863 ((eq x prefered-buffer) x) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3864 ;; if prev selected buffer is dired, look only at |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3865 ;; dired. |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3866 ((eq use-dired-major-mode 'yes) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3867 (if (eq (ediff-with-current-buffer x major-mode) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3868 'dired-mode) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3869 x nil)) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3870 ((eq (ediff-with-current-buffer x major-mode) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3871 'dired-mode) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3872 (if (null use-dired-major-mode) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3873 ;; don't know if we must enforce dired. |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3874 ;; Remember this buffer in case |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3875 ;; dired buffs are the only ones visible. |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3876 (setq visible-dired-buffers |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3877 (cons x visible-dired-buffers))) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3878 ;; skip, if dired is not forced |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3879 nil) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3880 ((memq (ediff-with-current-buffer x major-mode) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3881 '(rmail-mode |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3882 vm-mode |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3883 gnus-article-mode |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3884 mh-show-mode)) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3885 x) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3886 ((string-match "^[ *]" (buffer-name x)) nil) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3887 ((string= "*scratch*" (buffer-name x)) nil) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3888 (t x))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3889 all-buffers)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3890 (clean-significant-buffers (delq nil significant-buffers)) |
11042 | 3891 less-significant-buffers) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3892 |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3893 (if (and (null clean-significant-buffers) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3894 (> (length visible-dired-buffers) 0)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3895 (setq clean-significant-buffers visible-dired-buffers)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3896 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3897 (cond (clean-significant-buffers (car clean-significant-buffers)) |
11042 | 3898 ;; try also buffers that are not displayed in windows |
3899 ((setq less-significant-buffers | |
3900 (delq nil | |
3901 (mapcar | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3902 (lambda (x) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3903 (cond ((member (buffer-name x) excl-buff-name-list) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3904 nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3905 ((eq use-dired-major-mode 'yes) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3906 (if (eq (ediff-with-current-buffer |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3907 x major-mode) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3908 'dired-mode) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3909 x nil)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3910 ((eq (ediff-with-current-buffer x major-mode) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3911 'dired-mode) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3912 nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3913 ((string-match "^[ *]" (buffer-name x)) nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3914 ((string= "*scratch*" (buffer-name x)) nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3915 (t x))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3916 all-buffers))) |
11042 | 3917 (car less-significant-buffers)) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3918 (t "*scratch*")) |
11042 | 3919 )) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3920 |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3921 |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3922 ;; If current buffer is a Buffer-menu buffer, then take the selected buffers |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3923 ;; and append the buffer at the cursor to the end. |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3924 ;; This list would be the preferred list. |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3925 (defun ediff-get-selected-buffers () |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3926 (if (eq major-mode 'Buffer-menu-mode) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3927 (let ((lis (condition-case nil |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3928 (list (Buffer-menu-buffer t)) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3929 (error)) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3930 )) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3931 (save-excursion |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3932 (goto-char (point-max)) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3933 (while (search-backward "\n>" nil t) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3934 (forward-char 1) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3935 (setq lis (cons (Buffer-menu-buffer t) lis))) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3936 lis)) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3937 )) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3938 |
11042 | 3939 ;; Construct a unique buffer name. |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3940 ;; The first one tried is prefixsuffix, then prefix<2>suffix, |
11042 | 3941 ;; prefix<3>suffix, etc. |
3942 (defun ediff-unique-buffer-name (prefix suffix) | |
3943 (if (null (get-buffer (concat prefix suffix))) | |
3944 (concat prefix suffix) | |
3945 (let ((n 2)) | |
3946 (while (get-buffer (format "%s<%d>%s" prefix n suffix)) | |
3947 (setq n (1+ n))) | |
3948 (format "%s<%d>%s" prefix n suffix)))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3949 |
11042 | 3950 |
3951 (defun ediff-submit-report () | |
3952 "Submit bug report on Ediff." | |
3953 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3954 (ediff-barf-if-not-control-buffer) |
11042 | 3955 (let ((reporter-prompt-for-summary-p t) |
3956 (ctl-buf ediff-control-buffer) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3957 (ediff-device-type (ediff-device-type)) |
11042 | 3958 varlist salutation buffer-name) |
3959 (setq varlist '(ediff-diff-program ediff-diff-options | |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68651
diff
changeset
|
3960 ediff-diff3-program ediff-diff3-options |
11042 | 3961 ediff-patch-program ediff-patch-options |
3962 ediff-shell | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3963 ediff-use-faces |
11042 | 3964 ediff-auto-refine ediff-highlighting-style |
3965 ediff-buffer-A ediff-buffer-B ediff-control-buffer | |
3966 ediff-forward-word-function | |
3967 ediff-control-frame | |
3968 ediff-control-frame-parameters | |
3969 ediff-control-frame-position-function | |
3970 ediff-prefer-iconified-control-frame | |
3971 ediff-window-setup-function | |
3972 ediff-split-window-function | |
3973 ediff-job-name | |
3974 ediff-word-mode | |
3975 buffer-name | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3976 ediff-device-type |
11042 | 3977 )) |
3978 (setq salutation " | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3979 Congratulations! You may have unearthed a bug in Ediff! |
11042 | 3980 |
3981 Please make a concise and accurate summary of what happened | |
3982 and mail it to the address above. | |
3983 ----------------------------------------------------------- | |
3984 ") | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3985 |
11042 | 3986 (ediff-skip-unsuitable-frames) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3987 (ediff-reset-mouse) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3988 |
11042 | 3989 (switch-to-buffer ediff-msg-buffer) |
3990 (erase-buffer) | |
3991 (delete-other-windows) | |
3992 (insert " | |
3993 Please read this first: | |
3994 ---------------------- | |
3995 | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3996 Some ``bugs'' may actually be no bugs at all. For instance, if you are |
11042 | 3997 reporting that certain difference regions are not matched as you think they |
3998 should, this is most likely due to the way Unix diff program decides what | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3999 constitutes a difference region. Ediff is an Emacs interface to diff, and |
11042 | 4000 it has nothing to do with those decisions---it only takes the output from |
4001 diff and presents it in a way that is better suited for human browsing and | |
4002 manipulation. | |
4003 | |
4004 If Emacs happens to dump core, this is NOT an Ediff problem---it is | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4005 an Emacs bug. Report this to Emacs maintainers. |
11042 | 4006 |
4007 Another popular topic for reports is compilation messages. Because Ediff | |
4008 interfaces to several other packages and runs under Emacs and XEmacs, | |
4009 byte-compilation may produce output like this: | |
4010 | |
4011 While compiling toplevel forms in file ediff.el: | |
4012 ** reference to free variable pm-color-alist | |
4013 ........................ | |
4014 While compiling the end of the data: | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
4015 ** The following functions are not known to be defined: |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4016 ediff-valid-color-p, ediff-set-face, |
11042 | 4017 ........................ |
4018 | |
4019 These are NOT errors, but inevitable warnings, which ought to be ignored. | |
4020 | |
4021 Please do not report those and similar things. However, comments and | |
4022 suggestions are always welcome. | |
4023 | |
4024 Mail anyway? (y or n) ") | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
4025 |
11042 | 4026 (if (y-or-n-p "Mail anyway? ") |
4027 (progn | |
4028 (if (ediff-buffer-live-p ctl-buf) | |
4029 (set-buffer ctl-buf)) | |
4030 (setq buffer-name (buffer-name)) | |
4031 (require 'reporter) | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4032 (reporter-submit-bug-report "kifer@cs.stonybrook.edu" |
11042 | 4033 (ediff-version) |
4034 varlist | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
4035 nil |
11042 | 4036 'delete-other-windows |
4037 salutation)) | |
4038 (bury-buffer) | |
4039 (beep 1)(message "Bug report aborted") | |
4040 (if (ediff-buffer-live-p ctl-buf) | |
19047 | 4041 (ediff-with-current-buffer ctl-buf |
11042 | 4042 (ediff-recenter 'no-rehighlight)))) |
4043 )) | |
36857
f6386773ce30
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
36456
diff
changeset
|
4044 |
f6386773ce30
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
36456
diff
changeset
|
4045 |
f6386773ce30
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
36456
diff
changeset
|
4046 ;; Find an appropriate syntax table for everyone to use |
f6386773ce30
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
36456
diff
changeset
|
4047 ;; If buffer B is not fundamental or text mode, use its syntax table |
f6386773ce30
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
36456
diff
changeset
|
4048 ;; Otherwise, use buffer B's. |
f6386773ce30
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
36456
diff
changeset
|
4049 ;; The syntax mode is used in ediff-forward-word-function |
f6386773ce30
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
36456
diff
changeset
|
4050 ;; The important thing is that every buffer should use the same syntax table |
f6386773ce30
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
36456
diff
changeset
|
4051 ;; during the refinement operation |
f6386773ce30
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
36456
diff
changeset
|
4052 (defun ediff-choose-syntax-table () |
f6386773ce30
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
36456
diff
changeset
|
4053 (setq ediff-syntax-table |
f6386773ce30
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
36456
diff
changeset
|
4054 (ediff-with-current-buffer ediff-buffer-A |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
4055 (if (not (memq major-mode |
36857
f6386773ce30
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
36456
diff
changeset
|
4056 '(fundamental-mode text-mode indented-text-mode))) |
f6386773ce30
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
36456
diff
changeset
|
4057 (syntax-table)))) |
f6386773ce30
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
36456
diff
changeset
|
4058 (if (not ediff-syntax-table) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
4059 (setq ediff-syntax-table |
36857
f6386773ce30
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
36456
diff
changeset
|
4060 (ediff-with-current-buffer ediff-buffer-B |
f6386773ce30
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
36456
diff
changeset
|
4061 (syntax-table)))) |
f6386773ce30
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
36456
diff
changeset
|
4062 ) |
f6386773ce30
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
36456
diff
changeset
|
4063 |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
4064 |
11042 | 4065 (defun ediff-deactivate-mark () |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4066 (ediff-cond-compile-for-xemacs-or-emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4067 (zmacs-deactivate-region) ; xemacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4068 (deactivate-mark) ; emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4069 )) |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
4070 (defun ediff-activate-mark () |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4071 (ediff-cond-compile-for-xemacs-or-emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4072 (zmacs-activate-region) ; xemacs |
75389
11ae87f329da
2007-01-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
75347
diff
changeset
|
4073 (progn |
11ae87f329da
2007-01-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
75347
diff
changeset
|
4074 (make-local-variable 'transient-mark-mode) |
11ae87f329da
2007-01-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
75347
diff
changeset
|
4075 (setq mark-active t |
11ae87f329da
2007-01-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
75347
diff
changeset
|
4076 transient-mark-mode t) ; emacs |
11ae87f329da
2007-01-23 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
75347
diff
changeset
|
4077 ) |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4078 )) |
11042 | 4079 |
85847
baa28899f76f
* ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85838
diff
changeset
|
4080 (defun ediff-nuke-selective-display () |
baa28899f76f
* ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85838
diff
changeset
|
4081 (if (featurep 'xemacs) |
baa28899f76f
* ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85838
diff
changeset
|
4082 (nuke-selective-display) |
baa28899f76f
* ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85838
diff
changeset
|
4083 (save-excursion |
baa28899f76f
* ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85838
diff
changeset
|
4084 (save-restriction |
baa28899f76f
* ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85838
diff
changeset
|
4085 (widen) |
baa28899f76f
* ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85838
diff
changeset
|
4086 (goto-char (point-min)) |
baa28899f76f
* ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85838
diff
changeset
|
4087 (let ((mod-p (buffer-modified-p)) |
baa28899f76f
* ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85838
diff
changeset
|
4088 buffer-read-only end) |
baa28899f76f
* ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85838
diff
changeset
|
4089 (and (eq t selective-display) |
baa28899f76f
* ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85838
diff
changeset
|
4090 (while (search-forward "\^M" nil t) |
baa28899f76f
* ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85838
diff
changeset
|
4091 (end-of-line) |
baa28899f76f
* ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85838
diff
changeset
|
4092 (setq end (point)) |
baa28899f76f
* ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85838
diff
changeset
|
4093 (beginning-of-line) |
baa28899f76f
* ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85838
diff
changeset
|
4094 (while (search-forward "\^M" end t) |
baa28899f76f
* ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85838
diff
changeset
|
4095 (delete-char -1) |
baa28899f76f
* ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85838
diff
changeset
|
4096 (insert "\^J")))) |
baa28899f76f
* ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85838
diff
changeset
|
4097 (set-buffer-modified-p mod-p) |
baa28899f76f
* ediff-util.el (ediff-nuke-selective-display): Move definition to
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85838
diff
changeset
|
4098 (setq selective-display nil)))))) |
11042 | 4099 |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
4100 |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4101 ;; The next two are modified versions from emerge.el. |
11042 | 4102 ;; VARS must be a list of symbols |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4103 ;; ediff-save-variables returns an association list: ((var . val) ...) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4104 (defsubst ediff-save-variables (vars) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4105 (mapcar (lambda (v) (cons v (symbol-value v))) |
11042 | 4106 vars)) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4107 ;; VARS is a list of variable symbols. |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4108 (defun ediff-restore-variables (vars assoc-list) |
11042 | 4109 (while vars |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4110 (set (car vars) (cdr (assoc (car vars) assoc-list))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4111 (setq vars (cdr vars)))) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
4112 |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4113 (defun ediff-change-saved-variable (var value buf-type) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4114 (let* ((assoc-list |
19047 | 4115 (symbol-value (ediff-get-symbol-from-alist |
4116 buf-type | |
4117 ediff-buffer-values-orig-alist))) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4118 (assoc-elt (assoc var assoc-list))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4119 (if assoc-elt |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4120 (setcdr assoc-elt value)))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
4121 |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
4122 |
11042 | 4123 ;; must execute in control buf |
4124 (defun ediff-save-protected-variables () | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4125 (setq ediff-buffer-values-orig-A |
19047 | 4126 (ediff-with-current-buffer ediff-buffer-A |
11042 | 4127 (ediff-save-variables ediff-protected-variables))) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4128 (setq ediff-buffer-values-orig-B |
19047 | 4129 (ediff-with-current-buffer ediff-buffer-B |
11042 | 4130 (ediff-save-variables ediff-protected-variables))) |
4131 (if ediff-3way-comparison-job | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4132 (setq ediff-buffer-values-orig-C |
19047 | 4133 (ediff-with-current-buffer ediff-buffer-C |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
4134 (ediff-save-variables ediff-protected-variables)))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
4135 (if (ediff-buffer-live-p ediff-ancestor-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
4136 (setq ediff-buffer-values-orig-Ancestor |
19047 | 4137 (ediff-with-current-buffer ediff-ancestor-buffer |
11042 | 4138 (ediff-save-variables ediff-protected-variables))))) |
4139 | |
4140 ;; must execute in control buf | |
4141 (defun ediff-restore-protected-variables () | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4142 (let ((values-A ediff-buffer-values-orig-A) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4143 (values-B ediff-buffer-values-orig-B) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
4144 (values-C ediff-buffer-values-orig-C) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
4145 (values-Ancestor ediff-buffer-values-orig-Ancestor)) |
19047 | 4146 (ediff-with-current-buffer ediff-buffer-A |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
4147 (ediff-restore-variables ediff-protected-variables values-A)) |
19047 | 4148 (ediff-with-current-buffer ediff-buffer-B |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
4149 (ediff-restore-variables ediff-protected-variables values-B)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
4150 (if ediff-3way-comparison-job |
19047 | 4151 (ediff-with-current-buffer ediff-buffer-C |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
4152 (ediff-restore-variables ediff-protected-variables values-C))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
4153 (if (ediff-buffer-live-p ediff-ancestor-buffer) |
19047 | 4154 (ediff-with-current-buffer ediff-ancestor-buffer |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
4155 (ediff-restore-variables ediff-protected-variables values-Ancestor))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
4156 )) |
11042 | 4157 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4158 ;; save BUFFER in FILE. used in hooks. |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4159 (defun ediff-save-buffer-in-file (buffer file) |
19047 | 4160 (ediff-with-current-buffer buffer |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4161 (write-file file))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4162 |
11042 | 4163 |
4164 ;;; Debug | |
4165 | |
4166 (ediff-defvar-local ediff-command-begin-time '(0 0 0) "") | |
4167 | |
4168 ;; calculate time used by command | |
4169 (defun ediff-calc-command-time () | |
4170 (let ((end (current-time)) | |
4171 micro sec) | |
4172 (setq micro | |
4173 (if (>= (nth 2 end) (nth 2 ediff-command-begin-time)) | |
4174 (- (nth 2 end) (nth 2 ediff-command-begin-time)) | |
4175 (+ (nth 2 end) (- 1000000 (nth 2 ediff-command-begin-time))))) | |
4176 (setq sec (- (nth 1 end) (nth 1 ediff-command-begin-time))) | |
4177 (or (equal ediff-command-begin-time '(0 0 0)) | |
4178 (message "Elapsed time: %d second(s) + %d microsecond(s)" sec micro)))) | |
4179 | |
4180 (defsubst ediff-save-time () | |
4181 (setq ediff-command-begin-time (current-time))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
4182 |
11042 | 4183 (defun ediff-profile () |
4184 "Toggle profiling Ediff commands." | |
4185 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
4186 (ediff-barf-if-not-control-buffer) |
42288
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
4187 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4188 (ediff-cond-compile-for-xemacs-or-emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4189 (make-local-hook 'post-command-hook) ; xemacs form |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4190 nil ; emacs form |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4191 ) |
42288
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
4192 |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4193 (let ((pre-hook 'pre-command-hook) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4194 (post-hook 'post-command-hook)) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
4195 (if (not (equal ediff-command-begin-time '(0 0 0))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
4196 (progn (remove-hook pre-hook 'ediff-save-time) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
4197 (remove-hook post-hook 'ediff-calc-command-time) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
4198 (setq ediff-command-begin-time '(0 0 0)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
4199 (message "Ediff profiling disabled")) |
42288
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
4200 (add-hook pre-hook 'ediff-save-time t 'local) |
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
4201 (add-hook post-hook 'ediff-calc-command-time nil 'local) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
4202 (message "Ediff profiling enabled")))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
4203 |
11042 | 4204 (defun ediff-print-diff-vector (diff-vector-var) |
4205 (princ (format "\n*** %S ***\n" diff-vector-var)) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4206 (mapcar (lambda (overl-vec) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4207 (princ |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4208 (format |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4209 "Diff %d: \tOverlay: %S |
11042 | 4210 \t\tFine diffs: %s |
4211 \t\tNo-fine-diff-flag: %S | |
4212 \t\tState-of-diff:\t %S | |
4213 \t\tState-of-merge:\t %S | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
4214 " |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4215 (1+ (ediff-overlay-get (aref overl-vec 0) 'ediff-diff-num)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4216 (aref overl-vec 0) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4217 ;; fine-diff-vector |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4218 (if (= (length (aref overl-vec 1)) 0) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4219 "none\n" |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4220 (mapconcat 'prin1-to-string |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4221 (aref overl-vec 1) "\n\t\t\t ")) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4222 (aref overl-vec 2) ; no fine diff flag |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4223 (aref overl-vec 3) ; state-of-diff |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4224 (aref overl-vec 4) ; state-of-merge |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4225 ))) |
11042 | 4226 (eval diff-vector-var))) |
4227 | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
4228 |
11042 | 4229 |
4230 (defun ediff-debug-info () | |
4231 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
4232 (ediff-barf-if-not-control-buffer) |
11042 | 4233 (with-output-to-temp-buffer ediff-debug-buffer |
33392
25fb6fc4f66b
(ediff-status-info, ediff-debug-info): Put temp
Dave Love <fx@gnu.org>
parents:
33019
diff
changeset
|
4234 (ediff-with-current-buffer standard-output |
25fb6fc4f66b
(ediff-status-info, ediff-debug-info): Put temp
Dave Love <fx@gnu.org>
parents:
33019
diff
changeset
|
4235 (fundamental-mode)) |
11042 | 4236 (princ (format "\nCtl buffer: %S\n" ediff-control-buffer)) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
4237 (ediff-print-diff-vector (intern "ediff-difference-vector-A")) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
4238 (ediff-print-diff-vector (intern "ediff-difference-vector-B")) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
4239 (ediff-print-diff-vector (intern "ediff-difference-vector-C")) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
4240 (ediff-print-diff-vector (intern "ediff-difference-vector-Ancestor")) |
11042 | 4241 )) |
4242 | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4243 |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4244 ;;; General utilities |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4245 |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4246 ;; this uses comparison-func to decide who is a member |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4247 (defun ediff-member (elt lis comparison-func) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4248 (while (and lis (not (funcall comparison-func (car lis) elt))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4249 (setq lis (cdr lis))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4250 lis) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4251 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4252 ;; Make a readable representation of the invocation sequence for FUNC-DEF. |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4253 ;; It would either be a key or M-x something. |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4254 (defun ediff-format-bindings-of (func-def) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4255 (let ((desc (car (where-is-internal func-def |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4256 overriding-local-map |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4257 nil nil)))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4258 (if desc |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4259 (key-description desc) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4260 (format "M-x %s" func-def)))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4261 |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4262 ;; this uses comparison-func to decide who is a member, and this determines how |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4263 ;; intersection looks like |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4264 (defun ediff-intersection (lis1 lis2 comparison-func) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4265 (let ((result (list 'a))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4266 (while lis1 |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4267 (if (ediff-member (car lis1) lis2 comparison-func) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4268 (nconc result (list (car lis1)))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4269 (setq lis1 (cdr lis1))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4270 (cdr result))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
4271 |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4272 |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4273 ;; eliminates duplicates using comparison-func |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4274 (defun ediff-union (lis1 lis2 comparison-func) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4275 (let ((result (list 'a))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4276 (while lis1 |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4277 (or (ediff-member (car lis1) (cdr result) comparison-func) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4278 (nconc result (list (car lis1)))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4279 (setq lis1 (cdr lis1))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4280 (while lis2 |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4281 (or (ediff-member (car lis2) (cdr result) comparison-func) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4282 (nconc result (list (car lis2)))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4283 (setq lis2 (cdr lis2))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4284 (cdr result))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4285 |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4286 ;; eliminates duplicates using comparison-func |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4287 (defun ediff-set-difference (lis1 lis2 comparison-func) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4288 (let ((result (list 'a))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4289 (while lis1 |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4290 (or (ediff-member (car lis1) (cdr result) comparison-func) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4291 (ediff-member (car lis1) lis2 comparison-func) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4292 (nconc result (list (car lis1)))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4293 (setq lis1 (cdr lis1))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4294 (cdr result))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4295 |
72974
54ea774c3eed
* viper.el: Bumped up version/date of update to reflect the substantial
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
4296 (defun ediff-add-to-history (history-var newelt) |
54ea774c3eed
* viper.el: Bumped up version/date of update to reflect the substantial
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
4297 (if (fboundp 'add-to-history) |
54ea774c3eed
* viper.el: Bumped up version/date of update to reflect the substantial
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
4298 (add-to-history history-var newelt) |
54ea774c3eed
* viper.el: Bumped up version/date of update to reflect the substantial
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
4299 (set history-var (cons newelt (symbol-value history-var))))) |
54ea774c3eed
* viper.el: Bumped up version/date of update to reflect the substantial
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68997
diff
changeset
|
4300 |
85890
d505125b0b46
2007-11-02 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
85847
diff
changeset
|
4301 (defalias 'ediff-copy-list 'copy-sequence) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4302 |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4303 |
11042 | 4304 ;; don't report error if version control package wasn't found |
4305 ;;(ediff-load-version-control 'silent) | |
4306 | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
4307 (run-hooks 'ediff-load-hook) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
4308 |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68651
diff
changeset
|
4309 (provide 'ediff-util) |
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68651
diff
changeset
|
4310 |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4311 |
81077
eaa1a54ec3ee
Fix up comment convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75389
diff
changeset
|
4312 ;; Local Variables: |
eaa1a54ec3ee
Fix up comment convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75389
diff
changeset
|
4313 ;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) |
eaa1a54ec3ee
Fix up comment convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75389
diff
changeset
|
4314 ;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) |
eaa1a54ec3ee
Fix up comment convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75389
diff
changeset
|
4315 ;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) |
eaa1a54ec3ee
Fix up comment convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75389
diff
changeset
|
4316 ;; End: |
eaa1a54ec3ee
Fix up comment convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75389
diff
changeset
|
4317 |
eaa1a54ec3ee
Fix up comment convention.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75389
diff
changeset
|
4318 ;; arch-tag: f51099b6-ef4b-470f-88a1-3a0e0b03a879 |
11042 | 4319 ;;; ediff-util.el ends here |