Mercurial > emacs
annotate lisp/ediff-util.el @ 67800:a39effc015be
*** empty log message ***
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sat, 24 Dec 2005 17:30:08 +0000 |
parents | 0b958d61a229 |
children | 3bd95f4f2941 7beb78bc1f8e |
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, |
64762
41bb365f41c4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64215
diff
changeset
|
4 ;; 2003, 2004, 2005 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 | |
12 ;; the Free Software Foundation; either version 2, or (at your option) | |
13 ;; any later version. | |
14 | |
15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 ;; GNU General Public License for more details. | |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
14169 | 21 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
64091 | 22 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
23 ;; Boston, MA 02110-1301, USA. | |
11042 | 24 |
38422
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
36857
diff
changeset
|
25 ;;; Commentary: |
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
36857
diff
changeset
|
26 |
11042 | 27 ;;; Code: |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
28 |
18054 | 29 (provide 'ediff-util) |
11042 | 30 |
18054 | 31 ;; Compiler pacifier |
32 (defvar ediff-patch-diagnostics) | |
33 (defvar ediff-patchbufer) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
34 (defvar ediff-use-toolbar-p) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
35 (defvar ediff-toolbar-height) |
18054 | 36 (defvar ediff-toolbar) |
37 (defvar ediff-toolbar-3way) | |
38 (defvar bottom-toolbar) | |
39 (defvar bottom-toolbar-visible-p) | |
40 (defvar bottom-toolbar-height) | |
41 (defvar mark-active) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
42 (defvar ediff-emacs-p) |
18054 | 43 |
42288
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
44 (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
|
45 |
44615
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
46 (and noninteractive |
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
47 (eval-when-compile |
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
48 (load "reporter" 'noerror))) |
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
49 |
18054 | 50 (eval-when-compile |
51 (let ((load-path (cons (expand-file-name ".") load-path))) | |
52 (or (featurep 'ediff-init) | |
53 (load "ediff-init.el" nil nil 'nosuffix)) | |
54 (or (featurep 'ediff-help) | |
55 (load "ediff-help.el" nil nil 'nosuffix)) | |
56 (or (featurep 'ediff-mult) | |
57 (load "ediff-mult.el" nil nil 'nosuffix)) | |
58 (or (featurep 'ediff-wind) | |
59 (load "ediff-wind.el" nil nil 'nosuffix)) | |
60 (or (featurep 'ediff-diff) | |
61 (load "ediff-diff.el" nil nil 'nosuffix)) | |
62 (or (featurep 'ediff-merg) | |
63 (load "ediff-merg.el" nil nil 'nosuffix)) | |
64 (or (featurep 'ediff) | |
65 (load "ediff.el" nil nil 'nosuffix)) | |
66 (or (featurep 'ediff-tbar) | |
21940 | 67 ediff-emacs-p |
18054 | 68 (load "ediff-tbar.el" 'noerror nil 'nosuffix)) |
69 )) | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
70 ;; end pacifier |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
71 |
21940 | 72 |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
73 (require 'ediff-init) |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
74 (require 'ediff-help) |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
75 (require 'ediff-mult) |
18054 | 76 (require 'ediff-wind) |
77 (require 'ediff-diff) | |
78 (require 'ediff-merg) | |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
79 |
18054 | 80 (if ediff-xemacs-p |
21940 | 81 (require 'ediff-tbar)) |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
82 |
11042 | 83 |
84 ;;; Functions | |
85 | |
86 (defun ediff-mode () | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
87 "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
|
88 This mode is entered through one of the following commands: |
11042 | 89 `ediff' |
90 `ediff-files' | |
91 `ediff-buffers' | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
92 `ebuffers' |
11042 | 93 `ediff3' |
94 `ediff-files3' | |
95 `ediff-buffers3' | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
96 `ebuffers3' |
11042 | 97 `ediff-merge' |
98 `ediff-merge-files' | |
99 `ediff-merge-files-with-ancestor' | |
100 `ediff-merge-buffers' | |
101 `ediff-merge-buffers-with-ancestor' | |
102 `ediff-merge-revisions' | |
103 `ediff-merge-revisions-with-ancestor' | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
104 `ediff-windows-wordwise' |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
105 `ediff-windows-linewise' |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
106 `ediff-regions-wordwise' |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
107 `ediff-regions-linewise' |
11042 | 108 `epatch' |
109 `ediff-patch-file' | |
110 `ediff-patch-buffer' | |
111 `epatch-buffer' | |
18839 | 112 `erevision' |
11042 | 113 `ediff-revision' |
114 | |
115 Commands: | |
116 \\{ediff-mode-map}" | |
117 (kill-all-local-variables) | |
118 (setq major-mode 'ediff-mode) | |
119 (setq mode-name "Ediff") | |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64091
diff
changeset
|
120 ;; 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
|
121 ;; 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
|
122 ;; 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
|
123 ;; 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
|
124 ;; Second, changing run-hooks to run-mode-hooks would require an |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64091
diff
changeset
|
125 ;; if-statement, since XEmacs doesn't have this. |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64091
diff
changeset
|
126 (run-hooks 'ediff-mode-hook)) |
11042 | 127 |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
128 |
11042 | 129 |
130 ;;; Build keymaps | |
131 | |
132 (ediff-defvar-local ediff-mode-map nil | |
133 "Local keymap used in Ediff mode. | |
134 This is local to each Ediff Control Panel, so they may vary from invocation | |
135 to invocation.") | |
136 | |
137 ;; Set up the keymap in the control buffer | |
138 (defun ediff-set-keys () | |
139 "Set up Ediff keymap, if necessary." | |
140 (if (null ediff-mode-map) | |
141 (ediff-setup-keymap)) | |
142 (use-local-map ediff-mode-map)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
143 |
11042 | 144 ;; Reload Ediff keymap. For debugging only. |
145 (defun ediff-reload-keymap () | |
146 (interactive) | |
147 (setq ediff-mode-map nil) | |
148 (ediff-set-keys)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
149 |
11042 | 150 |
151 (defun ediff-setup-keymap () | |
152 "Set up the keymap used in the control buffer of Ediff." | |
153 (setq ediff-mode-map (make-sparse-keymap)) | |
154 (suppress-keymap ediff-mode-map) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
155 |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
156 (define-key ediff-mode-map |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
157 (if ediff-emacs-p [mouse-2] [button2]) 'ediff-help-for-quick-help) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
158 (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
|
159 |
11042 | 160 (define-key ediff-mode-map "p" 'ediff-previous-difference) |
161 (define-key ediff-mode-map "\C-?" 'ediff-previous-difference) | |
162 (define-key ediff-mode-map [delete] 'ediff-previous-difference) | |
163 (define-key ediff-mode-map "\C-h" (if ediff-no-emacs-help-in-control-buffer | |
164 'ediff-previous-difference nil)) | |
19774 | 165 ;; must come after C-h, or else C-h wipes out backspace's binding in XEmacs |
166 (define-key ediff-mode-map [backspace] 'ediff-previous-difference) | |
11042 | 167 (define-key ediff-mode-map "n" 'ediff-next-difference) |
168 (define-key ediff-mode-map " " 'ediff-next-difference) | |
169 (define-key ediff-mode-map "j" 'ediff-jump-to-difference) | |
170 (define-key ediff-mode-map "g" nil) | |
171 (define-key ediff-mode-map "ga" 'ediff-jump-to-difference-at-point) | |
172 (define-key ediff-mode-map "gb" 'ediff-jump-to-difference-at-point) | |
173 (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
|
174 (define-key ediff-mode-map "D" 'ediff-show-diff-output) |
11042 | 175 (define-key ediff-mode-map "z" 'ediff-suspend) |
176 (define-key ediff-mode-map "\C-l" 'ediff-recenter) | |
177 (define-key ediff-mode-map "|" 'ediff-toggle-split) | |
178 (define-key ediff-mode-map "h" 'ediff-toggle-hilit) | |
179 (or ediff-word-mode | |
180 (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
|
181 (if ediff-narrow-job |
11042 | 182 (define-key ediff-mode-map "%" 'ediff-toggle-narrow-region)) |
183 (define-key ediff-mode-map "~" 'ediff-swap-buffers) | |
184 (define-key ediff-mode-map "v" 'ediff-scroll-vertically) | |
185 (define-key ediff-mode-map "\C-v" 'ediff-scroll-vertically) | |
186 (define-key ediff-mode-map "^" 'ediff-scroll-vertically) | |
187 (define-key ediff-mode-map "\M-v" 'ediff-scroll-vertically) | |
188 (define-key ediff-mode-map "V" 'ediff-scroll-vertically) | |
189 (define-key ediff-mode-map "<" 'ediff-scroll-horizontally) | |
190 (define-key ediff-mode-map ">" 'ediff-scroll-horizontally) | |
191 (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
|
192 (define-key ediff-mode-map "E" 'ediff-documentation) |
11042 | 193 (define-key ediff-mode-map "?" 'ediff-toggle-help) |
194 (define-key ediff-mode-map "!" 'ediff-update-diffs) | |
20206 | 195 (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
|
196 (define-key ediff-mode-map "R" 'ediff-show-registry) |
11042 | 197 (or ediff-word-mode |
198 (define-key ediff-mode-map "*" 'ediff-make-or-kill-fine-diffs)) | |
199 (define-key ediff-mode-map "a" nil) | |
200 (define-key ediff-mode-map "b" nil) | |
201 (define-key ediff-mode-map "r" nil) | |
202 (cond (ediff-merge-job | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
203 ;; Will barf if no ancestor |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
204 (define-key ediff-mode-map "/" 'ediff-show-ancestor) |
11042 | 205 ;; 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
|
206 (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
|
207 (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
|
208 (define-key ediff-mode-map "r" 'ediff-restore-diff-in-merge-buffer) |
11042 | 209 (define-key ediff-mode-map "s" 'ediff-shrink-window-C) |
210 (define-key ediff-mode-map "+" 'ediff-combine-diffs) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
211 (define-key ediff-mode-map "$" nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
212 (define-key ediff-mode-map "$$" 'ediff-toggle-show-clashes-only) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
213 (define-key ediff-mode-map "$*" 'ediff-toggle-skip-changed-regions) |
11042 | 214 (define-key ediff-mode-map "&" 'ediff-re-merge)) |
215 (ediff-3way-comparison-job | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
216 (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
|
217 (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
|
218 (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
|
219 (define-key ediff-mode-map "bc" 'ediff-copy-B-to-C) |
11042 | 220 (define-key ediff-mode-map "c" nil) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
221 (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
|
222 (define-key ediff-mode-map "cb" 'ediff-copy-C-to-B) |
11042 | 223 (define-key ediff-mode-map "ra" 'ediff-restore-diff) |
224 (define-key ediff-mode-map "rb" 'ediff-restore-diff) | |
225 (define-key ediff-mode-map "rc" 'ediff-restore-diff) | |
226 (define-key ediff-mode-map "C" 'ediff-toggle-read-only)) | |
227 (t ; 2-way comparison | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
228 (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
|
229 (define-key ediff-mode-map "b" 'ediff-copy-B-to-A) |
11042 | 230 (define-key ediff-mode-map "ra" 'ediff-restore-diff) |
231 (define-key ediff-mode-map "rb" 'ediff-restore-diff)) | |
232 ) ; cond | |
233 (define-key ediff-mode-map "G" 'ediff-submit-report) | |
234 (define-key ediff-mode-map "#" nil) | |
235 (define-key ediff-mode-map "#h" 'ediff-toggle-regexp-match) | |
236 (define-key ediff-mode-map "#f" 'ediff-toggle-regexp-match) | |
237 (or ediff-word-mode | |
238 (define-key ediff-mode-map "##" 'ediff-toggle-skip-similar)) | |
239 (define-key ediff-mode-map "o" nil) | |
240 (define-key ediff-mode-map "A" 'ediff-toggle-read-only) | |
241 (define-key ediff-mode-map "B" 'ediff-toggle-read-only) | |
242 (define-key ediff-mode-map "w" nil) | |
243 (define-key ediff-mode-map "wa" 'ediff-save-buffer) | |
244 (define-key ediff-mode-map "wb" 'ediff-save-buffer) | |
245 (define-key ediff-mode-map "wd" 'ediff-save-buffer) | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
246 (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
|
247 (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
|
248 (define-key ediff-mode-map "P" 'ediff-show-patch-diagnostics)) |
11042 | 249 (if ediff-3way-job |
250 (progn | |
251 (define-key ediff-mode-map "wc" 'ediff-save-buffer) | |
252 (define-key ediff-mode-map "gc" 'ediff-jump-to-difference-at-point) | |
253 )) | |
254 | |
255 (define-key ediff-mode-map "m" 'ediff-toggle-wide-display) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
256 |
11042 | 257 ;; Allow ediff-mode-map to be referenced indirectly |
258 (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
|
259 (run-hooks 'ediff-keymap-setup-hook)) |
11042 | 260 |
261 | |
262 ;;; Setup functions | |
263 | |
18054 | 264 ;; Common startup entry for all Ediff functions It now returns control buffer |
265 ;; so other functions can do post-processing SETUP-PARAMETERS is a list of the | |
266 ;; form ((param .val) (param . val)...) This serves a similar purpose to | |
267 ;; STARTUP-HOOKS, but these parameters are set in the new control buffer right | |
268 ;; after this buf is created and before any windows are set and such. | |
11042 | 269 (defun ediff-setup (buffer-A file-A buffer-B file-B buffer-C file-C |
20206 | 270 startup-hooks setup-parameters |
271 &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
|
272 (run-hooks 'ediff-before-setup-hook) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
273 ;; 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
|
274 ;; for the OS at hand. |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
275 (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
|
276 (setq file-B (ediff-convert-standard-filename (expand-file-name file-B))) |
11042 | 277 (if (stringp file-C) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
278 (setq file-C |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
279 (ediff-convert-standard-filename (expand-file-name file-C)))) |
20206 | 280 (if (stringp merge-buffer-file) |
281 (progn | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
282 (setq merge-buffer-file |
20206 | 283 (ediff-convert-standard-filename |
284 (expand-file-name merge-buffer-file))) | |
285 ;; check the directory exists | |
286 (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
|
287 (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
|
288 (abbreviate-file-name |
20206 | 289 (file-name-directory merge-buffer-file)))) |
290 (if (and (file-exists-p merge-buffer-file) | |
291 (file-directory-p merge-buffer-file)) | |
292 (error "The merge buffer file %s must not be a directory" | |
293 (abbreviate-file-name merge-buffer-file))) | |
294 )) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
295 (let* ((control-buffer-name |
11042 | 296 (ediff-unique-buffer-name "*Ediff Control Panel" "*")) |
19047 | 297 (control-buffer (ediff-with-current-buffer buffer-A |
11042 | 298 (get-buffer-create control-buffer-name)))) |
19047 | 299 (ediff-with-current-buffer control-buffer |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
300 (ediff-mode) |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
301 |
18054 | 302 (make-local-variable 'ediff-use-long-help-message) |
303 (make-local-variable 'ediff-prefer-iconified-control-frame) | |
304 (make-local-variable 'ediff-split-window-function) | |
305 (make-local-variable 'ediff-default-variant) | |
306 (make-local-variable 'ediff-merge-window-share) | |
307 (make-local-variable 'ediff-window-setup-function) | |
308 (make-local-variable 'ediff-keep-variants) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
309 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
310 (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
|
311 (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
|
312 nil ; emacs form |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
313 ) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
314 |
11042 | 315 ;; unwrap set up parameters passed as argument |
316 (while setup-parameters | |
317 (set (car (car setup-parameters)) (cdr (car setup-parameters))) | |
318 (setq setup-parameters (cdr setup-parameters))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
319 |
11042 | 320 ;; set variables classifying the current ediff job |
18054 | 321 ;; must come AFTER setup-parameters |
11042 | 322 (setq ediff-3way-comparison-job (ediff-3way-comparison-job) |
323 ediff-merge-job (ediff-merge-job) | |
324 ediff-merge-with-ancestor-job (ediff-merge-with-ancestor-job) | |
325 ediff-3way-job (ediff-3way-job) | |
326 ediff-diff3-job (ediff-diff3-job) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
327 ediff-narrow-job (ediff-narrow-job) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
328 ediff-windows-job (ediff-windows-job) |
11042 | 329 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
|
330 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
331 ;; 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
|
332 ;; 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
|
333 (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
|
334 (setq ediff-keep-variants t)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
335 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
336 (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
|
337 (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
|
338 nil ; emacs form |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
339 ) |
42288
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
340 |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
341 (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
|
342 (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
|
343 (setq ediff-mouse-pixel-position (mouse-pixel-position)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
344 |
11042 | 345 ;; adjust for merge jobs |
346 (if ediff-merge-job | |
347 (let ((buf | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
348 ;; If default variant is `combined', the right stuff is |
11042 | 349 ;; 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
|
350 ;; 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
|
351 ;; (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
|
352 ;; 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
|
353 ;; 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
|
354 ;; 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
|
355 (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
|
356 buffer-B) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
357 (t buffer-A)))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
358 |
11042 | 359 (setq ediff-split-window-function |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
360 ediff-merge-split-window-function) |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
361 |
11042 | 362 ;; remember the ancestor buffer, if any |
363 (setq ediff-ancestor-buffer buffer-C) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
364 |
11042 | 365 (setq buffer-C |
366 (get-buffer-create | |
367 (ediff-unique-buffer-name "*ediff-merge" "*"))) | |
368 (save-excursion | |
369 (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
|
370 (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
|
371 (goto-char (point-min)) |
19047 | 372 (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
|
373 (widen) ; merge buffer is always widened |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
374 (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
|
375 ))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
376 (setq buffer-read-only nil |
11042 | 377 ediff-buffer-A buffer-A |
378 ediff-buffer-B buffer-B | |
379 ediff-buffer-C buffer-C | |
380 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
|
381 |
f6386773ce30
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
36456
diff
changeset
|
382 (ediff-choose-syntax-table) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
383 |
11042 | 384 (setq ediff-control-buffer-suffix |
385 (if (string-match "<[0-9]*>" control-buffer-name) | |
386 (substring control-buffer-name | |
387 (match-beginning 0) (match-end 0)) | |
388 "") | |
389 ediff-control-buffer-number | |
390 (max | |
391 0 | |
392 (1- | |
393 (string-to-number | |
394 (substring | |
395 ediff-control-buffer-suffix | |
396 (or | |
397 (string-match "[0-9]+" ediff-control-buffer-suffix) | |
398 0)))))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
399 |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
400 (setq ediff-error-buffer |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
401 (get-buffer-create (ediff-unique-buffer-name "*ediff-errors" "*"))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
402 |
19047 | 403 (ediff-with-current-buffer buffer-A (ediff-strip-mode-line-format)) |
404 (ediff-with-current-buffer buffer-B (ediff-strip-mode-line-format)) | |
11042 | 405 (if ediff-3way-job |
19047 | 406 (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
|
407 (if (ediff-buffer-live-p ediff-ancestor-buffer) |
19047 | 408 (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
|
409 (ediff-strip-mode-line-format))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
410 |
11042 | 411 (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
|
412 |
11042 | 413 ;; ediff-setup-diff-regions-function must be set after setup |
414 ;; parameters are processed. | |
415 (setq ediff-setup-diff-regions-function | |
416 (if ediff-diff3-job | |
417 'ediff-setup-diff-regions3 | |
418 'ediff-setup-diff-regions)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
419 |
11042 | 420 (setq ediff-wide-bounds |
421 (list (ediff-make-bullet-proof-overlay | |
422 '(point-min) '(point-max) ediff-buffer-A) | |
423 (ediff-make-bullet-proof-overlay | |
424 '(point-min) '(point-max) ediff-buffer-B) | |
425 (ediff-make-bullet-proof-overlay | |
426 '(point-min) '(point-max) ediff-buffer-C))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
427 |
11042 | 428 ;; This has effect only on ediff-windows/regions |
429 ;; In all other cases, ediff-visible-region sets visibility bounds to | |
430 ;; ediff-wide-bounds, and ediff-narrow-bounds are ignored. | |
431 (if ediff-start-narrowed | |
432 (setq ediff-visible-bounds ediff-narrow-bounds) | |
433 (setq ediff-visible-bounds ediff-wide-bounds)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
434 |
11042 | 435 (ediff-set-keys) ; comes after parameter setup |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
436 |
11042 | 437 ;; set up ediff-narrow-bounds, if not set |
438 (or ediff-narrow-bounds | |
439 (setq ediff-narrow-bounds ediff-wide-bounds)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
440 |
19047 | 441 ;; All these must be inside ediff-with-current-buffer control-buffer, |
11042 | 442 ;; since these vars are local to control-buffer |
443 ;; These won't run if there are errors in diff | |
19047 | 444 (ediff-with-current-buffer ediff-buffer-A |
11042 | 445 (ediff-nuke-selective-display) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
446 (run-hooks 'ediff-prepare-buffer-hook) |
19047 | 447 (if (ediff-with-current-buffer control-buffer ediff-merge-job) |
11042 | 448 (setq buffer-read-only t)) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
449 ;; 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
|
450 ;; 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
|
451 (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
|
452 (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
|
453 (cons control-buffer ediff-this-buffer-ediff-sessions))) |
18839 | 454 (if ediff-make-buffers-readonly-at-startup |
455 (setq buffer-read-only t)) | |
11042 | 456 ) |
18839 | 457 |
19047 | 458 (ediff-with-current-buffer ediff-buffer-B |
11042 | 459 (ediff-nuke-selective-display) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
460 (run-hooks 'ediff-prepare-buffer-hook) |
19047 | 461 (if (ediff-with-current-buffer control-buffer ediff-merge-job) |
11042 | 462 (setq buffer-read-only t)) |
463 ;; 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
|
464 (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
|
465 (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
|
466 (cons control-buffer ediff-this-buffer-ediff-sessions))) |
18839 | 467 (if ediff-make-buffers-readonly-at-startup |
468 (setq buffer-read-only t)) | |
11042 | 469 ) |
18839 | 470 |
11042 | 471 (if ediff-3way-job |
19047 | 472 (ediff-with-current-buffer ediff-buffer-C |
11042 | 473 (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
|
474 ;; 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
|
475 ;; (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
|
476 (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
|
477 (widen)) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
478 (run-hooks 'ediff-prepare-buffer-hook) |
11042 | 479 ;; 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
|
480 (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
|
481 (setq ediff-this-buffer-ediff-sessions |
11042 | 482 (cons control-buffer |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
483 ediff-this-buffer-ediff-sessions))) |
18839 | 484 (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
|
485 (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
|
486 (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
|
487 )) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
488 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
489 (if (ediff-buffer-live-p ediff-ancestor-buffer) |
19047 | 490 (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
|
491 (ediff-nuke-selective-display) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
492 (setq buffer-read-only t) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
493 (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
|
494 (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
|
495 (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
|
496 (cons control-buffer |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
497 ediff-this-buffer-ediff-sessions))) |
11042 | 498 )) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
499 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
500 ;; the following must be after setting up ediff-narrow-bounds AND after |
11042 | 501 ;; nuking selective display |
502 (funcall ediff-setup-diff-regions-function file-A file-B file-C) | |
503 (setq ediff-number-of-differences (length ediff-difference-vector-A)) | |
504 (setq ediff-current-difference -1) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
505 |
11042 | 506 (ediff-make-current-diff-overlay 'A) |
507 (ediff-make-current-diff-overlay 'B) | |
508 (if ediff-3way-job | |
509 (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
|
510 (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
|
511 (ediff-make-current-diff-overlay 'Ancestor)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
512 |
11042 | 513 (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
|
514 |
11042 | 515 (let ((shift-A (ediff-overlay-start |
516 (ediff-get-value-according-to-buffer-type | |
517 'A ediff-narrow-bounds))) | |
518 (shift-B (ediff-overlay-start | |
519 (ediff-get-value-according-to-buffer-type | |
520 'B ediff-narrow-bounds))) | |
521 (shift-C (ediff-overlay-start | |
522 (ediff-get-value-according-to-buffer-type | |
523 'C ediff-narrow-bounds)))) | |
524 ;; position point in buf A | |
525 (save-excursion | |
526 (select-window ediff-window-A) | |
527 (goto-char shift-A)) | |
528 ;; position point in buf B | |
529 (save-excursion | |
530 (select-window ediff-window-B) | |
531 (goto-char shift-B)) | |
532 (if ediff-3way-job | |
533 (save-excursion | |
534 (select-window ediff-window-C) | |
535 (goto-char shift-C))) | |
536 ) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
537 |
11042 | 538 (select-window ediff-control-window) |
539 (ediff-visible-region) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
540 |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
541 (run-hooks 'startup-hooks) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
542 (ediff-arrange-autosave-in-merge-jobs merge-buffer-file) |
20206 | 543 |
11042 | 544 (ediff-refresh-mode-lines) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
545 (setq buffer-read-only t) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
546 (setq ediff-session-registry |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
547 (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
|
548 (ediff-update-registry) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
549 (if (ediff-buffer-live-p ediff-meta-buffer) |
20206 | 550 (ediff-update-meta-buffer |
551 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
|
552 (run-hooks 'ediff-startup-hook) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
553 ) ; eval in control-buffer |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
554 control-buffer)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
555 |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
556 |
11042 | 557 ;; 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
|
558 ;; to reside. |
11042 | 559 (defun ediff-setup-control-buffer (ctl-buf) |
560 "Set up window for control buffer." | |
561 (if (window-dedicated-p (selected-window)) | |
562 (set-buffer ctl-buf) ; we are in control frame but just in case | |
563 (switch-to-buffer ctl-buf)) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
564 (let ((window-min-height 2)) |
11042 | 565 (erase-buffer) |
566 (ediff-set-help-message) | |
567 (insert ediff-help-message) | |
568 (shrink-window-if-larger-than-buffer) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
569 (or (ediff-multiframe-setup-p) |
11042 | 570 (ediff-indent-help-message)) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
571 (ediff-set-help-overlays) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
572 |
11042 | 573 (set-buffer-modified-p nil) |
574 (ediff-refresh-mode-lines) | |
575 (setq ediff-control-window (selected-window)) | |
576 (setq ediff-window-config-saved | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
577 (format "%S%S%S%S%S%S%S" |
11042 | 578 ediff-control-window |
579 ediff-window-A | |
580 ediff-window-B | |
581 ediff-window-C | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
582 ediff-split-window-function |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
583 (ediff-multiframe-setup-p) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
584 ediff-wide-display-p)) |
18054 | 585 |
586 ;; 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
|
587 (if (not (ediff-multiframe-setup-p)) |
18054 | 588 (ediff-make-bottom-toolbar)) ; this checks if toolbar is requested |
11042 | 589 (goto-char (point-min)) |
590 (skip-chars-forward ediff-whitespace))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
591 |
20206 | 592 ;; This executes in control buffer and sets auto-save, visited file name, etc, |
593 ;; in the merge buffer | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
594 (defun ediff-arrange-autosave-in-merge-jobs (merge-buffer-file) |
20206 | 595 (if (not ediff-merge-job) |
596 () | |
597 (if (stringp merge-buffer-file) | |
598 (setq ediff-autostore-merges t | |
599 ediff-merge-store-file merge-buffer-file)) | |
600 (if (stringp ediff-merge-store-file) | |
601 (progn | |
602 ;; 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
|
603 (ediff-verify-file-merge-buffer ediff-merge-store-file) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
604 (setq merge-buffer-file ediff-merge-store-file) |
20206 | 605 (ediff-with-current-buffer ediff-buffer-C |
606 (set-visited-file-name merge-buffer-file)))) | |
607 (ediff-with-current-buffer ediff-buffer-C | |
608 (setq buffer-offer-save t) ; ask before killing buffer | |
609 ;; make sure the contents is auto-saved | |
610 (auto-save-mode 1)) | |
611 )) | |
11042 | 612 |
613 | |
614 ;;; Commands for working with Ediff | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
615 |
11042 | 616 (defun ediff-update-diffs () |
617 "Recompute difference regions in buffers A, B, and C. | |
618 Buffers are not synchronized with their respective files, so changes done | |
619 to these buffers are not saved at this point---the user can do this later, | |
620 if necessary." | |
621 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
622 (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
|
623 (if (and (ediff-buffer-live-p ediff-ancestor-buffer) |
19047 | 624 (not |
625 (y-or-n-p | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
626 "Ancestor buffer will not be used. Recompute diffs anyway? "))) |
19047 | 627 (error "Recomputation of differences canceled")) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
628 |
19047 | 629 (let ((point-A (ediff-with-current-buffer ediff-buffer-A (point))) |
630 ;;(point-B (ediff-with-current-buffer ediff-buffer-B (point))) | |
11042 | 631 (tmp-buffer (get-buffer-create ediff-tmp-buffer)) |
19047 | 632 (buf-A-file-name (buffer-file-name ediff-buffer-A)) |
633 (buf-B-file-name (buffer-file-name ediff-buffer-B)) | |
634 ;; (null ediff-buffer-C) is no problem, as we later check if | |
635 ;; ediff-buffer-C is alive | |
636 (buf-C-file-name (buffer-file-name ediff-buffer-C)) | |
11042 | 637 (overl-A (ediff-get-value-according-to-buffer-type |
638 'A ediff-narrow-bounds)) | |
639 (overl-B (ediff-get-value-according-to-buffer-type | |
640 'B ediff-narrow-bounds)) | |
641 (overl-C (ediff-get-value-according-to-buffer-type | |
642 'C ediff-narrow-bounds)) | |
643 beg-A end-A beg-B end-B beg-C end-C | |
644 file-A file-B file-C) | |
19047 | 645 |
646 (if (stringp buf-A-file-name) | |
647 (setq buf-A-file-name (file-name-nondirectory buf-A-file-name))) | |
648 (if (stringp buf-B-file-name) | |
649 (setq buf-B-file-name (file-name-nondirectory buf-B-file-name))) | |
650 (if (stringp buf-C-file-name) | |
651 (setq buf-C-file-name (file-name-nondirectory buf-C-file-name))) | |
652 | |
11042 | 653 (ediff-unselect-and-select-difference -1) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
654 |
11042 | 655 (setq beg-A (ediff-overlay-start overl-A) |
656 beg-B (ediff-overlay-start overl-B) | |
657 beg-C (ediff-overlay-start overl-C) | |
658 end-A (ediff-overlay-end overl-A) | |
659 end-B (ediff-overlay-end overl-B) | |
660 end-C (ediff-overlay-end overl-C)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
661 |
11042 | 662 (if ediff-word-mode |
663 (progn | |
664 (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
|
665 (setq file-A (ediff-make-temp-file tmp-buffer "regA")) |
11042 | 666 (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
|
667 (setq file-B (ediff-make-temp-file tmp-buffer "regB")) |
11042 | 668 (if ediff-3way-job |
669 (progn | |
670 (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
|
671 (setq file-C (ediff-make-temp-file tmp-buffer "regC")))) |
11042 | 672 ) |
673 ;; not word-mode | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
674 (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
|
675 (setq file-B (ediff-make-temp-file ediff-buffer-B buf-B-file-name)) |
11042 | 676 (if ediff-3way-job |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
677 (setq file-C (ediff-make-temp-file ediff-buffer-C buf-C-file-name))) |
11042 | 678 ) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
679 |
11042 | 680 (ediff-clear-diff-vector 'ediff-difference-vector-A 'fine-diffs-also) |
681 (ediff-clear-diff-vector 'ediff-difference-vector-B 'fine-diffs-also) | |
682 (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
|
683 (ediff-clear-diff-vector |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
684 'ediff-difference-vector-Ancestor 'fine-diffs-also) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
685 ;; 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
|
686 ;; the diffs. |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
687 (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
|
688 ediff-ancestor-buffer nil |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
689 ediff-state-of-merge nil) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
690 |
11042 | 691 (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
|
692 |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
693 ;; In case of merge job, fool it into thinking that it is just doing |
11042 | 694 ;; comparison |
695 (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
|
696 (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
|
697 (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
|
698 (ediff-merge-with-ancestor-job ediff-merge-with-ancestor-job) |
11042 | 699 (ediff-job-name ediff-job-name)) |
700 (if ediff-merge-job | |
701 (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
|
702 ediff-3way-comparison-job t |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
703 ediff-merge-job nil |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
704 ediff-merge-with-ancestor-job nil |
11042 | 705 ediff-job-name 'ediff-files3)) |
706 (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
|
707 |
11042 | 708 (setq ediff-number-of-differences (length ediff-difference-vector-A)) |
709 (delete-file file-A) | |
710 (delete-file file-B) | |
711 (if file-C | |
712 (delete-file file-C)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
713 |
11042 | 714 (if ediff-3way-job |
715 (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
|
716 |
11042 | 717 (ediff-jump-to-difference (ediff-diff-at-point 'A point-A)) |
718 (message "") | |
719 )) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
720 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
721 ;; Not bound to any key---to dangerous. A user can do it if necessary. |
11042 | 722 (defun ediff-revert-buffers-then-recompute-diffs (noconfirm) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
723 "Revert buffers A, B and C. Then rerun Ediff on file A and file B." |
11042 | 724 (interactive "P") |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
725 (ediff-barf-if-not-control-buffer) |
11042 | 726 (let ((bufA ediff-buffer-A) |
727 (bufB ediff-buffer-B) | |
728 (bufC ediff-buffer-C) | |
729 (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
|
730 (keep-variants ediff-keep-variants) |
11042 | 731 (ancestor-buf ediff-ancestor-buffer) |
732 (ancestor-job ediff-merge-with-ancestor-job) | |
733 (merge ediff-merge-job) | |
734 (comparison ediff-3way-comparison-job)) | |
19047 | 735 (ediff-with-current-buffer bufA |
11042 | 736 (revert-buffer t noconfirm)) |
19047 | 737 (ediff-with-current-buffer bufB |
11042 | 738 (revert-buffer t noconfirm)) |
739 ;; this should only be executed in a 3way comparison, not in merge | |
740 (if comparison | |
19047 | 741 (ediff-with-current-buffer bufC |
11042 | 742 (revert-buffer t noconfirm))) |
743 (if merge | |
744 (progn | |
745 (set-buffer ctl-buf) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
746 ;; 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
|
747 ;; 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
|
748 ;; variants kept. |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
749 (ediff-really-quit (not keep-variants)) |
11042 | 750 (kill-buffer bufC) |
751 (if ancestor-job | |
752 (ediff-merge-buffers-with-ancestor bufA bufB ancestor-buf) | |
753 (ediff-merge-buffers bufA bufB))) | |
754 (ediff-update-diffs)))) | |
755 | |
756 | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
757 ;; optional NO-REHIGHLIGHT says to not rehighlight buffers |
11042 | 758 (defun ediff-recenter (&optional no-rehighlight) |
759 "Bring the highlighted region of all buffers being compared into view. | |
760 Reestablish the default three-window display." | |
761 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
762 (ediff-barf-if-not-control-buffer) |
11042 | 763 (let (buffer-read-only) |
764 (if (and (ediff-buffer-live-p ediff-buffer-A) | |
765 (ediff-buffer-live-p ediff-buffer-B) | |
766 (or (not ediff-3way-job) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
767 (ediff-buffer-live-p ediff-buffer-C))) |
11042 | 768 (ediff-setup-windows |
769 ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-control-buffer) | |
770 (or (eq this-command 'ediff-quit) | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
771 (message ediff-KILLED-VITAL-BUFFER |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
772 (beep 1))) |
11042 | 773 )) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
774 |
11042 | 775 ;; set visibility range appropriate to this invocation of Ediff. |
776 (ediff-visible-region) | |
777 ;; raise | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
778 (if (and (ediff-window-display-p) |
11042 | 779 (symbolp this-command) |
780 (symbolp last-command) | |
781 ;; Either one of the display-changing commands | |
782 (or (memq this-command | |
783 '(ediff-recenter | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
784 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
|
785 ediff-patch-action |
11042 | 786 ediff-toggle-wide-display ediff-toggle-multiframe)) |
787 ;; Or one of the movement cmds and prev cmd was an Ediff cmd | |
14040 | 788 ;; This avoids raising frames unnecessarily. |
11042 | 789 (and (memq this-command |
790 '(ediff-next-difference | |
791 ediff-previous-difference | |
792 ediff-jump-to-difference | |
793 ediff-jump-to-difference-at-point)) | |
794 (not (string-match "^ediff-" (symbol-name last-command))) | |
795 ))) | |
796 (progn | |
797 (if (window-live-p ediff-window-A) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
798 (raise-frame (window-frame ediff-window-A))) |
11042 | 799 (if (window-live-p ediff-window-B) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
800 (raise-frame (window-frame ediff-window-B))) |
11042 | 801 (if (window-live-p ediff-window-C) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
802 (raise-frame (window-frame ediff-window-C))))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
803 (if (and (ediff-window-display-p) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
804 (frame-live-p ediff-control-frame) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
805 (not ediff-use-long-help-message) |
11042 | 806 (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
|
807 (raise-frame ediff-control-frame)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
808 |
11042 | 809 ;; 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
|
810 (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
|
811 (control-buf ediff-control-buffer)) |
11042 | 812 (if (and (ediff-buffer-live-p ediff-buffer-A) |
813 (ediff-buffer-live-p ediff-buffer-B) | |
814 (or (not ediff-3way-job) | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
815 (ediff-buffer-live-p ediff-buffer-C))) |
11042 | 816 (progn |
817 (or no-rehighlight | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
818 (ediff-select-difference ediff-current-difference)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
819 |
11042 | 820 (ediff-recenter-one-window 'A) |
821 (ediff-recenter-one-window 'B) | |
822 (if ediff-3way-job | |
823 (ediff-recenter-one-window 'C)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
824 |
19047 | 825 (ediff-with-current-buffer control-buf |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
826 (ediff-recenter-ancestor) ; check if ancestor is alive |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
827 |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
828 (if (and (ediff-multiframe-setup-p) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
829 (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
|
830 (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
|
831 ;; 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
|
832 (ediff-reset-mouse |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
833 control-frame |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
834 (eq this-command 'ediff-quit)))) |
11042 | 835 )) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
836 |
52828
d08ef8842be1
2003-10-12 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
837 (or no-rehighlight |
d08ef8842be1
2003-10-12 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
52401
diff
changeset
|
838 (ediff-restore-highlighting)) |
19047 | 839 (ediff-with-current-buffer control-buf (ediff-refresh-mode-lines)) |
11042 | 840 )) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
841 |
11042 | 842 ;; this function returns to the window it was called from |
843 ;; (which was the control window) | |
844 (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
|
845 (if (ediff-valid-difference-p) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
846 ;; 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
|
847 (let* ((ctl-wind (selected-window)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
848 (shift (ediff-overlay-start |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
849 (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
|
850 buf-type ediff-narrow-bounds))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
851 (job-name ediff-job-name) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
852 (control-buf ediff-control-buffer) |
19047 | 853 (window-name (ediff-get-symbol-from-alist |
854 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
|
855 (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
|
856 (symbol-value window-name)))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
857 |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
858 (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
|
859 (set-window-start window shift)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
860 (if window |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
861 (progn |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
862 (select-window window) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
863 (ediff-deactivate-mark) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
864 (ediff-position-region |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
865 (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
|
866 (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
|
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 job-name |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
869 ))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
870 (select-window ctl-wind) |
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 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
873 (defun ediff-recenter-ancestor () |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
874 ;; 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
|
875 ;; visible. |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
876 (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
|
877 (ediff-valid-difference-p)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
878 (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
|
879 (ctl-wind (selected-window)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
880 (job-name ediff-job-name) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
881 (ctl-buf ediff-control-buffer)) |
19047 | 882 (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
|
883 (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
|
884 (if window |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
885 (progn |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
886 (select-window window) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
887 (ediff-position-region |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
888 (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
|
889 (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
|
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 job-name)))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
892 (select-window ctl-wind) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
893 ))) |
11042 | 894 |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
895 |
11042 | 896 ;; This will have to be refined for 3way jobs |
897 (defun ediff-toggle-split () | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
898 "Toggle vertical/horizontal window split. |
11042 | 899 Does nothing if file-A and file-B are in different frames." |
900 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
901 (ediff-barf-if-not-control-buffer) |
11042 | 902 (let* ((wind-A (if (window-live-p ediff-window-A) ediff-window-A)) |
903 (wind-B (if (window-live-p ediff-window-B) ediff-window-B)) | |
904 (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
|
905 (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
|
906 (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
|
907 (frame-C (if wind-C (window-frame wind-C)))) |
11042 | 908 (if (or (eq frame-A frame-B) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
909 (not (frame-live-p frame-A)) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
910 (not (frame-live-p frame-B)) |
11042 | 911 (if ediff-3way-comparison-job |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
912 (or (not (frame-live-p frame-C)) |
11042 | 913 (eq frame-A frame-C) (eq frame-B frame-C)))) |
914 (setq ediff-split-window-function | |
915 (if (eq ediff-split-window-function 'split-window-vertically) | |
916 'split-window-horizontally | |
917 'split-window-vertically)) | |
918 (message "Buffers being compared are in different frames")) | |
919 (ediff-recenter 'no-rehighlight))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
920 |
11042 | 921 (defun ediff-toggle-hilit () |
922 "Switch between highlighting using ASCII flags and highlighting using faces. | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
923 On a dumb terminal, switches between ASCII highlighting and no highlighting." |
11042 | 924 (interactive) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
925 (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
|
926 |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
927 (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
|
928 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
|
929 ;; cycle through highlighting |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
930 (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
|
931 (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
|
932 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
|
933 (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
|
934 (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
|
935 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
|
936 ((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
|
937 (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
|
938 (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
|
939 (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
|
940 (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
|
941 (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
|
942 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
|
943 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
|
944 ((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
|
945 (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
|
946 (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
|
947 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
|
948 ((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
|
949 (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
|
950 (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
|
951 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
|
952 ediff-highlight-all-diffs t))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
953 |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
954 (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
|
955 (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
|
956 (ediff-paint-background-regions 'unhighlight)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
957 |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
958 (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
|
959 ediff-current-difference 'select-only)) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
960 |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
961 |
11042 | 962 (defun ediff-toggle-autorefine () |
963 "Toggle auto-refine mode." | |
964 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
965 (ediff-barf-if-not-control-buffer) |
11042 | 966 (if ediff-word-mode |
967 (error "No fine differences in this mode")) | |
968 (cond ((eq ediff-auto-refine 'nix) | |
969 (setq ediff-auto-refine 'on) | |
970 (ediff-make-fine-diffs ediff-current-difference 'noforce) | |
971 (message "Auto-refining is ON")) | |
972 ((eq ediff-auto-refine 'on) | |
973 (message "Auto-refining is OFF") | |
974 (setq ediff-auto-refine 'off)) | |
975 (t ;; nix 'em | |
976 (ediff-set-fine-diff-properties ediff-current-difference 'default) | |
977 (message "Refinements are HIDDEN") | |
978 (setq ediff-auto-refine 'nix)) | |
979 )) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
980 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
981 (defun ediff-show-ancestor () |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
982 "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
|
983 (interactive) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
984 (ediff-recenter) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
985 (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
|
986 (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
|
987 (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
|
988 (error "Not merging with ancestor"))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
989 (let (wind) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
990 (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
|
991 (raise-frame (window-frame wind))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
992 (t (set-window-buffer ediff-window-C ediff-ancestor-buffer))))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
993 |
11042 | 994 (defun ediff-make-or-kill-fine-diffs (arg) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
995 "Compute fine diffs. With negative prefix arg, kill fine diffs. |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
996 In both cases, operates on the current difference region." |
11042 | 997 (interactive "P") |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
998 (ediff-barf-if-not-control-buffer) |
11042 | 999 (cond ((eq arg '-) |
1000 (ediff-clear-fine-differences ediff-current-difference)) | |
1001 ((and (numberp arg) (< arg 0)) | |
1002 (ediff-clear-fine-differences ediff-current-difference)) | |
1003 (t (ediff-make-fine-diffs)))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1004 |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1005 |
11042 | 1006 (defun ediff-toggle-help () |
1007 "Toggle short/long help message." | |
1008 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1009 (ediff-barf-if-not-control-buffer) |
11042 | 1010 (let (buffer-read-only) |
1011 (erase-buffer) | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1012 (setq ediff-use-long-help-message (not ediff-use-long-help-message)) |
11042 | 1013 (ediff-set-help-message)) |
1014 ;; remember the icon status of the control frame when the user requested | |
1015 ;; full control message | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1016 (if (and ediff-use-long-help-message (ediff-multiframe-setup-p)) |
11042 | 1017 (setq ediff-prefer-iconified-control-frame |
1018 (ediff-frame-iconified-p ediff-control-frame))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1019 |
11042 | 1020 (setq ediff-window-config-saved "") ; force redisplay |
1021 (ediff-recenter 'no-rehighlight)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1022 |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1023 |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1024 ;; 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
|
1025 (defun ediff-toggle-read-only (&optional buf) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1026 "Toggle read-only in current buffer. |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1027 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
|
1028 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
|
1029 of the current buffer." |
11042 | 1030 (interactive) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1031 (ediff-barf-if-not-control-buffer) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1032 (let ((ctl-buf (if (null buf) (current-buffer))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1033 (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
|
1034 (or buf (ediff-recenter)) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1035 (or buf |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1036 (setq buf (ediff-get-buffer buf-type))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1037 |
19047 | 1038 (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
|
1039 (let* ((file (buffer-file-name buf)) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1040 (file-writable (and file |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1041 (file-exists-p file) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1042 (file-writable-p file))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1043 (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
|
1044 ((ediff-file-checked-out-p file) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1045 'toggle-read-only) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1046 (file-writable 'toggle-read-only) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1047 (t (key-binding "\C-x\C-q"))))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1048 ;; 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
|
1049 ;; 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
|
1050 ;; 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
|
1051 ;; user problem. |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1052 (if (and (ediff-file-checked-in-p file) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1053 ;; 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
|
1054 ;; 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
|
1055 ctl-buf) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1056 (cond ((not buffer-read-only) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1057 (setq toggle-ro-cmd 'toggle-read-only)) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1058 ((and (or (beep 1) t) ; always beep |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1059 (y-or-n-p |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1060 (format |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1061 "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
|
1062 (ediff-abbreviate-file-name file)))) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1063 ;; 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
|
1064 ;; 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
|
1065 ;; 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
|
1066 ;; 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
|
1067 ;; is checked in. |
19047 | 1068 (ediff-with-current-buffer ctl-buf |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1069 (ediff-change-saved-variable |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1070 'buffer-read-only nil buf-type))) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1071 (t |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1072 (setq toggle-ro-cmd 'toggle-read-only) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1073 (beep 1) (beep 1) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1074 (message |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1075 "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
|
1076 (sit-for 3)))) ; let the user see the warning |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1077 (if (and toggle-ro-cmd |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1078 (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
|
1079 (save-excursion |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1080 (save-window-excursion |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1081 (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
|
1082 (command-execute toggle-ro-cmd))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1083 (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
|
1084 |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1085 ;; 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
|
1086 ;; Signal a warning in this case. |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1087 (if (and file (not buffer-read-only) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1088 (eq this-command 'ediff-toggle-read-only) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1089 (file-exists-p file) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1090 (not (file-writable-p file))) |
53865
6a6dc234f296
(ediff-toggle-read-only): Remove extra format
Andreas Schwab <schwab@suse.de>
parents:
52828
diff
changeset
|
1091 (progn |
6a6dc234f296
(ediff-toggle-read-only): Remove extra format
Andreas Schwab <schwab@suse.de>
parents:
52828
diff
changeset
|
1092 (beep 1) |
6a6dc234f296
(ediff-toggle-read-only): Remove extra format
Andreas Schwab <schwab@suse.de>
parents:
52828
diff
changeset
|
1093 (message "Warning: file %s is read-only" |
6a6dc234f296
(ediff-toggle-read-only): Remove extra format
Andreas Schwab <schwab@suse.de>
parents:
52828
diff
changeset
|
1094 (ediff-abbreviate-file-name file)))) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1095 )))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1096 |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1097 ;; checkout if visited file is checked in |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1098 (defun ediff-maybe-checkout (buf) |
21940 | 1099 (let ((file (expand-file-name (buffer-file-name buf))) |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1100 (checkout-function (key-binding "\C-x\C-q"))) |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1101 (if (and (ediff-file-checked-in-p file) |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1102 (or (beep 1) t) |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1103 (y-or-n-p |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1104 (format |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1105 "File %s is under version control. Check it out? " |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1106 (ediff-abbreviate-file-name file)))) |
19047 | 1107 (ediff-with-current-buffer buf |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1108 (command-execute checkout-function))))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1109 |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1110 |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1111 ;; 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
|
1112 ;; 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
|
1113 ;; 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
|
1114 ;; able to read such a file anyway). |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1115 ;; FILE is a string representing file name |
21940 | 1116 ;;(defun ediff-file-under-version-control (file) |
1117 ;; (let* ((filedir (file-name-directory file)) | |
1118 ;; (file-nondir (file-name-nondirectory file)) | |
1119 ;; (trial (concat file-nondir ",v")) | |
1120 ;; (full-trial (concat filedir trial)) | |
1121 ;; (full-rcs-trial (concat filedir "RCS/" trial))) | |
1122 ;; (and (stringp file) | |
1123 ;; (file-exists-p file) | |
1124 ;; (or | |
1125 ;; (and | |
1126 ;; (file-exists-p full-trial) | |
1127 ;; ;; in FAT FS, `file,v' and `file' may turn out to be the same! | |
1128 ;; ;; don't be fooled by this! | |
1129 ;; (not (equal (file-attributes file) | |
1130 ;; (file-attributes full-trial)))) | |
1131 ;; ;; check if a version is in RCS/ directory | |
1132 ;; (file-exists-p full-rcs-trial))) | |
1133 ;; )) | |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1134 |
21940 | 1135 |
1136 (defsubst ediff-file-checked-out-p (file) | |
1137 (or (not (featurep 'vc-hooks)) | |
1138 (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
|
1139 (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
|
1140 (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
|
1141 (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
|
1142 ;; XEmacs has no vc-state |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
1143 (vc-locking-user file)) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
1144 ))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1145 |
21940 | 1146 (defsubst ediff-file-checked-in-p (file) |
1147 (and (featurep 'vc-hooks) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1148 ;; CVS files are considered not checked in |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1149 (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
|
1150 (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
|
1151 (and |
8e6ed5c1f142
2002-10-12 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
47520
diff
changeset
|
1152 (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
|
1153 (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
|
1154 ;; XEmacs has no vc-state |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
1155 (not (vc-locking-user file))) |
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
1156 )) |
21940 | 1157 |
1158 (defun ediff-file-compressed-p (file) | |
1159 (condition-case nil | |
1160 (require 'jka-compr) | |
1161 (error)) | |
1162 (if (featurep 'jka-compr) | |
1163 (string-match (jka-compr-build-file-regexp) file))) | |
1164 | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1165 |
11042 | 1166 (defun ediff-swap-buffers () |
1167 "Rotate the display of buffers A, B, and C." | |
1168 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1169 (ediff-barf-if-not-control-buffer) |
11042 | 1170 (if (and (window-live-p ediff-window-A) (window-live-p ediff-window-B)) |
1171 (let ((buf ediff-buffer-A) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1172 (values ediff-buffer-values-orig-A) |
11042 | 1173 (diff-vec ediff-difference-vector-A) |
1174 (hide-regexp ediff-regexp-hide-A) | |
1175 (focus-regexp ediff-regexp-focus-A) | |
1176 (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
|
1177 (overlay (if (ediff-has-face-support-p) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1178 ediff-current-diff-overlay-A))) |
11042 | 1179 (if ediff-3way-comparison-job |
1180 (progn | |
1181 (set-window-buffer ediff-window-A ediff-buffer-C) | |
1182 (set-window-buffer ediff-window-B ediff-buffer-A) | |
1183 (set-window-buffer ediff-window-C ediff-buffer-B) | |
1184 ) | |
1185 (set-window-buffer ediff-window-A ediff-buffer-B) | |
1186 (set-window-buffer ediff-window-B ediff-buffer-A)) | |
1187 ;; swap diff buffers | |
1188 (if ediff-3way-comparison-job | |
1189 (setq ediff-buffer-A ediff-buffer-C | |
1190 ediff-buffer-C ediff-buffer-B | |
1191 ediff-buffer-B buf) | |
1192 (setq ediff-buffer-A ediff-buffer-B | |
1193 ediff-buffer-B buf)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1194 |
11042 | 1195 ;; swap saved buffer characteristics |
1196 (if ediff-3way-comparison-job | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1197 (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
|
1198 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
|
1199 ediff-buffer-values-orig-B values) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1200 (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
|
1201 ediff-buffer-values-orig-B values)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1202 |
11042 | 1203 ;; swap diff vectors |
1204 (if ediff-3way-comparison-job | |
1205 (setq ediff-difference-vector-A ediff-difference-vector-C | |
1206 ediff-difference-vector-C ediff-difference-vector-B | |
1207 ediff-difference-vector-B diff-vec) | |
1208 (setq ediff-difference-vector-A ediff-difference-vector-B | |
1209 ediff-difference-vector-B diff-vec)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1210 |
11042 | 1211 ;; swap hide/focus regexp |
1212 (if ediff-3way-comparison-job | |
1213 (setq ediff-regexp-hide-A ediff-regexp-hide-C | |
1214 ediff-regexp-hide-C ediff-regexp-hide-B | |
1215 ediff-regexp-hide-B hide-regexp | |
1216 ediff-regexp-focus-A ediff-regexp-focus-C | |
1217 ediff-regexp-focus-C ediff-regexp-focus-B | |
1218 ediff-regexp-focus-B focus-regexp) | |
1219 (setq ediff-regexp-hide-A ediff-regexp-hide-B | |
1220 ediff-regexp-hide-B hide-regexp | |
1221 ediff-regexp-focus-A ediff-regexp-focus-B | |
1222 ediff-regexp-focus-B focus-regexp)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1223 |
11042 | 1224 ;; 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
|
1225 ;; 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
|
1226 (if (ediff-has-face-support-p) |
11042 | 1227 (if ediff-3way-comparison-job |
1228 (setq ediff-current-diff-overlay-A ediff-current-diff-overlay-C | |
1229 ediff-current-diff-overlay-C ediff-current-diff-overlay-B | |
1230 ediff-current-diff-overlay-B overlay) | |
1231 (setq ediff-current-diff-overlay-A ediff-current-diff-overlay-B | |
1232 ediff-current-diff-overlay-B overlay))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1233 |
11042 | 1234 ;; swap wide bounds |
1235 (setq ediff-wide-bounds | |
1236 (cond (ediff-3way-comparison-job | |
1237 (list (nth 2 ediff-wide-bounds) | |
1238 (nth 0 ediff-wide-bounds) | |
1239 (nth 1 ediff-wide-bounds))) | |
1240 (ediff-3way-job | |
1241 (list (nth 1 ediff-wide-bounds) | |
1242 (nth 0 ediff-wide-bounds) | |
1243 (nth 2 ediff-wide-bounds))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1244 (t |
11042 | 1245 (list (nth 1 ediff-wide-bounds) |
1246 (nth 0 ediff-wide-bounds))))) | |
1247 ;; swap narrow bounds | |
1248 (setq ediff-narrow-bounds | |
1249 (cond (ediff-3way-comparison-job | |
1250 (list (nth 2 ediff-narrow-bounds) | |
1251 (nth 0 ediff-narrow-bounds) | |
1252 (nth 1 ediff-narrow-bounds))) | |
1253 (ediff-3way-job | |
1254 (list (nth 1 ediff-narrow-bounds) | |
1255 (nth 0 ediff-narrow-bounds) | |
1256 (nth 2 ediff-narrow-bounds))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1257 (t |
11042 | 1258 (list (nth 1 ediff-narrow-bounds) |
1259 (nth 0 ediff-narrow-bounds))))) | |
1260 (if wide-visibility-p | |
1261 (setq ediff-visible-bounds ediff-wide-bounds) | |
1262 (setq ediff-visible-bounds ediff-narrow-bounds)) | |
1263 )) | |
1264 (if ediff-3way-job | |
1265 (ediff-set-state-of-all-diffs-in-all-buffers ediff-control-buffer)) | |
1266 (ediff-recenter 'no-rehighlight) | |
1267 ) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1268 |
11042 | 1269 |
1270 (defun ediff-toggle-wide-display () | |
1271 "Toggle wide/regular display. | |
1272 This is especially useful when comparing buffers side-by-side." | |
1273 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1274 (ediff-barf-if-not-control-buffer) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1275 (or (ediff-window-display-p) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1276 (error "%sEmacs is not running as a window application" |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1277 (if ediff-emacs-p "" "X"))) |
11042 | 1278 (ediff-recenter 'no-rehighlight) ; make sure buffs are displayed in windows |
1279 (let ((ctl-buf ediff-control-buffer)) | |
1280 (setq ediff-wide-display-p (not ediff-wide-display-p)) | |
1281 (if (not ediff-wide-display-p) | |
19047 | 1282 (ediff-with-current-buffer ctl-buf |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1283 (modify-frame-parameters |
11042 | 1284 ediff-wide-display-frame ediff-wide-display-orig-parameters) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1285 ;;(sit-for (if ediff-xemacs-p 0.4 0)) |
11042 | 1286 ;; restore control buf, since ctl window may have been deleted |
1287 ;; during resizing | |
1288 (set-buffer ctl-buf) | |
1289 (setq ediff-wide-display-orig-parameters nil | |
1290 ediff-window-B nil) ; force update of window config | |
1291 (ediff-recenter 'no-rehighlight)) | |
1292 (funcall ediff-make-wide-display-function) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1293 ;;(sit-for (if ediff-xemacs-p 0.4 0)) |
19047 | 1294 (ediff-with-current-buffer ctl-buf |
11042 | 1295 (setq ediff-window-B nil) ; force update of window config |
1296 (ediff-recenter 'no-rehighlight))))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1297 |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1298 ;;;###autoload |
11042 | 1299 (defun ediff-toggle-multiframe () |
18054 | 1300 "Switch from multiframe display to single-frame display and back. |
1301 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
|
1302 which see." |
11042 | 1303 (interactive) |
18054 | 1304 (let (window-setup-func) |
1305 (or (ediff-window-display-p) | |
1306 (error "%sEmacs is not running as a window application" | |
1307 (if ediff-emacs-p "" "X"))) | |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1308 |
11042 | 1309 (cond ((eq ediff-window-setup-function 'ediff-setup-windows-multiframe) |
18054 | 1310 (setq window-setup-func 'ediff-setup-windows-plain)) |
11042 | 1311 ((eq ediff-window-setup-function 'ediff-setup-windows-plain) |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1312 (if (ediff-in-control-buffer-p) |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1313 (ediff-kill-bottom-toolbar)) |
18054 | 1314 (setq window-setup-func 'ediff-setup-windows-multiframe))) |
1315 | |
1316 ;; change default | |
1317 (setq-default ediff-window-setup-function window-setup-func) | |
1318 ;; change in all active ediff sessions | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1319 (mapcar (lambda(buf) (ediff-with-current-buffer buf |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1320 (setq ediff-window-setup-function window-setup-func |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1321 ediff-window-B nil))) |
18054 | 1322 ediff-session-registry) |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1323 (if (ediff-in-control-buffer-p) |
18054 | 1324 (ediff-recenter 'no-rehighlight)))) |
1325 | |
1326 | |
1327 ;;;###autoload | |
1328 (defun ediff-toggle-use-toolbar () | |
1329 "Enable or disable Ediff toolbar. | |
1330 Works only in versions of Emacs that support toolbars. | |
1331 To change the default, set the variable `ediff-use-toolbar-p', which see." | |
1332 (interactive) | |
1333 (if (featurep 'ediff-tbar) | |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1334 (progn |
18054 | 1335 (or (ediff-window-display-p) |
1336 (error "%sEmacs is not running as a window application" | |
1337 (if ediff-emacs-p "" "X"))) | |
1338 (if (ediff-use-toolbar-p) | |
1339 (ediff-kill-bottom-toolbar)) | |
1340 ;; do this only after killing the toolbar | |
1341 (setq ediff-use-toolbar-p (not ediff-use-toolbar-p)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1342 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1343 (mapcar (lambda(buf) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1344 (ediff-with-current-buffer buf |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1345 ;; force redisplay |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1346 (setq ediff-window-config-saved "") |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1347 )) |
18054 | 1348 ediff-session-registry) |
1349 (if (ediff-in-control-buffer-p) | |
1350 (ediff-recenter 'no-rehighlight))))) | |
1351 | |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1352 |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1353 ;; if was using toolbar, kill it |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1354 (defun ediff-kill-bottom-toolbar () |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1355 ;; 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
|
1356 ;; work properly in XEmacs 19.14: we have to use |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1357 ;;(selected-frame). |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1358 ;; The problem with this is that any previous bottom-toolbar |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1359 ;; 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
|
1360 ;; to do "push" and "pop" toolbars ? --marcpa |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1361 (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
|
1362 (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
|
1363 (progn ; xemacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1364 (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
|
1365 (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
|
1366 nil ; emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1367 ) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1368 )) |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1369 |
18054 | 1370 ;; If wants to use toolbar, make it. |
1371 ;; If not, zero the toolbar for XEmacs. | |
1372 ;; Do nothing for Emacs. | |
1373 (defun ediff-make-bottom-toolbar (&optional frame) | |
1374 (if (ediff-window-display-p) | |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
1375 (progn |
18054 | 1376 (setq frame (or frame (selected-frame))) |
1377 (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
|
1378 (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
|
1379 (progn ; xemacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1380 (set-specifier |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1381 bottom-toolbar |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1382 (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
|
1383 ediff-toolbar-3way ediff-toolbar))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1384 (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
|
1385 (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
|
1386 (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
|
1387 nil ; emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1388 ) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1389 ) |
21940 | 1390 ((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
|
1391 (ediff-cond-compile-for-xemacs-or-emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1392 (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
|
1393 nil ; emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1394 ) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
1395 ) |
18054 | 1396 )) |
1397 )) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1398 |
11042 | 1399 ;; Merging |
1400 | |
1401 (defun ediff-toggle-show-clashes-only () | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1402 "Toggle the mode that shows only the merge regions where both variants differ from the ancestor." |
11042 | 1403 (interactive) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1404 (ediff-barf-if-not-control-buffer) |
11042 | 1405 (if (not ediff-merge-with-ancestor-job) |
1406 (error "This command makes sense only when merging with an ancestor")) | |
1407 (setq ediff-show-clashes-only (not ediff-show-clashes-only)) | |
1408 (if ediff-show-clashes-only | |
1409 (message "Focus on regions where both buffers differ from the ancestor") | |
1410 (message "Canceling focus on regions where changes clash"))) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1411 |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1412 (defun ediff-toggle-skip-changed-regions () |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1413 "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
|
1414 (interactive) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1415 (ediff-barf-if-not-control-buffer) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1416 (setq ediff-skip-merge-regions-that-differ-from-default |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1417 (not ediff-skip-merge-regions-that-differ-from-default)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1418 (if ediff-skip-merge-regions-that-differ-from-default |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1419 (message "Skipping regions that differ from default setting") |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1420 (message "Showing regions that differ from default setting"))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1421 |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1422 |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1423 |
11042 | 1424 ;; Widening/narrowing |
1425 | |
1426 (defun ediff-toggle-narrow-region () | |
1427 "Toggle narrowing in buffers A, B, and C. | |
1428 Used in ediff-windows/regions only." | |
1429 (interactive) | |
1430 (if (eq ediff-buffer-A ediff-buffer-B) | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1431 (error ediff-NO-DIFFERENCES)) |
11042 | 1432 (if (eq ediff-visible-bounds ediff-wide-bounds) |
1433 (setq ediff-visible-bounds ediff-narrow-bounds) | |
1434 (setq ediff-visible-bounds ediff-wide-bounds)) | |
1435 (ediff-recenter 'no-rehighlight)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1436 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1437 ;; Narrow bufs A/B/C to ediff-visible-bounds. If this is currently set to |
11042 | 1438 ;; ediff-wide-bounds, then this actually widens. |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1439 ;; This function does nothing if job-name is not |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1440 ;; ediff-regions-wordwise/linewise or ediff-windows-wordwise/linewise. |
11042 | 1441 ;; Does nothing if buffer-A = buffer-B since we can't narrow |
1442 ;; to two different regions in one buffer. | |
1443 (defun ediff-visible-region () | |
1444 (if (or (eq ediff-buffer-A ediff-buffer-B) | |
1445 (eq ediff-buffer-A ediff-buffer-C) | |
1446 (eq ediff-buffer-C ediff-buffer-B)) | |
1447 () | |
1448 ;; If ediff-*-regions/windows, ediff-visible-bounds is already set | |
1449 ;; Otherwise, always use full range. | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1450 (if (not ediff-narrow-job) |
11042 | 1451 (setq ediff-visible-bounds ediff-wide-bounds)) |
1452 (let ((overl-A (ediff-get-value-according-to-buffer-type | |
1453 'A ediff-visible-bounds)) | |
1454 (overl-B (ediff-get-value-according-to-buffer-type | |
1455 'B ediff-visible-bounds)) | |
1456 (overl-C (ediff-get-value-according-to-buffer-type | |
1457 'C ediff-visible-bounds)) | |
1458 ) | |
19047 | 1459 (ediff-with-current-buffer ediff-buffer-A |
20206 | 1460 (if (ediff-overlay-buffer overl-A) |
1461 (narrow-to-region | |
1462 (ediff-overlay-start overl-A) (ediff-overlay-end overl-A)))) | |
19047 | 1463 (ediff-with-current-buffer ediff-buffer-B |
20206 | 1464 (if (ediff-overlay-buffer overl-B) |
1465 (narrow-to-region | |
1466 (ediff-overlay-start overl-B) (ediff-overlay-end overl-B)))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1467 |
20206 | 1468 (if (and ediff-3way-job (ediff-overlay-buffer overl-C)) |
19047 | 1469 (ediff-with-current-buffer ediff-buffer-C |
11042 | 1470 (narrow-to-region |
1471 (ediff-overlay-start overl-C) (ediff-overlay-end overl-C)))) | |
1472 ))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1473 |
11042 | 1474 |
1475 ;; Window scrolling operations | |
1476 | |
1477 ;; Performs some operation on the two file windows (if they are showing). | |
1478 ;; Traps all errors on the operation in windows A/B/C. | |
1479 ;; Usually, errors come from scrolling off the | |
1480 ;; beginning or end of the buffer, and this gives error messages. | |
1481 (defun ediff-operate-on-windows (operation arg) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1482 |
11042 | 1483 ;; make sure windows aren't dead |
1484 (if (not (and (window-live-p ediff-window-A) (window-live-p ediff-window-B))) | |
1485 (ediff-recenter 'no-rehighlight)) | |
1486 (if (not (and (ediff-buffer-live-p ediff-buffer-A) | |
1487 (ediff-buffer-live-p ediff-buffer-B) | |
1488 (or (not ediff-3way-job) ediff-buffer-C) | |
1489 )) | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1490 (error ediff-KILLED-VITAL-BUFFER)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1491 |
11042 | 1492 (let* ((wind (selected-window)) |
1493 (wind-A ediff-window-A) | |
1494 (wind-B ediff-window-B) | |
1495 (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
|
1496 (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
|
1497 (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
|
1498 (three-way ediff-3way-job) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1499 (coefC (if three-way |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1500 (ediff-get-region-size-coefficient 'C operation)))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1501 |
11042 | 1502 (select-window wind-A) |
1503 (condition-case nil | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1504 (funcall operation (round (* coefA arg))) |
11042 | 1505 (error)) |
1506 (select-window wind-B) | |
1507 (condition-case nil | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1508 (funcall operation (round (* coefB arg))) |
11042 | 1509 (error)) |
1510 (if three-way | |
1511 (progn | |
1512 (select-window wind-C) | |
1513 (condition-case nil | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1514 (funcall operation (round (* coefC arg))) |
11042 | 1515 (error)))) |
1516 (select-window wind))) | |
1517 | |
1518 (defun ediff-scroll-vertically (&optional arg) | |
1519 "Vertically scroll buffers A, B \(and C if appropriate\). | |
1520 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
|
1521 the one half of the height of window-A." |
11042 | 1522 (interactive "P") |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1523 (ediff-barf-if-not-control-buffer) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1524 |
11042 | 1525 ;; make sure windows aren't dead |
1526 (if (not (and (window-live-p ediff-window-A) (window-live-p ediff-window-B))) | |
1527 (ediff-recenter 'no-rehighlight)) | |
1528 (if (not (and (ediff-buffer-live-p ediff-buffer-A) | |
1529 (ediff-buffer-live-p ediff-buffer-B) | |
1530 (or (not ediff-3way-job) | |
1531 (ediff-buffer-live-p ediff-buffer-C)) | |
1532 )) | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1533 (error ediff-KILLED-VITAL-BUFFER)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1534 |
11042 | 1535 (ediff-operate-on-windows |
1536 (if (memq last-command-char '(?v ?\C-v)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1537 'scroll-up |
11042 | 1538 'scroll-down) |
1539 ;; calculate argument to scroll-up/down | |
1540 ;; if there is an explicit argument | |
1541 (if (and arg (not (equal arg '-))) | |
1542 ;; use it | |
1543 (prefix-numeric-value arg) | |
1544 ;; 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
|
1545 (let (default-amount) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1546 (setq default-amount |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1547 (- (/ (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
|
1548 (window-height ediff-window-B) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1549 (if ediff-3way-job |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1550 (window-height ediff-window-C) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1551 500)) ; some large number |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1552 2) |
11042 | 1553 1 next-screen-context-lines)) |
1554 ;; window found | |
1555 (if arg | |
1556 ;; C-u as argument means half of default amount | |
1557 (/ default-amount 2) | |
1558 ;; no argument means default amount | |
1559 default-amount))))) | |
1560 | |
1561 | |
1562 (defun ediff-scroll-horizontally (&optional arg) | |
1563 "Horizontally scroll buffers A, B \(and C if appropriate\). | |
1564 If an argument is given, that is how many columns are scrolled, else nearly | |
1565 the width of the A/B/C windows." | |
1566 (interactive "P") | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1567 (ediff-barf-if-not-control-buffer) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1568 |
11042 | 1569 ;; make sure windows aren't dead |
1570 (if (not (and (window-live-p ediff-window-A) (window-live-p ediff-window-B))) | |
1571 (ediff-recenter 'no-rehighlight)) | |
1572 (if (not (and (ediff-buffer-live-p ediff-buffer-A) | |
1573 (ediff-buffer-live-p ediff-buffer-B) | |
1574 (or (not ediff-3way-job) | |
1575 (ediff-buffer-live-p ediff-buffer-C)) | |
1576 )) | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1577 (error ediff-KILLED-VITAL-BUFFER)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1578 |
11042 | 1579 (ediff-operate-on-windows |
36456
1474cd438ac1
(ediff-scroll-horizontally): Arrange for
Gerd Moellmann <gerd@gnu.org>
parents:
36043
diff
changeset
|
1580 ;; Arrange for scroll-left and scroll-right being called |
1474cd438ac1
(ediff-scroll-horizontally): Arrange for
Gerd Moellmann <gerd@gnu.org>
parents:
36043
diff
changeset
|
1581 ;; 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
|
1582 ;; Otherwise, automatic hscrolling will undo the effect of |
1474cd438ac1
(ediff-scroll-horizontally): Arrange for
Gerd Moellmann <gerd@gnu.org>
parents:
36043
diff
changeset
|
1583 ;; hscrolling. |
11042 | 1584 (if (= last-command-char ?<) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1585 (lambda (arg) |
36456
1474cd438ac1
(ediff-scroll-horizontally): Arrange for
Gerd Moellmann <gerd@gnu.org>
parents:
36043
diff
changeset
|
1586 (let ((prefix-arg arg)) |
1474cd438ac1
(ediff-scroll-horizontally): Arrange for
Gerd Moellmann <gerd@gnu.org>
parents:
36043
diff
changeset
|
1587 (call-interactively 'scroll-left))) |
1474cd438ac1
(ediff-scroll-horizontally): Arrange for
Gerd Moellmann <gerd@gnu.org>
parents:
36043
diff
changeset
|
1588 (lambda (arg) |
1474cd438ac1
(ediff-scroll-horizontally): Arrange for
Gerd Moellmann <gerd@gnu.org>
parents:
36043
diff
changeset
|
1589 (let ((prefix-arg arg)) |
1474cd438ac1
(ediff-scroll-horizontally): Arrange for
Gerd Moellmann <gerd@gnu.org>
parents:
36043
diff
changeset
|
1590 (call-interactively 'scroll-right)))) |
11042 | 1591 ;; calculate argument to scroll-left/right |
1592 ;; if there is an explicit argument | |
1593 (if (and arg (not (equal arg '-))) | |
1594 ;; use it | |
1595 (prefix-numeric-value arg) | |
1596 ;; if not, see if we can determine a default amount | |
1597 ;; (half the window width) | |
1598 (if (null ediff-control-window) | |
1599 ;; no control window, use nil | |
1600 nil | |
1601 (let ((default-amount | |
1602 (- (/ (min (window-width ediff-window-A) | |
1603 (window-width ediff-window-B) | |
1604 (if ediff-3way-comparison-job | |
1605 (window-width ediff-window-C) | |
1606 500) ; some large number | |
1607 ) | |
1608 2) | |
1609 3))) | |
1610 ;; window found | |
1611 (if arg | |
1612 ;; C-u as argument means half of default amount | |
1613 (/ default-amount 2) | |
1614 ;; no argument means default amount | |
1615 default-amount)))))) | |
1616 | |
1617 | |
1618 ;;BEG, END show the region to be positioned. | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1619 ;;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
|
1620 ;;differently. |
11042 | 1621 (defun ediff-position-region (beg end pos job-name) |
1622 (if (> end (point-max)) | |
1623 (setq end (point-max))) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1624 (if ediff-windows-job |
11042 | 1625 (if (pos-visible-in-window-p end) |
1626 () ; do nothing, wind is already positioned | |
1627 ;; at this point, windows are positioned at the beginning of the | |
1628 ;; file regions (not diff-regions) being compared. | |
1629 (save-excursion | |
1630 (move-to-window-line (- (window-height) 2)) | |
1631 (let ((amount (+ 2 (count-lines (point) end)))) | |
1632 (scroll-up amount)))) | |
1633 (set-window-start (selected-window) beg) | |
1634 (if (pos-visible-in-window-p end) | |
1635 ;; 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
|
1636 (let ((lines 0) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1637 (prev-point 0)) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1638 (while ( and (> end (progn |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1639 (move-to-window-line lines) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1640 (point))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1641 ;; `end' may be beyond the window bottom, so check |
14040 | 1642 ;; that we are making progress |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1643 (< prev-point (point))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1644 (setq prev-point (point)) |
11042 | 1645 (setq lines (1+ lines))) |
1646 ;; And position the beginning on the right line | |
1647 (goto-char beg) | |
1648 (recenter (/ (1+ (max (- (1- (window-height (selected-window))) | |
1649 lines) | |
1650 1) | |
1651 ) | |
1652 2)))) | |
1653 (goto-char pos) | |
1654 )) | |
1655 | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1656 ;; 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
|
1657 (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
|
1658 (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
|
1659 (or ctl-buf (setq ctl-buf ediff-control-buffer)) |
19047 | 1660 (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
|
1661 (let* ((buf (ediff-get-buffer buf-type)) |
19047 | 1662 (wind (eval (ediff-get-symbol-from-alist |
1663 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
|
1664 (beg (window-start wind)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1665 (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
|
1666 lines) |
19047 | 1667 (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
|
1668 (if (< beg end) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1669 (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
|
1670 (setq lines 0)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1671 lines |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1672 )))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1673 |
21940 | 1674 ;; Calculate the number of lines from window end to the start of diff region |
1675 (defun ediff-get-lines-to-region-start (buf-type &optional diff-num ctl-buf) | |
1676 (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
|
1677 (or ctl-buf (setq ctl-buf ediff-control-buffer)) |
19047 | 1678 (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
|
1679 (let* ((buf (ediff-get-buffer buf-type)) |
19047 | 1680 (wind (eval (ediff-get-symbol-from-alist |
1681 buf-type ediff-window-alist))) | |
21940 | 1682 (end (or (window-end wind) (window-end wind t))) |
1683 (beg (ediff-get-diff-posn buf-type 'beg diff-num))) | |
19047 | 1684 (ediff-with-current-buffer buf |
21940 | 1685 (if (< beg end) |
1686 (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
|
1687 ))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1688 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1689 |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1690 ;; 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
|
1691 ;; up/down of the window displaying buffer of type BUFTYPE. |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1692 ;; 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
|
1693 ;; 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
|
1694 ;; still seen. |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1695 ;; |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1696 ;; 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
|
1697 (defun ediff-get-region-size-coefficient (buf-type op &optional n ctl-buf) |
19047 | 1698 (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
|
1699 (if (ediff-valid-difference-p n) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1700 (let* ((func (cond ((eq op 'scroll-down) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1701 'ediff-get-lines-to-region-start) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1702 ((eq op 'scroll-up) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1703 'ediff-get-lines-to-region-end) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1704 (t '(lambda (a b c) 0)))) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1705 (max-lines (max (funcall func 'A n ctl-buf) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1706 (funcall func 'B n ctl-buf) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1707 (if (ediff-buffer-live-p ediff-buffer-C) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1708 (funcall func 'C n ctl-buf) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1709 0)))) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1710 ;; this covers the horizontal coefficient as well: |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1711 ;; if max-lines = 0 then coef = 1 |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1712 (if (> max-lines 0) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1713 (/ (+ (funcall func buf-type n ctl-buf) 0.0) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1714 (+ max-lines 0.0)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1715 1)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1716 1))) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1717 |
11042 | 1718 |
1719 (defun ediff-next-difference (&optional arg) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1720 "Advance to the next difference. |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1721 With a prefix argument, go forward that many differences." |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1722 (interactive "p") |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1723 (ediff-barf-if-not-control-buffer) |
11042 | 1724 (if (< ediff-current-difference ediff-number-of-differences) |
1725 (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
|
1726 (+ ediff-current-difference (or arg 1)))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1727 non-clash-skip skip-changed regexp-skip) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1728 |
18054 | 1729 (ediff-visible-region) |
11042 | 1730 (or (>= n ediff-number-of-differences) |
1731 (setq regexp-skip (funcall ediff-skip-diff-region-function n)) | |
20003 | 1732 ;; 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
|
1733 (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
|
1734 skip-changed |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1735 (ediff-skip-merge-region-if-changed-from-default-p n)) |
11042 | 1736 (ediff-install-fine-diff-if-necessary n)) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1737 ;; Skip loop |
11042 | 1738 (while (and (< n ediff-number-of-differences) |
1739 (or | |
1740 ;; regexp skip | |
1741 regexp-skip | |
1742 ;; skip clashes, if necessary | |
20003 | 1743 non-clash-skip |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1744 ;; skip processed regions |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1745 skip-changed |
11042 | 1746 ;; skip difference regions that differ in white space |
1747 (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
|
1748 (ediff-merge-region-is-non-clash n) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1749 (or (eq (ediff-no-fine-diffs-p n) t) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1750 (and (ediff-merge-job) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1751 (eq (ediff-no-fine-diffs-p n) 'C))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1752 ))) |
11042 | 1753 (setq n (1+ n)) |
1754 (if (= 0 (mod n 20)) | |
1755 (message "Skipped over region %d and counting ..." n)) | |
1756 (or (>= n ediff-number-of-differences) | |
1757 (setq regexp-skip (funcall ediff-skip-diff-region-function n)) | |
20003 | 1758 ;; 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
|
1759 (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
|
1760 skip-changed |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1761 (ediff-skip-merge-region-if-changed-from-default-p n)) |
11042 | 1762 (ediff-install-fine-diff-if-necessary n)) |
1763 ) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1764 (message "") |
11042 | 1765 (ediff-unselect-and-select-difference n) |
1766 ) ; let | |
1767 (ediff-visible-region) | |
1768 (error "At end of the difference list"))) | |
1769 | |
1770 (defun ediff-previous-difference (&optional arg) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1771 "Go to the previous difference. |
11042 | 1772 With a prefix argument, go back that many differences." |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1773 (interactive "p") |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1774 (ediff-barf-if-not-control-buffer) |
11042 | 1775 (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
|
1776 (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
|
1777 non-clash-skip skip-changed regexp-skip) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1778 |
18054 | 1779 (ediff-visible-region) |
11042 | 1780 (or (< n 0) |
1781 (setq regexp-skip (funcall ediff-skip-diff-region-function n)) | |
20003 | 1782 ;; 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
|
1783 (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
|
1784 skip-changed |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1785 (ediff-skip-merge-region-if-changed-from-default-p n)) |
11042 | 1786 (ediff-install-fine-diff-if-necessary n)) |
1787 (while (and (> n -1) | |
1788 (or | |
1789 ;; regexp skip | |
1790 regexp-skip | |
1791 ;; skip clashes, if necessary | |
20003 | 1792 non-clash-skip |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1793 ;; skipp changed regions |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1794 skip-changed |
11042 | 1795 ;; skip difference regions that differ in white space |
1796 (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
|
1797 (ediff-merge-region-is-non-clash n) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1798 (or (eq (ediff-no-fine-diffs-p n) t) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1799 (and (ediff-merge-job) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1800 (eq (ediff-no-fine-diffs-p n) 'C))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1801 ))) |
11042 | 1802 (if (= 0 (mod (1+ n) 20)) |
1803 (message "Skipped over region %d and counting ..." (1+ n))) | |
1804 (setq n (1- n)) | |
1805 (or (< n 0) | |
1806 (setq regexp-skip (funcall ediff-skip-diff-region-function n)) | |
20003 | 1807 ;; 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
|
1808 (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
|
1809 skip-changed |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1810 (ediff-skip-merge-region-if-changed-from-default-p n)) |
11042 | 1811 (ediff-install-fine-diff-if-necessary n)) |
1812 ) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1813 (message "") |
11042 | 1814 (ediff-unselect-and-select-difference n) |
1815 ) ; let | |
1816 (ediff-visible-region) | |
1817 (error "At beginning of the difference list"))) | |
1818 | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1819 ;; 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
|
1820 ;; representation) |
11042 | 1821 (defun ediff-jump-to-difference (difference-number) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1822 "Go to the difference specified as a prefix argument. |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1823 If the prefix is negative, count differences from the end." |
11042 | 1824 (interactive "p") |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1825 (ediff-barf-if-not-control-buffer) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1826 (setq difference-number |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1827 (cond ((< difference-number 0) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1828 (+ ediff-number-of-differences difference-number)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1829 ((> difference-number 0) (1- difference-number)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1830 (t -1))) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1831 ;; -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
|
1832 ;; position before the first one. |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1833 (if (and (>= difference-number -1) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1834 (<= difference-number ediff-number-of-differences)) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1835 (ediff-unselect-and-select-difference difference-number) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1836 (error ediff-BAD-DIFF-NUMBER |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1837 this-command (1+ difference-number) ediff-number-of-differences))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1838 |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1839 (defun ediff-jump-to-difference-at-point (arg) |
11042 | 1840 "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
|
1841 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
|
1842 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
|
1843 A is used. |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1844 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
|
1845 in the specified buffer." |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1846 (interactive "P") |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1847 (ediff-barf-if-not-control-buffer) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1848 (let* ((buf-type (ediff-char-to-buftype last-command-char)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1849 (buffer (ediff-get-buffer buf-type)) |
19047 | 1850 (pt (ediff-with-current-buffer buffer (point))) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1851 (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
|
1852 (past-last-diff (< ediff-number-of-differences diff-no)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1853 (beg (if past-last-diff |
19047 | 1854 (ediff-with-current-buffer buffer (point-max)) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1855 (ediff-get-diff-posn buf-type 'beg (1- diff-no)))) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1856 ctl-wind wind-A wind-B wind-C |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1857 shift) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1858 (if past-last-diff |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1859 (ediff-jump-to-difference -1) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1860 (ediff-jump-to-difference diff-no)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1861 (setq ctl-wind (selected-window) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1862 wind-A ediff-window-A |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1863 wind-B ediff-window-B |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1864 wind-C ediff-window-C) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1865 (if arg |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1866 (progn |
19047 | 1867 (ediff-with-current-buffer buffer |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1868 (setq shift (- beg pt))) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1869 (select-window wind-A) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1870 (if past-last-diff (goto-char (point-max))) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1871 (condition-case nil |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1872 (backward-char shift) ; noerror, if beginning of buffer |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1873 (error)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1874 (recenter) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1875 (select-window wind-B) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1876 (if past-last-diff (goto-char (point-max))) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1877 (condition-case nil |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1878 (backward-char shift) ; noerror, if beginning of buffer |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1879 (error)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1880 (recenter) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1881 (if (window-live-p wind-C) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1882 (progn |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1883 (select-window wind-C) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1884 (if past-last-diff (goto-char (point-max))) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1885 (condition-case nil |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1886 (backward-char shift) ; noerror, if beginning of buffer |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1887 (error)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1888 (recenter) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1889 )) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1890 (select-window ctl-wind) |
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 )) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1893 |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1894 |
11042 | 1895 ;; 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
|
1896 ;; 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
|
1897 ;; representation) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1898 ;; 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
|
1899 ;; 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
|
1900 ;; 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
|
1901 (defun ediff-diff-at-point (buf-type &optional pos which-diff) |
11042 | 1902 (let ((buffer (ediff-get-buffer buf-type)) |
1903 (ctl-buffer ediff-control-buffer) | |
1904 (max-dif-num (1- ediff-number-of-differences)) | |
1905 (diff-no -1) | |
1906 (prev-beg 0) | |
1907 (prev-end 0) | |
1908 (beg 0) | |
1909 (end 0)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1910 |
19047 | 1911 (ediff-with-current-buffer buffer |
11042 | 1912 (setq pos (or pos (point))) |
1913 (while (and (or (< pos prev-beg) (> pos beg)) | |
1914 (< diff-no max-dif-num)) | |
1915 (setq diff-no (1+ diff-no)) | |
1916 (setq prev-beg beg | |
1917 prev-end end) | |
1918 (setq beg (ediff-get-diff-posn buf-type 'beg diff-no ctl-buffer) | |
1919 end (ediff-get-diff-posn buf-type 'end diff-no ctl-buffer)) | |
1920 ) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
1921 |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1922 ;; 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
|
1923 (if (and (memq which-diff '(after before)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1924 (> pos beg) (= diff-no max-dif-num)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1925 (setq diff-no (1+ diff-no))) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1926 |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1927 (cond ((eq which-diff 'after) (1+ diff-no)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1928 ((eq which-diff 'before) diff-no) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1929 ((< (abs (count-lines pos (max 1 prev-end))) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1930 (abs (count-lines pos (max 1 beg)))) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1931 diff-no) ; choose prev difference |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1932 (t |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1933 (1+ diff-no))) ; choose next difference |
11042 | 1934 ))) |
1935 | |
1936 | |
1937 ;;; Copying diffs. | |
1938 | |
1939 (defun ediff-diff-to-diff (arg &optional keys) | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1940 "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
|
1941 If numerical prefix argument, copy the difference specified in the arg. |
11042 | 1942 Otherwise, copy the difference given by `ediff-current-difference'. |
1943 This command assumes it is bound to a 2-character key sequence, `ab', `ba', | |
1944 `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
|
1945 copying difference regions. The first character in the sequence specifies |
11042 | 1946 the source buffer and the second specifies the target. |
1947 | |
1948 If the second optional argument, a 2-character string, is given, use it to | |
1949 determine the source and the target buffers instead of the command keys." | |
1950 (interactive "P") | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1951 (ediff-barf-if-not-control-buffer) |
11042 | 1952 (or keys (setq keys (this-command-keys))) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1953 (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
|
1954 (if (numberp arg) (ediff-jump-to-difference arg)) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
1955 |
11042 | 1956 (let* ((key1 (aref keys 0)) |
1957 (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
|
1958 (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
|
1959 (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
|
1960 ediff-verbose-p) |
11042 | 1961 (ediff-copy-diff ediff-current-difference |
1962 (ediff-char-to-buftype char1) | |
1963 (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
|
1964 ;; 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
|
1965 (ediff-recenter))) |
11042 | 1966 |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1967 (defun ediff-copy-A-to-B (arg) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1968 "Copy ARGth difference region from buffer A to B. |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1969 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
|
1970 (interactive "P") |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1971 (ediff-diff-to-diff arg "ab")) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1972 |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1973 (defun ediff-copy-B-to-A (arg) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1974 "Copy ARGth difference region from buffer B to A. |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1975 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
|
1976 (interactive "P") |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1977 (ediff-diff-to-diff arg "ba")) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1978 |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1979 (defun ediff-copy-A-to-C (arg) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1980 "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
|
1981 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
|
1982 (interactive "P") |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1983 (ediff-diff-to-diff arg "ac")) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1984 |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1985 (defun ediff-copy-B-to-C (arg) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1986 "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
|
1987 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
|
1988 (interactive "P") |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1989 (ediff-diff-to-diff arg "bc")) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1990 |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1991 (defun ediff-copy-C-to-B (arg) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1992 "Copy ARGth difference region from buffer C to B. |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1993 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
|
1994 (interactive "P") |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1995 (ediff-diff-to-diff arg "cb")) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1996 |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1997 (defun ediff-copy-C-to-A (arg) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
1998 "Copy ARGth difference region from buffer C to A. |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
1999 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
|
2000 (interactive "P") |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2001 (ediff-diff-to-diff arg "ca")) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2002 |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2003 |
11042 | 2004 |
2005 ;; Copy diff N from FROM-BUF-TYPE \(given as A, B or C\) to TO-BUF-TYPE. | |
2006 ;; 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
|
2007 ;; target diff. This is used in merging, when constructing the merged |
11042 | 2008 ;; version. |
2009 (defun ediff-copy-diff (n from-buf-type to-buf-type | |
2010 &optional batch-invocation reg-to-copy) | |
2011 (let* ((to-buf (ediff-get-buffer to-buf-type)) | |
2012 ;;(from-buf (if (not reg-to-copy) (ediff-get-buffer from-buf-type))) | |
2013 (ctrl-buf ediff-control-buffer) | |
2014 (saved-p t) | |
2015 (three-way ediff-3way-job) | |
2016 messg | |
2017 ediff-verbose-p | |
2018 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
|
2019 |
11042 | 2020 (setq reg-to-delete-beg |
2021 (ediff-get-diff-posn to-buf-type 'beg n ctrl-buf)) | |
2022 (setq reg-to-delete-end | |
2023 (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
|
2024 |
11042 | 2025 (if reg-to-copy |
2026 (setq from-buf-type nil) | |
2027 (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
|
2028 |
11042 | 2029 (setq reg-to-delete (ediff-get-region-contents |
2030 n to-buf-type ctrl-buf | |
2031 reg-to-delete-beg reg-to-delete-end)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2032 |
11042 | 2033 (if (string= reg-to-delete reg-to-copy) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2034 (setq saved-p nil) ; don't copy identical buffers |
11042 | 2035 ;; seems ok to copy |
2036 (if (or batch-invocation (ediff-test-save-region n to-buf-type)) | |
2037 (condition-case conds | |
2038 (progn | |
19047 | 2039 (ediff-with-current-buffer to-buf |
11042 | 2040 ;; 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
|
2041 (let ((inhibit-read-only (null buffer-read-only))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2042 |
11042 | 2043 (goto-char reg-to-delete-end) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2044 (insert reg-to-copy) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2045 |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2046 (if (> reg-to-delete-end reg-to-delete-beg) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2047 (kill-region reg-to-delete-beg reg-to-delete-end)) |
11042 | 2048 )) |
2049 (or batch-invocation | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2050 (setq |
11042 | 2051 messg |
2052 (ediff-save-diff-region n to-buf-type reg-to-delete)))) | |
2053 (error (message "ediff-copy-diff: %s %s" | |
2054 (car conds) | |
2055 (mapconcat 'prin1-to-string (cdr conds) " ")) | |
2056 (beep 1) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2057 (sit-for 2) ; let the user see the error msg |
11042 | 2058 (setq saved-p nil) |
2059 ))) | |
2060 ) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2061 |
11042 | 2062 ;; adjust state of difference in case 3-way and diff was copied ok |
2063 (if (and saved-p three-way) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2064 (ediff-set-state-of-diff-in-all-buffers n ctrl-buf)) |
11042 | 2065 |
2066 (if batch-invocation | |
2067 (ediff-clear-fine-differences n) | |
2068 ;; If diff3 job, we should recompute fine diffs so we clear them | |
2069 ;; before reinserting flags (and thus before ediff-recenter). | |
2070 (if (and saved-p three-way) | |
2071 (ediff-clear-fine-differences n)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2072 |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2073 (ediff-refresh-mode-lines) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2074 |
11042 | 2075 ;; 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
|
2076 ;; aren't any. So we clear diffs after ediff-recenter. |
11042 | 2077 (if (and saved-p (not three-way)) |
2078 (ediff-clear-fine-differences n)) | |
2079 ;; Make sure that the message about saving and how to restore is seen | |
2080 ;; by the user | |
65582
4d1085b02d64
Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents:
64762
diff
changeset
|
2081 (message "%s" messg)) |
11042 | 2082 )) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2083 |
11042 | 2084 ;; Save Nth diff of buffer BUF-TYPE \(A, B, or C\). |
2085 ;; That is to say, the Nth diff on the `ediff-killed-diffs-alist'. REG | |
2086 ;; is the region to save. It is redundant here, but is passed anyway, for | |
2087 ;; convenience. | |
2088 (defun ediff-save-diff-region (n buf-type reg) | |
2089 (let* ((n-th-diff-saved (assoc n ediff-killed-diffs-alist)) | |
2090 (buf (ediff-get-buffer buf-type)) | |
2091 (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
|
2092 |
11042 | 2093 (if this-buf-n-th-diff-saved |
2094 ;; either nothing saved for n-th diff and buffer or we OK'ed | |
2095 ;; overriding | |
2096 (setcdr this-buf-n-th-diff-saved reg) | |
2097 (if n-th-diff-saved ;; n-th diff saved, but for another buffer | |
2098 (nconc n-th-diff-saved (list (cons buf reg))) | |
2099 (setq ediff-killed-diffs-alist ;; create record for n-th diff | |
2100 (cons (list n (cons buf reg)) | |
2101 ediff-killed-diffs-alist)))) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2102 (message "Saving old diff region #%d of buffer %S. To recover, type `r%s'" |
11042 | 2103 (1+ n) buf-type |
2104 (if ediff-merge-job | |
2105 "" (downcase (symbol-name buf-type)))) | |
2106 )) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2107 |
11042 | 2108 ;; Test if saving Nth difference region of buffer BUF-TYPE is possible. |
2109 (defun ediff-test-save-region (n buf-type) | |
2110 (let* ((n-th-diff-saved (assoc n ediff-killed-diffs-alist)) | |
2111 (buf (ediff-get-buffer buf-type)) | |
2112 (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
|
2113 |
11042 | 2114 (if this-buf-n-th-diff-saved |
2115 (if (yes-or-no-p | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2116 (format |
65689
96187e7edd1b
2005-09-25 Romain Francoise <romain@orebokech.com>
Romain Francoise <romain@orebokech.com>
parents:
65680
diff
changeset
|
2117 "You've previously copied diff region %d to buffer %S. Confirm? " |
11042 | 2118 (1+ n) buf-type)) |
2119 t | |
2120 (error "Quit")) | |
2121 t))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2122 |
11042 | 2123 (defun ediff-pop-diff (n buf-type) |
2124 "Pop last killed Nth diff region from buffer BUF-TYPE." | |
2125 (let* ((n-th-record (assoc n ediff-killed-diffs-alist)) | |
2126 (buf (ediff-get-buffer buf-type)) | |
2127 (saved-rec (assoc buf (cdr n-th-record))) | |
2128 (three-way ediff-3way-job) | |
2129 (ctl-buf ediff-control-buffer) | |
2130 ediff-verbose-p | |
2131 saved-diff reg-beg reg-end recovered) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2132 |
11042 | 2133 (if (cdr saved-rec) |
2134 (setq saved-diff (cdr saved-rec)) | |
2135 (if (> ediff-number-of-differences 0) | |
2136 (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
|
2137 (error ediff-NO-DIFFERENCES))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2138 |
11042 | 2139 (setq reg-beg (ediff-get-diff-posn buf-type 'beg n ediff-control-buffer)) |
2140 (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
|
2141 |
11042 | 2142 (condition-case conds |
19047 | 2143 (ediff-with-current-buffer buf |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2144 (let ((inhibit-read-only (null buffer-read-only))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2145 |
11042 | 2146 (goto-char reg-end) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2147 (insert saved-diff) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2148 |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2149 (if (> reg-end reg-beg) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2150 (kill-region reg-beg reg-end)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2151 |
11042 | 2152 (setq recovered t) |
2153 )) | |
2154 (error (message "ediff-pop-diff: %s %s" | |
2155 (car conds) | |
2156 (mapconcat 'prin1-to-string (cdr conds) " ")) | |
2157 (beep 1))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2158 |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2159 ;; Clearing fine diffs is necessary for |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2160 ;; 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
|
2161 ;; 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
|
2162 ;; 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
|
2163 ;; fine diffs. |
11042 | 2164 (if recovered |
2165 (ediff-clear-fine-differences n)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2166 |
11042 | 2167 ;; adjust state of difference |
2168 (if (and three-way recovered) | |
2169 (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
|
2170 |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2171 (ediff-refresh-mode-lines) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2172 |
11042 | 2173 (if recovered |
2174 (progn | |
2175 (setq n-th-record (delq saved-rec n-th-record)) | |
2176 (message "Diff region %d in buffer %S restored" (1+ n) buf-type) | |
2177 )) | |
2178 )) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2179 |
11042 | 2180 (defun ediff-restore-diff (arg &optional key) |
2181 "Restore ARGth diff from `ediff-killed-diffs-alist'. | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2182 ARG is a prefix argument. If ARG is nil, restore the current-difference. |
11042 | 2183 If the second optional argument, a character, is given, use it to |
2184 determine the target buffer instead of last-command-char" | |
2185 (interactive "P") | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2186 (ediff-barf-if-not-control-buffer) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2187 (if (numberp arg) |
11042 | 2188 (ediff-jump-to-difference arg)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2189 (ediff-pop-diff ediff-current-difference |
11042 | 2190 (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
|
2191 ;; 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
|
2192 (let (ediff-verbose-p) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2193 (ediff-recenter))) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2194 |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2195 (defun ediff-restore-diff-in-merge-buffer (arg) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2196 "Restore ARGth diff in the merge buffer. |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2197 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
|
2198 (interactive "P") |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2199 (ediff-restore-diff arg ?c)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2200 |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2201 |
11042 | 2202 (defun ediff-toggle-regexp-match () |
2203 "Toggle between focusing and hiding of difference regions that match | |
2204 a regular expression typed in by the user." | |
2205 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2206 (ediff-barf-if-not-control-buffer) |
11042 | 2207 (let ((regexp-A "") |
2208 (regexp-B "") | |
2209 (regexp-C "") | |
2210 msg-connective alt-msg-connective alt-connective) | |
2211 (cond | |
2212 ((or (and (eq ediff-skip-diff-region-function | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
2213 ediff-focus-on-regexp-matches-function) |
11042 | 2214 (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
|
2215 (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
|
2216 ediff-hide-regexp-matches-function) |
11042 | 2217 (eq last-command-char ?h))) |
2218 (message "Selective browsing by regexp turned off") | |
2219 (setq ediff-skip-diff-region-function 'ediff-show-all-diffs)) | |
2220 ((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
|
2221 (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
|
2222 regexp-A |
11042 | 2223 (read-string |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2224 (format |
65680
ed770a0a7846
2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents:
65627
diff
changeset
|
2225 "Ignore A-regions matching this regexp (default %s): " |
11042 | 2226 ediff-regexp-hide-A)) |
2227 regexp-B | |
2228 (read-string | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2229 (format |
65680
ed770a0a7846
2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents:
65627
diff
changeset
|
2230 "Ignore B-regions matching this regexp (default %s): " |
11042 | 2231 ediff-regexp-hide-B))) |
2232 (if ediff-3way-comparison-job | |
2233 (setq regexp-C | |
2234 (read-string | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2235 (format |
65680
ed770a0a7846
2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents:
65627
diff
changeset
|
2236 "Ignore C-regions matching this regexp (default %s): " |
11042 | 2237 ediff-regexp-hide-C)))) |
2238 (if (eq ediff-hide-regexp-connective 'and) | |
2239 (setq msg-connective "BOTH" | |
2240 alt-msg-connective "ONE OF" | |
2241 alt-connective 'or) | |
2242 (setq msg-connective "ONE OF" | |
2243 alt-msg-connective "BOTH" | |
2244 alt-connective 'and)) | |
2245 (if (y-or-n-p | |
2246 (format | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2247 "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
|
2248 msg-connective)) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2249 (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
|
2250 (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
|
2251 (message "Will ignore regions that match %s regexps" |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2252 alt-msg-connective)) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2253 |
11042 | 2254 (or (string= regexp-A "") (setq ediff-regexp-hide-A regexp-A)) |
2255 (or (string= regexp-B "") (setq ediff-regexp-hide-B regexp-B)) | |
2256 (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
|
2257 |
11042 | 2258 ((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
|
2259 (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
|
2260 ediff-focus-on-regexp-matches-function |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2261 regexp-A |
11042 | 2262 (read-string |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2263 (format |
65680
ed770a0a7846
2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents:
65627
diff
changeset
|
2264 "Focus on A-regions matching this regexp (default %s): " |
11042 | 2265 ediff-regexp-focus-A)) |
2266 regexp-B | |
2267 (read-string | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2268 (format |
65680
ed770a0a7846
2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents:
65627
diff
changeset
|
2269 "Focus on B-regions matching this regexp (default %s): " |
11042 | 2270 ediff-regexp-focus-B))) |
2271 (if ediff-3way-comparison-job | |
2272 (setq regexp-C | |
2273 (read-string | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2274 (format |
65680
ed770a0a7846
2005-09-24 Emilio C. Lopes <eclig@gmx.net>
Romain Francoise <romain@orebokech.com>
parents:
65627
diff
changeset
|
2275 "Focus on C-regions matching this regexp (default %s): " |
11042 | 2276 ediff-regexp-focus-C)))) |
2277 (if (eq ediff-focus-regexp-connective 'and) | |
2278 (setq msg-connective "BOTH" | |
2279 alt-msg-connective "ONE OF" | |
2280 alt-connective 'or) | |
2281 (setq msg-connective "ONE OF" | |
2282 alt-msg-connective "BOTH" | |
2283 alt-connective 'and)) | |
2284 (if (y-or-n-p | |
2285 (format | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2286 "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
|
2287 msg-connective)) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2288 (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
|
2289 msg-connective) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2290 (setq ediff-focus-regexp-connective alt-connective) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2291 (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
|
2292 alt-msg-connective)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2293 |
11042 | 2294 (or (string= regexp-A "") (setq ediff-regexp-focus-A regexp-A)) |
2295 (or (string= regexp-B "") (setq ediff-regexp-focus-B regexp-B)) | |
2296 (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
|
2297 |
11042 | 2298 (defun ediff-toggle-skip-similar () |
2299 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2300 (ediff-barf-if-not-control-buffer) |
11042 | 2301 (if (not (eq ediff-auto-refine 'on)) |
2302 (error | |
2303 "Can't skip over whitespace regions: first turn auto-refining on")) | |
2304 (setq ediff-ignore-similar-regions (not ediff-ignore-similar-regions)) | |
2305 (if ediff-ignore-similar-regions | |
2306 (message | |
2307 "Skipping regions that differ only in white space & line breaks") | |
2308 (message "Skipping over white-space differences turned off"))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2309 |
11042 | 2310 (defun ediff-focus-on-regexp-matches (n) |
2311 "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
|
2312 Regions to be ignored according to this function are those where |
11042 | 2313 buf A region doesn't match `ediff-regexp-focus-A' and buf B region |
2314 doesn't match `ediff-regexp-focus-B'. | |
2315 This function returns nil if the region number N (specified as | |
2316 an argument) is not to be ignored and t if region N is to be ignored. | |
2317 | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2318 N is a region number used by Ediff internally. It is 1 less |
11042 | 2319 the number seen by the user." |
2320 (if (ediff-valid-difference-p n) | |
2321 (let* ((ctl-buf ediff-control-buffer) | |
2322 (regex-A ediff-regexp-focus-A) | |
2323 (regex-B ediff-regexp-focus-B) | |
2324 (regex-C ediff-regexp-focus-C) | |
19047 | 2325 (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
|
2326 (save-restriction |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2327 (narrow-to-region |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2328 (ediff-get-diff-posn 'A 'beg n ctl-buf) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2329 (ediff-get-diff-posn 'A 'end n ctl-buf)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2330 (goto-char (point-min)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2331 (re-search-forward regex-A nil t)))) |
19047 | 2332 (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
|
2333 (save-restriction |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2334 (narrow-to-region |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2335 (ediff-get-diff-posn 'B 'beg n ctl-buf) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2336 (ediff-get-diff-posn 'B 'end n ctl-buf)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2337 (re-search-forward regex-B nil t)))) |
11042 | 2338 (reg-C-match (if ediff-3way-comparison-job |
19047 | 2339 (ediff-with-current-buffer ediff-buffer-C |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2340 (save-restriction |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2341 (narrow-to-region |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2342 (ediff-get-diff-posn 'C 'beg n ctl-buf) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2343 (ediff-get-diff-posn 'C 'end n ctl-buf)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2344 (re-search-forward regex-C nil t)))))) |
11042 | 2345 (not (eval (if ediff-3way-comparison-job |
2346 (list ediff-focus-regexp-connective | |
2347 reg-A-match reg-B-match reg-C-match) | |
2348 (list ediff-focus-regexp-connective | |
2349 reg-A-match reg-B-match)))) | |
2350 ))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2351 |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2352 (defun ediff-hide-regexp-matches (n) |
11042 | 2353 "Hide diffs that match regexp `ediff-regexp-hide-A/B/C'. |
2354 Regions to be ignored are those where buf A region matches | |
2355 `ediff-regexp-hide-A' and buf B region matches `ediff-regexp-hide-B'. | |
2356 This function returns nil if the region number N (specified as | |
2357 an argument) is not to be ignored and t if region N is to be ignored. | |
2358 | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2359 N is a region number used by Ediff internally. It is 1 less |
11042 | 2360 the number seen by the user." |
2361 (if (ediff-valid-difference-p n) | |
2362 (let* ((ctl-buf ediff-control-buffer) | |
2363 (regex-A ediff-regexp-hide-A) | |
2364 (regex-B ediff-regexp-hide-B) | |
2365 (regex-C ediff-regexp-hide-C) | |
19047 | 2366 (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
|
2367 (save-restriction |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2368 (narrow-to-region |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2369 (ediff-get-diff-posn 'A 'beg n ctl-buf) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2370 (ediff-get-diff-posn 'A 'end n ctl-buf)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2371 (goto-char (point-min)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2372 (re-search-forward regex-A nil t)))) |
19047 | 2373 (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
|
2374 (save-restriction |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2375 (narrow-to-region |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2376 (ediff-get-diff-posn 'B 'beg n ctl-buf) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2377 (ediff-get-diff-posn 'B 'end n ctl-buf)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2378 (goto-char (point-min)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2379 (re-search-forward regex-B nil t)))) |
11042 | 2380 (reg-C-match (if ediff-3way-comparison-job |
19047 | 2381 (ediff-with-current-buffer ediff-buffer-C |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2382 (save-restriction |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2383 (narrow-to-region |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2384 (ediff-get-diff-posn 'C 'beg n ctl-buf) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2385 (ediff-get-diff-posn 'C 'end n ctl-buf)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2386 (goto-char (point-min)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2387 (re-search-forward regex-C nil t)))))) |
11042 | 2388 (eval (if ediff-3way-comparison-job |
2389 (list ediff-hide-regexp-connective | |
2390 reg-A-match reg-B-match reg-C-match) | |
2391 (list ediff-hide-regexp-connective reg-A-match reg-B-match))) | |
2392 ))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2393 |
11042 | 2394 |
2395 | |
2396 ;;; Quitting, suspending, etc. | |
2397 | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2398 (defun ediff-quit (reverse-default-keep-variants) |
11042 | 2399 "Finish an Ediff session and exit Ediff. |
2400 Unselects the selected difference, if any, restores the read-only and modified | |
2401 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
|
2402 \(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
|
2403 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2404 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
|
2405 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
|
2406 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
|
2407 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
|
2408 (interactive "P") |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2409 (ediff-barf-if-not-control-buffer) |
18054 | 2410 (let ((ctl-buf (current-buffer))) |
2411 (if (y-or-n-p (format "Quit this Ediff session%s? " | |
2412 (if (ediff-buffer-live-p ediff-meta-buffer) | |
2413 " & show containing session group" ""))) | |
2414 (progn | |
2415 (message "") | |
2416 (set-buffer ctl-buf) | |
2417 (ediff-really-quit reverse-default-keep-variants)) | |
2418 (message "")))) | |
11042 | 2419 |
2420 | |
2421 ;; Perform the quit operations. | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2422 (defun ediff-really-quit (reverse-default-keep-variants) |
11042 | 2423 (ediff-unhighlight-diffs-totally) |
2424 (ediff-clear-diff-vector 'ediff-difference-vector-A 'fine-diffs-also) | |
2425 (ediff-clear-diff-vector 'ediff-difference-vector-B 'fine-diffs-also) | |
2426 (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
|
2427 (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
|
2428 |
11042 | 2429 (ediff-delete-temp-files) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2430 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2431 ;; Restore the visibility range. This affects only ediff-*-regions/windows. |
11042 | 2432 ;; Since for other job names ediff-visible-region sets |
2433 ;; ediff-visible-bounds to ediff-wide-bounds, the settings below are | |
2434 ;; ignored for such jobs. | |
2435 (if ediff-quit-widened | |
2436 (setq ediff-visible-bounds ediff-wide-bounds) | |
2437 (setq ediff-visible-bounds ediff-narrow-bounds)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2438 |
11042 | 2439 ;; Apply selective display to narrow or widen |
2440 (ediff-visible-region) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2441 (mapcar (lambda (overl) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2442 (if (ediff-overlayp overl) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2443 (ediff-delete-overlay overl))) |
11042 | 2444 ediff-wide-bounds) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2445 (mapcar (lambda (overl) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2446 (if (ediff-overlayp overl) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2447 (ediff-delete-overlay overl))) |
11042 | 2448 ediff-narrow-bounds) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2449 |
11042 | 2450 ;; 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
|
2451 (let ((control-buffer ediff-control-buffer) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2452 (meta-buffer ediff-meta-buffer) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2453 (after-quit-hook-internal ediff-after-quit-hook-internal) |
20206 | 2454 (session-number ediff-meta-session-number) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2455 ;; suitable working frame |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2456 (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
|
2457 (cond ((window-live-p ediff-window-A) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2458 (window-frame ediff-window-A)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2459 ((window-live-p ediff-window-B) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2460 (window-frame ediff-window-B)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2461 (t (next-frame)))))) |
11042 | 2462 (condition-case nil |
19047 | 2463 (ediff-with-current-buffer ediff-buffer-A |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2464 (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
|
2465 (delq control-buffer ediff-this-buffer-ediff-sessions)) |
11042 | 2466 (kill-local-variable 'mode-line-buffer-identification) |
2467 (kill-local-variable 'mode-line-format) | |
2468 ) | |
2469 (error)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2470 |
11042 | 2471 (condition-case nil |
19047 | 2472 (ediff-with-current-buffer ediff-buffer-B |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2473 (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
|
2474 (delq control-buffer ediff-this-buffer-ediff-sessions)) |
11042 | 2475 (kill-local-variable 'mode-line-buffer-identification) |
2476 (kill-local-variable 'mode-line-format) | |
2477 ) | |
2478 (error)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2479 |
11042 | 2480 (condition-case nil |
19047 | 2481 (ediff-with-current-buffer ediff-buffer-C |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2482 (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
|
2483 (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
|
2484 (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
|
2485 (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
|
2486 ) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2487 (error)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2488 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2489 (condition-case nil |
19047 | 2490 (ediff-with-current-buffer ediff-ancestor-buffer |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2491 (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
|
2492 (delq control-buffer ediff-this-buffer-ediff-sessions)) |
11042 | 2493 (kill-local-variable 'mode-line-buffer-identification) |
2494 (kill-local-variable 'mode-line-format) | |
2495 ) | |
2496 (error)) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2497 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2498 (setq ediff-session-registry |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2499 (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
|
2500 (ediff-update-registry) |
11042 | 2501 ;; restore state of buffers to what it was before ediff |
2502 (ediff-restore-protected-variables) | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2503 |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2504 ;; If the user interrupts (canceling saving the merge buffer), continue |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2505 ;; normally. |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2506 (condition-case nil |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2507 (if (ediff-merge-job) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2508 (run-hooks 'ediff-quit-merge-hook)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2509 (quit)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2510 |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2511 (run-hooks 'ediff-cleanup-hook) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2512 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2513 (ediff-janitor |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2514 'ask |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2515 ;; 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
|
2516 (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
|
2517 (not ediff-keep-variants) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2518 ediff-keep-variants)) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2519 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2520 ;; 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
|
2521 ;; 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
|
2522 ;; own cleanup, if needed. |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2523 (run-hooks 'ediff-quit-hook) |
20206 | 2524 (ediff-update-meta-buffer meta-buffer nil session-number) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2525 |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2526 ;; warp mouse into a working window |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2527 (setq warp-frame ; if mouse is over a reasonable frame, use it |
19870 | 2528 (cond ((ediff-good-frame-under-mouse)) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2529 (t warp-frame))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2530 (if (and (ediff-window-display-p) (frame-live-p warp-frame) ediff-grab-mouse) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2531 (set-mouse-position (if ediff-emacs-p |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2532 warp-frame |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2533 (frame-selected-window warp-frame)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2534 2 1)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2535 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2536 (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
|
2537 )) |
19870 | 2538 |
2539 ;; 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
|
2540 ;; frame. Otherwise: nil |
19870 | 2541 (defun ediff-good-frame-under-mouse () |
2542 (let ((frame-or-win (car (mouse-position))) | |
2543 (buf-name "") | |
2544 frame obj-ok) | |
2545 (setq obj-ok | |
2546 (if ediff-emacs-p | |
2547 (frame-live-p frame-or-win) | |
2548 (window-live-p frame-or-win))) | |
2549 (if obj-ok | |
2550 (setq frame (if ediff-emacs-p frame-or-win (window-frame frame-or-win)) | |
2551 buf-name | |
2552 (buffer-name (window-buffer (frame-selected-window frame))))) | |
2553 (if (string-match "Minibuf" buf-name) | |
2554 nil | |
2555 frame))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2556 |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2557 |
11042 | 2558 (defun ediff-delete-temp-files () |
20206 | 2559 (if (and (stringp ediff-temp-file-A) (file-exists-p ediff-temp-file-A)) |
11042 | 2560 (delete-file ediff-temp-file-A)) |
20206 | 2561 (if (and (stringp ediff-temp-file-B) (file-exists-p ediff-temp-file-B)) |
11042 | 2562 (delete-file ediff-temp-file-B)) |
20206 | 2563 (if (and (stringp ediff-temp-file-C) (file-exists-p ediff-temp-file-C)) |
11042 | 2564 (delete-file ediff-temp-file-C))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2565 |
11042 | 2566 |
2567 ;; Kill control buffer, other auxiliary Ediff buffers. | |
2568 ;; Leave one of the frames split between buffers A/B/C | |
2569 (defun ediff-cleanup-mess () | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2570 (let* ((buff-A ediff-buffer-A) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2571 (buff-B ediff-buffer-B) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2572 (buff-C ediff-buffer-C) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2573 (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
|
2574 (ctl-wind (ediff-get-visible-buffer-window ctl-buf)) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2575 (ctl-frame ediff-control-frame) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2576 (three-way-job ediff-3way-job) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2577 (main-frame (cond ((window-live-p ediff-window-A) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2578 (window-frame ediff-window-A)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2579 ((window-live-p ediff-window-B) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2580 (window-frame ediff-window-B))))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2581 |
11042 | 2582 (ediff-kill-buffer-carefully ediff-diff-buffer) |
2583 (ediff-kill-buffer-carefully ediff-custom-diff-buffer) | |
2584 (ediff-kill-buffer-carefully ediff-fine-diff-buffer) | |
2585 (ediff-kill-buffer-carefully ediff-tmp-buffer) | |
2586 (ediff-kill-buffer-carefully ediff-error-buffer) | |
2587 (ediff-kill-buffer-carefully ediff-msg-buffer) | |
2588 (ediff-kill-buffer-carefully ediff-debug-buffer) | |
18054 | 2589 (if (boundp 'ediff-patch-diagnostics) |
2590 (ediff-kill-buffer-carefully ediff-patch-diagnostics)) | |
11042 | 2591 |
44615
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
2592 ;; 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
|
2593 (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
|
2594 (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
|
2595 ((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
|
2596 (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
|
2597 |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
2598 ;; Hide bottom toolbar. --marcpa |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
2599 (if (not (ediff-multiframe-setup-p)) |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
2600 (ediff-kill-bottom-toolbar)) |
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
2601 |
11042 | 2602 (ediff-kill-buffer-carefully ctl-buf) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2603 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2604 (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
|
2605 (select-frame main-frame)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2606 |
11042 | 2607 ;; display only if not visible |
2608 (condition-case nil | |
2609 (or (ediff-get-visible-buffer-window buff-B) | |
2610 (switch-to-buffer buff-B)) | |
2611 (error)) | |
2612 (condition-case nil | |
2613 (or (ediff-get-visible-buffer-window buff-A) | |
2614 (progn | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2615 (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
|
2616 (ediff-buffer-live-p buff-A)) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2617 (funcall ediff-split-window-function)) |
11042 | 2618 (switch-to-buffer buff-A))) |
2619 (error)) | |
2620 (if three-way-job | |
2621 (condition-case nil | |
2622 (or (ediff-get-visible-buffer-window buff-C) | |
2623 (progn | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2624 (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
|
2625 (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
|
2626 (ediff-buffer-live-p buff-C)) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2627 (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
|
2628 (switch-to-buffer buff-C))) |
11042 | 2629 (error))) |
44615
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
2630 (balance-windows) |
11042 | 2631 (message "") |
2632 )) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2633 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2634 (defun ediff-janitor (ask keep-variants) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2635 "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
|
2636 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
|
2637 ediff-quit-merge-hook. |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2638 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
|
2639 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
|
2640 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
|
2641 (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
|
2642 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
|
2643 (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
|
2644 ediff-buffer-B 'B ask keep-variants) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2645 (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
|
2646 (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
|
2647 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
|
2648 (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
|
2649 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
|
2650 )) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2651 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2652 ;; 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
|
2653 ;; unconditionaly, keep) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2654 ;; 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
|
2655 (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
|
2656 ;; 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
|
2657 (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
|
2658 (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
|
2659 (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
|
2660 (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
|
2661 (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
|
2662 (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
|
2663 (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
|
2664 ;; 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
|
2665 ;; 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
|
2666 ;; the indirect buffer |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2667 (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
|
2668 (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
|
2669 (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
|
2670 (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
|
2671 (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
|
2672 ;; 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
|
2673 (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
|
2674 keep-variants |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2675 (buffer-modified-p buff) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2676 (and ask |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2677 (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
|
2678 bufftype (buffer-name buff))))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2679 (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
|
2680 )) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2681 |
18054 | 2682 (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
|
2683 "Default hook to run on quitting a merge job. |
18054 | 2684 This can also be used to save merge buffer in the middle of an Ediff session. |
2685 | |
2686 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
|
2687 continue. Otherwise: |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2688 If `ediff-autostore-merges' is nil, this does nothing. |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2689 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
|
2690 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
|
2691 delete the merge buffer. |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2692 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
|
2693 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
|
2694 `ediff-merge-directories', `ediff-merge-directory-revisions', and such." |
18054 | 2695 (let ((merge-store-file ediff-merge-store-file) |
2696 (ediff-autostore-merges ; fake ediff-autostore-merges, if necessary | |
2697 (if save-and-continue t ediff-autostore-merges))) | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2698 (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
|
2699 (cond ((stringp merge-store-file) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2700 ;; store, ask to delete |
18054 | 2701 (ediff-write-merge-buffer-and-maybe-kill |
2702 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
|
2703 ((eq ediff-autostore-merges t) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2704 ;; ask for file name |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2705 (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
|
2706 (read-file-name "Save the result of the merge in file: ")) |
18054 | 2707 (ediff-write-merge-buffer-and-maybe-kill |
2708 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
|
2709 ((and (ediff-buffer-live-p ediff-meta-buffer) |
19047 | 2710 (ediff-with-current-buffer ediff-meta-buffer |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
2711 (ediff-merge-metajob))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2712 ;; The parent metajob passed nil as the autostore file. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2713 nil))) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2714 )) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2715 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2716 ;; write merge buffer. If the optional argument save-and-continue is non-nil, |
18054 | 2717 ;; then don't kill the merge buffer |
2718 (defun ediff-write-merge-buffer-and-maybe-kill (buf file | |
2719 &optional | |
2720 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
|
2721 (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
|
2722 (let ((warn-message |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2723 (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
|
2724 file))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2725 (beep) |
65582
4d1085b02d64
Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents:
64762
diff
changeset
|
2726 (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
|
2727 (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
|
2728 (princ "\n\n") |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2729 (princ warn-message) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2730 (princ "\n\n") |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2731 ) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2732 (sit-for 2)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2733 (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
|
2734 (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
|
2735 (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
|
2736 (progn |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2737 ;;(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
|
2738 (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
|
2739 (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
|
2740 (save-buffer)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2741 (if show-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 (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
|
2744 (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
|
2745 (sit-for 3))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2746 (if (and |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2747 (not save-and-continue) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
2748 (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
|
2749 (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
|
2750 )) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
2751 |
11042 | 2752 ;; The default way of suspending Ediff. |
2753 ;; 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
|
2754 (defun ediff-default-suspend-function () |
11042 | 2755 (let* ((buf-A ediff-buffer-A) |
2756 (buf-B ediff-buffer-B) | |
2757 (buf-C ediff-buffer-C) | |
2758 (buf-A-wind (ediff-get-visible-buffer-window buf-A)) | |
2759 (buf-B-wind (ediff-get-visible-buffer-window buf-B)) | |
2760 (buf-C-wind (ediff-get-visible-buffer-window buf-C)) | |
18054 | 2761 (buf-patch (if (boundp 'ediff-patchbufer) ediff-patchbufer nil)) |
2762 (buf-patch-diag (if (boundp 'ediff-patch-diagnostics) | |
2763 ediff-patch-diagnostics nil)) | |
11042 | 2764 (buf-err ediff-error-buffer) |
2765 (buf-diff ediff-diff-buffer) | |
2766 (buf-custom-diff ediff-custom-diff-buffer) | |
2767 (buf-fine-diff ediff-fine-diff-buffer)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2768 |
11042 | 2769 ;; hide the control panel |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2770 (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
|
2771 (iconify-frame ediff-control-frame) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2772 (bury-buffer)) |
11042 | 2773 (if buf-err (bury-buffer buf-err)) |
2774 (if buf-diff (bury-buffer buf-diff)) | |
2775 (if buf-custom-diff (bury-buffer buf-custom-diff)) | |
2776 (if buf-fine-diff (bury-buffer buf-fine-diff)) | |
2777 (if buf-patch (bury-buffer buf-patch)) | |
2778 (if buf-patch-diag (bury-buffer buf-patch-diag)) | |
2779 (if (window-live-p buf-A-wind) | |
2780 (progn | |
2781 (select-window buf-A-wind) | |
2782 (delete-other-windows) | |
2783 (bury-buffer)) | |
18054 | 2784 (if (ediff-buffer-live-p buf-A) |
2785 (progn | |
2786 (set-buffer buf-A) | |
2787 (bury-buffer)))) | |
11042 | 2788 (if (window-live-p buf-B-wind) |
2789 (progn | |
2790 (select-window buf-B-wind) | |
2791 (delete-other-windows) | |
2792 (bury-buffer)) | |
18054 | 2793 (if (ediff-buffer-live-p buf-B) |
2794 (progn | |
2795 (set-buffer buf-B) | |
2796 (bury-buffer)))) | |
11042 | 2797 (if (window-live-p buf-C-wind) |
2798 (progn | |
2799 (select-window buf-C-wind) | |
2800 (delete-other-windows) | |
2801 (bury-buffer)) | |
18054 | 2802 (if (ediff-buffer-live-p buf-C) |
2803 (progn | |
2804 (set-buffer buf-C) | |
2805 (bury-buffer)))) | |
11042 | 2806 )) |
2807 | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2808 |
11042 | 2809 (defun ediff-suspend () |
2810 "Suspend Ediff. | |
2811 To resume, switch to the appropriate `Ediff Control Panel' | |
2812 buffer and then type \\[ediff-recenter]. Ediff will automatically set | |
2813 up an appropriate window config." | |
2814 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2815 (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
|
2816 (run-hooks 'ediff-suspend-hook) |
11042 | 2817 (message |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2818 "To resume, type M-x eregistry and select the desired Ediff session")) |
11042 | 2819 |
2820 | |
2821 (defun ediff-status-info () | |
2822 "Show the names of the buffers or files being operated on by Ediff. | |
2823 Hit \\[ediff-recenter] to reset the windows afterward." | |
2824 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2825 (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
|
2826 (save-excursion |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2827 (ediff-skip-unsuitable-frames)) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
2828 (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
|
2829 (ediff-with-current-buffer standard-output |
25fb6fc4f66b
(ediff-status-info, ediff-debug-info): Put temp
Dave Love <fx@gnu.org>
parents:
33019
diff
changeset
|
2830 (fundamental-mode)) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
2831 (raise-frame (selected-frame)) |
11042 | 2832 (princ (ediff-version)) |
2833 (princ "\n\n") | |
19047 | 2834 (ediff-with-current-buffer ediff-buffer-A |
11042 | 2835 (if buffer-file-name |
2836 (princ | |
2837 (format "File A = %S\n" buffer-file-name)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2838 (princ |
11042 | 2839 (format "Buffer A = %S\n" (buffer-name))))) |
19047 | 2840 (ediff-with-current-buffer ediff-buffer-B |
11042 | 2841 (if buffer-file-name |
2842 (princ | |
2843 (format "File B = %S\n" buffer-file-name)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2844 (princ |
11042 | 2845 (format "Buffer B = %S\n" (buffer-name))))) |
2846 (if ediff-3way-job | |
19047 | 2847 (ediff-with-current-buffer ediff-buffer-C |
11042 | 2848 (if buffer-file-name |
2849 (princ | |
2850 (format "File C = %S\n" buffer-file-name)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2851 (princ |
11042 | 2852 (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
|
2853 (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
|
2854 (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
|
2855 (concat "\tin buffer " |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2856 (buffer-name ediff-custom-diff-buffer)) |
18054 | 2857 " is not available"))) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2858 (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
|
2859 (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
|
2860 (concat "\tin buffer " |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2861 (buffer-name ediff-diff-buffer)) |
18054 | 2862 " is not available"))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2863 |
19047 | 2864 (let* ((A-line (ediff-with-current-buffer ediff-buffer-A |
11042 | 2865 (1+ (count-lines (point-min) (point))))) |
19047 | 2866 (B-line (ediff-with-current-buffer ediff-buffer-B |
11042 | 2867 (1+ (count-lines (point-min) (point))))) |
2868 C-line) | |
2869 (princ (format "\Buffer A's point is on line %d\n" A-line)) | |
2870 (princ (format "Buffer B's point is on line %d\n" B-line)) | |
2871 (if ediff-3way-job | |
2872 (progn | |
19047 | 2873 (setq C-line (ediff-with-current-buffer ediff-buffer-C |
11042 | 2874 (1+ (count-lines (point-min) (point))))) |
2875 (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
|
2876 |
11042 | 2877 (princ (format "\nCurrent difference number = %S\n" |
2878 (cond ((< ediff-current-difference 0) 'start) | |
2879 ((>= ediff-current-difference | |
2880 ediff-number-of-differences) 'end) | |
2881 (t (1+ ediff-current-difference))))) | |
2882 | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2883 (princ |
18054 | 2884 (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
|
2885 (if ediff-ignore-similar-regions |
18054 | 2886 "Ignoring" "Showing"))) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2887 (if (and ediff-merge-job ediff-show-clashes-only) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2888 (princ |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2889 "\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
|
2890 (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
|
2891 (princ |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
2892 "\nSkipping merge regions that differ from default setting")) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2893 |
11042 | 2894 (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
|
2895 (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
|
2896 ((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
|
2897 ediff-hide-regexp-matches-function) |
11042 | 2898 (princ |
2899 "\nIgnoring regions that match") | |
2900 (princ | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2901 (format |
11042 | 2902 "\n\t regexp `%s' in buffer A %S\n\t regexp `%s' in buffer B\n" |
2903 ediff-regexp-hide-A ediff-hide-regexp-connective | |
2904 ediff-regexp-hide-B))) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2905 ((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
|
2906 ediff-focus-on-regexp-matches-function) |
11042 | 2907 (princ |
2908 "\nFocusing on regions that match") | |
2909 (princ | |
2910 (format | |
2911 "\n\t regexp `%s' in buffer A %S\n\t regexp `%s' in buffer B\n" | |
2912 ediff-regexp-focus-A ediff-focus-regexp-connective | |
2913 ediff-regexp-focus-B))) | |
2914 (t (princ "\nSelective browsing via a user-defined method.\n"))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2915 |
11042 | 2916 (princ |
2917 (format "\nBugs/suggestions: type `%s' while in Ediff Control Panel." | |
2918 (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
|
2919 ) ; with output |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2920 (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
|
2921 (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
|
2922 (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
|
2923 (select-window ediff-control-window))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2924 |
11042 | 2925 |
2926 | |
2927 | |
2928 ;;; Support routines | |
2929 | |
2930 ;; Select a difference by placing the ASCII flags around the appropriate | |
2931 ;; group of lines in the A, B buffers | |
2932 ;; This may have to be modified for buffer C, when it will be supported. | |
2933 (defun ediff-select-difference (n) | |
2934 (if (and (ediff-buffer-live-p ediff-buffer-A) | |
2935 (ediff-buffer-live-p ediff-buffer-B) | |
2936 (ediff-valid-difference-p n)) | |
2937 (progn | |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
2938 (cond |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
2939 ((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
|
2940 (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
|
2941 ((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
|
2942 (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
|
2943 '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
|
2944 (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
|
2945 '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
|
2946 (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
|
2947 (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
|
2948 '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
|
2949 (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
|
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 '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
|
2952 ediff-control-buffer n)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2953 )) |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2954 |
11042 | 2955 (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
|
2956 ;; 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
|
2957 (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
|
2958 (run-hooks 'ediff-select-hook)))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2959 |
11042 | 2960 |
2961 ;; Unselect a difference by removing the ASCII flags in the buffers. | |
2962 ;; This may have to be modified for buffer C, when it will be supported. | |
2963 (defun ediff-unselect-difference (n) | |
2964 (if (ediff-valid-difference-p n) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2965 (progn |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
2966 (cond ((and (ediff-has-face-support-p) ediff-use-faces) |
11042 | 2967 (ediff-unhighlight-diff)) |
2968 ((eq ediff-highlighting-style 'ascii) | |
2969 (ediff-remove-flags-from-buffer | |
2970 ediff-buffer-A | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2971 (ediff-get-diff-overlay n 'A)) |
11042 | 2972 (ediff-remove-flags-from-buffer |
2973 ediff-buffer-B | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2974 (ediff-get-diff-overlay n 'B)) |
11042 | 2975 (if ediff-3way-job |
2976 (ediff-remove-flags-from-buffer | |
2977 ediff-buffer-C | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2978 (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
|
2979 (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
|
2980 (ediff-remove-flags-from-buffer |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2981 ediff-ancestor-buffer |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2982 (ediff-get-diff-overlay n 'Ancestor))) |
11042 | 2983 )) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2984 |
11042 | 2985 ;; unhighlight fine diffs |
2986 (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
|
2987 (run-hooks 'ediff-unselect-hook)))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
2988 |
11042 | 2989 |
2990 ;; Unselects prev diff and selects a new one, if FLAG has value other than | |
2991 ;; 'select-only or 'unselect-only. If FLAG is 'select-only, the | |
2992 ;; next difference is selected, but the current selection is not | |
2993 ;; unselected. If FLAG is 'unselect-only then the current selection is | |
2994 ;; unselected, but the next one is not selected. If NO-RECENTER is non-nil, | |
2995 ;; don't recenter buffers after selecting/unselecting. | |
2996 (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
|
2997 (let ((ediff-current-difference n)) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2998 (or no-recenter |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2999 (ediff-recenter 'no-rehighlight))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3000 |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3001 (let ((control-buf ediff-control-buffer)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3002 (unwind-protect |
11042 | 3003 (progn |
3004 (or (eq flag 'select-only) | |
3005 (ediff-unselect-difference ediff-current-difference)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3006 |
11042 | 3007 (or (eq flag 'unselect-only) |
3008 (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
|
3009 ;; 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
|
3010 ;; 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
|
3011 ;; be called if unselect-only is specified |
11042 | 3012 (setq ediff-current-difference n) |
3013 ) ; end protected section | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3014 |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3015 (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
|
3016 )) |
11042 | 3017 |
3018 | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3019 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3020 (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
|
3021 (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
|
3022 (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
|
3023 (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
|
3024 (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
|
3025 (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
|
3026 (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
|
3027 (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
|
3028 (current-diff-overlay |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3029 (symbol-value |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3030 (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
|
3031 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
|
3032 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3033 (if ediff-xemacs-p |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3034 (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
|
3035 (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
|
3036 (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
|
3037 (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
|
3038 (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
|
3039 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3040 ;; 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
|
3041 ;; 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
|
3042 (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
|
3043 ))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3044 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3045 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3046 (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
|
3047 (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
|
3048 (let ((current-diff-overlay |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3049 (symbol-value |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3050 (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
|
3051 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
|
3052 (overlay |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3053 (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
|
3054 ) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3055 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3056 (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
|
3057 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3058 ;; 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
|
3059 ;; current difference region |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3060 (ediff-set-overlay-face |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3061 overlay |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3062 (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
|
3063 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
|
3064 (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
|
3065 ))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3066 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3067 (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
|
3068 (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
|
3069 (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
|
3070 (let* ((inhibit-quit t) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3071 (current-diff-overlay-var |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3072 (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
|
3073 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
|
3074 (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
|
3075 (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
|
3076 (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
|
3077 (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
|
3078 (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
|
3079 ))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3080 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3081 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3082 (defsubst ediff-highlight-diff (n) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3083 "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
|
3084 (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
|
3085 (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
|
3086 (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
|
3087 (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
|
3088 ) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3089 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3090 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3091 (defsubst ediff-unhighlight-diff () |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3092 "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
|
3093 (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
|
3094 (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
|
3095 (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
|
3096 (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
|
3097 ) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3098 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3099 ;; delete highlighting overlays, restore faces to their original form |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3100 (defsubst ediff-unhighlight-diffs-totally () |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3101 (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
|
3102 (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
|
3103 (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
|
3104 (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
|
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 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3108 ;; This is adapted from a similar function in `emerge.el'. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3109 ;; 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
|
3110 ;; according to context. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3111 ;; 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
|
3112 ;; 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
|
3113 ;; 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
|
3114 (defun ediff-read-file-name (prompt default-dir default-file &optional no-dirs) |
11042 | 3115 ;; hack default-dir if it is not set |
3116 (setq default-dir | |
3117 (file-name-as-directory | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3118 (ediff-abbreviate-file-name |
11042 | 3119 (expand-file-name (or default-dir |
3120 (and default-file | |
3121 (file-name-directory default-file)) | |
3122 default-directory))))) | |
3123 | |
3124 ;; strip the directory from default-file | |
3125 (if default-file | |
3126 (setq default-file (file-name-nondirectory default-file))) | |
3127 (if (string= default-file "") | |
3128 (setq default-file nil)) | |
3129 | |
3130 (let (f) | |
3131 (setq f (expand-file-name | |
3132 (read-file-name | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3133 (format "%s%s " |
11042 | 3134 prompt |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3135 (cond (default-file |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3136 (concat " (default " default-file "):")) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3137 (t (concat " (default " default-dir "):")))) |
11042 | 3138 default-dir |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3139 (or default-file default-dir) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3140 t ; must match, no-confirm |
11042 | 3141 (if default-file (file-name-directory default-file)) |
3142 ) | |
3143 default-dir | |
3144 )) | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3145 ;; If user entered a directory name, expand the default file in that |
11042 | 3146 ;; directory. This allows the user to enter a directory name for the |
3147 ;; B-file and diff against the default-file in that directory instead | |
3148 ;; of a DIRED listing! | |
3149 (if (and (file-directory-p f) default-file) | |
3150 (setq f (expand-file-name | |
3151 (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
|
3152 (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
|
3153 (error "File %s is a directory" f)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3154 f)) |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3155 |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3156 ;; 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
|
3157 ;; name. Otherwise, `ediff' is used. If FILE is given, use this |
11042 | 3158 ;; file and don't create a new one. |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3159 ;; 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
|
3160 ;; `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
|
3161 ;; 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
|
3162 ;; 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
|
3163 (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
|
3164 (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
|
3165 (short-p p) |
38514
10482dd382e7
* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped, courtesy
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38422
diff
changeset
|
3166 (coding-system-for-write ediff-coding-system-for-write) |
23674
4b1d22478c9f
(ediff-make-temp-file): Run the prefix through
Eli Zaretskii <eliz@gnu.org>
parents:
23381
diff
changeset
|
3167 f short-f) |
4b1d22478c9f
(ediff-make-temp-file): Run the prefix through
Eli Zaretskii <eliz@gnu.org>
parents:
23381
diff
changeset
|
3168 (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
|
3169 (not (msdos-long-file-names)) |
4b1d22478c9f
(ediff-make-temp-file): Run the prefix through
Eli Zaretskii <eliz@gnu.org>
parents:
23381
diff
changeset
|
3170 (> (length p) 2)) |
4b1d22478c9f
(ediff-make-temp-file): Run the prefix through
Eli Zaretskii <eliz@gnu.org>
parents:
23381
diff
changeset
|
3171 (setq short-p (substring p 0 2))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3172 |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3173 (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
|
3174 short-f (concat ediff-temp-file-prefix short-p) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3175 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
|
3176 ((find-file-name-handler f 'insert-file-contents) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3177 ;; 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
|
3178 ;; name ends with .Z or .gz |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3179 ;; This is needed so that patches produced by ediff will |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3180 ;; have more meaningful names |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3181 (ediff-make-empty-tmp-file short-f)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3182 (prefix |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3183 ;; 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
|
3184 ;; variant. Here we are trying to use the original file |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3185 ;; name but in the temp directory. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3186 (ediff-make-empty-tmp-file f 'keep-name)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3187 (t |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3188 ;; If don't care about name, add some random stuff |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3189 ;; to proposed file name. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3190 (ediff-make-empty-tmp-file short-f)))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3191 |
11042 | 3192 ;; create the file |
19047 | 3193 (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
|
3194 (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
|
3195 (if end end (point-max)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3196 f |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3197 nil ; don't append---erase |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3198 'no-message) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3199 (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
|
3200 (expand-file-name f)))) |
11042 | 3201 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3202 ;; Create a temporary file. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3203 ;; 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
|
3204 ;; 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
|
3205 ;; 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
|
3206 ;; 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
|
3207 ;; already exists. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3208 ;; 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
|
3209 (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
|
3210 (let ((file proposed-name)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3211 (while (condition-case () |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3212 (progn |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3213 (if (or (file-exists-p file) (not keep-proposed-name)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3214 (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
|
3215 ;; 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
|
3216 ;; 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
|
3217 ;; 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
|
3218 ;; 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
|
3219 ;; 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
|
3220 (with-temp-buffer |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3221 (write-region "" nil file nil 'silent nil 'excl)) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3222 nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3223 (file-already-exists t)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3224 ;; the file was somehow created by someone else between |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3225 ;; `make-temp-name' and `write-region', let's try again. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3226 nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3227 file)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3228 |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3229 |
11042 | 3230 ;; Quote metacharacters (using \) when executing diff in Unix, but not in |
3231 ;; EMX OS/2 | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3232 ;;(defun ediff-protect-metachars (str) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3233 ;; (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
|
3234 ;; (let ((limit 0)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3235 ;; (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
|
3236 ;; (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
|
3237 ;; "\\" |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3238 ;; (substring str (match-beginning 0)))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3239 ;; (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
|
3240 ;; str) |
11042 | 3241 |
3242 ;; Make sure the current buffer (for a file) has the same contents as the | |
3243 ;; file on disk, and attempt to remedy the situation if not. | |
3244 ;; Signal an error if we can't make them the same, or the user doesn't want | |
3245 ;; 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
|
3246 ;; Also, Ediff always offers to revert obsolete buffers, whether they |
11042 | 3247 ;; are modified or not. |
3248 (defun ediff-verify-file-buffer (&optional file-magic) | |
3249 ;; First check if the file has been modified since the buffer visited it. | |
3250 (if (verify-visited-file-modtime (current-buffer)) | |
3251 (if (buffer-modified-p) | |
3252 ;; 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
|
3253 (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
|
3254 (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
|
3255 (buffer-name) |
11042 | 3256 buffer-file-name)) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3257 (condition-case nil |
11042 | 3258 (save-buffer) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3259 (error |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3260 (beep) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3261 (message "Couldn't save %s" buffer-file-name))) |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3262 (error "Buffer is out of sync for file %s" buffer-file-name)) |
11042 | 3263 ;; If buffer is not obsolete and is not modified, do nothing |
3264 nil) | |
3265 ;; If buffer is obsolete, offer to revert | |
3266 (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
|
3267 (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
|
3268 buffer-file-name |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3269 (buffer-name) |
11042 | 3270 buffer-file-name)) |
3271 (progn | |
3272 (if file-magic | |
3273 (erase-buffer)) | |
3274 (revert-buffer t t)) | |
3275 (error "Buffer out of sync for file %s" buffer-file-name)))) | |
3276 | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3277 ;; 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
|
3278 ;; 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
|
3279 (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
|
3280 (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
|
3281 warn-message) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3282 (or (null buff) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3283 (progn |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3284 (setq warn-message |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3285 (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
|
3286 (buffer-name buff) file)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3287 (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
|
3288 (princ "\n\n") |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3289 (princ warn-message) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3290 (princ "\n\n")) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3291 (if (y-or-n-p |
65582
4d1085b02d64
Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents:
64762
diff
changeset
|
3292 (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
|
3293 (with-current-buffer buff |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3294 (save-buffer) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3295 (kill-buffer (current-buffer))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3296 (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
|
3297 )) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3298 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3299 |
11042 | 3300 |
19774 | 3301 (defun ediff-filename-magic-p (file) |
3302 (or (ediff-file-compressed-p file) | |
3303 (ediff-file-remote-p file))) | |
3304 | |
3305 | |
11042 | 3306 (defun ediff-save-buffer (arg) |
3307 "Safe way of saving buffers A, B, C, and the diff output. | |
3308 `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
|
3309 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
|
3310 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3311 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
|
3312 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
|
3313 \(and plain output, if customized output was not generated\)." |
11042 | 3314 (interactive "P") |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3315 (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
|
3316 (ediff-compute-custom-diffs-maybe) |
19047 | 3317 (ediff-with-current-buffer |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3318 (cond ((memq last-command-char '(?a ?b ?c)) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3319 (ediff-get-buffer |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3320 (ediff-char-to-buftype last-command-char))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3321 ((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
|
3322 (message "Saving diff output ...") |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3323 (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
|
3324 (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
|
3325 ediff-diff-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3326 ((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
|
3327 ediff-custom-diff-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3328 ((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
|
3329 ediff-diff-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3330 (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
|
3331 ) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3332 (save-buffer))) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3333 |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3334 |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3335 ;; 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
|
3336 (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
|
3337 (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
|
3338 (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
|
3339 wind |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3340 other-wind |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3341 msg-buf) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3342 (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
|
3343 (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
|
3344 (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
|
3345 (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
|
3346 (select-window wind) |
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
3347 (delete-other-windows) |
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
3348 (split-window-vertically) |
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
3349 (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
|
3350 (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
|
3351 (with-temp-buffer |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3352 (erase-buffer) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3353 (insert |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3354 (format "\n ******* Mark a region in buffer %s *******\n" |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3355 (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
|
3356 (insert |
44615
a1448e19a9f8
* viper-ex.el: Patch by Samuel Padgett. Copyright papers received.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
44028
diff
changeset
|
3357 (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
|
3358 (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
|
3359 (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
|
3360 (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
|
3361 (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
|
3362 (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
|
3363 (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
|
3364 (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
|
3365 (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
|
3366 (select-window wind)) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3367 (condition-case nil |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3368 (recursive-edit) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3369 (quit |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3370 (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
|
3371 ) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3372 cloned-buff)) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3373 |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3374 |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3375 (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
|
3376 (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
|
3377 (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
|
3378 (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
|
3379 (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
|
3380 cloned-buff)) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3381 |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3382 (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
|
3383 (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
|
3384 (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
|
3385 (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
|
3386 (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
|
3387 ;; 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
|
3388 (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
|
3389 (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
|
3390 (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
|
3391 cloned-buff)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3392 |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3393 |
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-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
|
3396 (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
|
3397 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
|
3398 (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
|
3399 )) |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3400 |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3401 |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3402 (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
|
3403 (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
|
3404 (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
|
3405 (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
|
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 |
43714
1c34b0b56515
* ediff-init.el: comments.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43220
diff
changeset
|
3409 ;; 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
|
3410 (defun ediff-compute-custom-diffs-maybe () |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3411 (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
|
3412 (buf-B-file-name (buffer-file-name ediff-buffer-B)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3413 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
|
3414 (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
|
3415 (setq file-A |
e83349d94786
* ediff-util.el (ediff-compute-custom-diffs-maybe): Avoid creating
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
53865
diff
changeset
|
3416 (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
|
3417 (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
|
3418 (setq file-B |
e83349d94786
* ediff-util.el (ediff-compute-custom-diffs-maybe): Avoid creating
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
53865
diff
changeset
|
3419 (ediff-make-temp-file ediff-buffer-B))) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3420 (or (ediff-buffer-live-p ediff-custom-diff-buffer) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3421 (setq ediff-custom-diff-buffer |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3422 (get-buffer-create |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3423 (ediff-unique-buffer-name "*ediff-custom-diff" "*")))) |
43714
1c34b0b56515
* ediff-init.el: comments.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43220
diff
changeset
|
3424 (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
|
3425 (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
|
3426 (erase-buffer)) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3427 (ediff-exec-process |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3428 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
|
3429 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
|
3430 ;; 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
|
3431 (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
|
3432 file-A) |
e83349d94786
* ediff-util.el (ediff-compute-custom-diffs-maybe): Avoid creating
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
53865
diff
changeset
|
3433 (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
|
3434 file-B)) |
36043
5d6b76d28b83
2001-02-12 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
35411
diff
changeset
|
3435 ;; 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
|
3436 (if (fboundp 'diff-mode) |
5d6b76d28b83
2001-02-12 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
35411
diff
changeset
|
3437 (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
|
3438 (diff-mode))) |
54090
e83349d94786
* ediff-util.el (ediff-compute-custom-diffs-maybe): Avoid creating
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
53865
diff
changeset
|
3439 (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
|
3440 (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
|
3441 )) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3442 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3443 (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
|
3444 (interactive "P") |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3445 (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
|
3446 (ediff-compute-custom-diffs-maybe) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3447 (save-excursion |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3448 (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
|
3449 (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
|
3450 ediff-diff-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3451 ((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
|
3452 ediff-custom-diff-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3453 ((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
|
3454 ediff-diff-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3455 (t |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3456 (beep) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3457 (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
|
3458 nil)))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3459 (if buf |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3460 (progn |
19047 | 3461 (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
|
3462 (goto-char (point-min))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3463 (switch-to-buffer buf) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3464 (raise-frame (selected-frame))))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3465 (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
|
3466 (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
|
3467 (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
|
3468 (select-window ediff-control-window))) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3469 |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3470 |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3471 (defun ediff-inferior-compare-regions () |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3472 "Compare regions in an active Ediff session. |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3473 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
|
3474 the files that belong to that session. |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3475 |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3476 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
|
3477 Ediff Control Panel to restore highlighting." |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3478 (interactive) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3479 (let ((answer "") |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3480 (possibilities (list ?A ?B ?C)) |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
3481 (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
|
3482 use-current-diff-p |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3483 begA begB endA endB bufA bufB) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3484 |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3485 (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
|
3486 (progn |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3487 (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
|
3488 (ediff-unhighlight-diff))) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3489 (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
|
3490 |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3491 (cond ((ediff-merge-job) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3492 (setq bufB ediff-buffer-C) |
43714
1c34b0b56515
* ediff-init.el: comments.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43220
diff
changeset
|
3493 ;; ask which buffer to compare to the merge buffer |
18054 | 3494 (while (cond ((eq answer ?A) |
3495 (setq bufA ediff-buffer-A | |
3496 possibilities '(?B)) | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3497 nil) |
18054 | 3498 ((eq answer ?B) |
3499 (setq bufA ediff-buffer-B | |
3500 possibilities '(?A)) | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3501 nil) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3502 ((equal answer "")) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3503 (t (beep 1) |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
3504 (message "Valid values are A or B") |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3505 (sit-for 2) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3506 t)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3507 (let ((cursor-in-echo-area t)) |
43714
1c34b0b56515
* ediff-init.el: comments.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43220
diff
changeset
|
3508 (message |
1c34b0b56515
* ediff-init.el: comments.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43220
diff
changeset
|
3509 "Which buffer to compare to the merge buffer (A or B)? ") |
18054 | 3510 (setq answer (capitalize (read-char-exclusive)))))) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3511 |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3512 ((ediff-3way-comparison-job) |
43714
1c34b0b56515
* ediff-init.el: comments.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43220
diff
changeset
|
3513 ;; ask which two buffers to compare |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3514 (while (cond ((memq answer possibilities) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3515 (setq possibilities (delq answer possibilities)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3516 (setq bufA |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3517 (eval |
19047 | 3518 (ediff-get-symbol-from-alist |
3519 answer ediff-buffer-alist))) | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3520 nil) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3521 ((equal answer "")) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3522 (t (beep 1) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3523 (message |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
3524 "Valid values are %s" |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3525 (mapconcat 'char-to-string possibilities " or ")) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3526 (sit-for 2) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3527 t)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3528 (let ((cursor-in-echo-area t)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3529 (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
|
3530 (mapconcat 'char-to-string possibilities " or ")) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3531 (setq answer (capitalize (read-char-exclusive))))) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3532 (setq answer "") ; silence error msg |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3533 (while (cond ((memq answer possibilities) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3534 (setq possibilities (delq answer possibilities)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3535 (setq bufB |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3536 (eval |
19047 | 3537 (ediff-get-symbol-from-alist |
3538 answer ediff-buffer-alist))) | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3539 nil) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3540 ((equal answer "")) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3541 (t (beep 1) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3542 (message |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
3543 "Valid values are %s" |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3544 (mapconcat 'char-to-string possibilities " or ")) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3545 (sit-for 2) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3546 t)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3547 (let ((cursor-in-echo-area t)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3548 (message "Enter the 2nd buffer you want to compare (%s): " |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3549 (mapconcat 'char-to-string possibilities "/")) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3550 (setq answer (capitalize (read-char-exclusive)))))) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3551 (t ; 2way comparison |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3552 (setq bufA ediff-buffer-A |
18054 | 3553 bufB ediff-buffer-B |
3554 possibilities nil))) | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3555 |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3556 (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
|
3557 (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
|
3558 (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
|
3559 |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3560 (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
|
3561 (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
|
3562 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
|
3563 (ediff-clone-buffer-for-region-comparison bufA "-Region.A-"))) |
19047 | 3564 (ediff-with-current-buffer bufA |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3565 (setq begA (region-beginning) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3566 endA (region-end)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3567 (goto-char begA) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3568 (beginning-of-line) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3569 (setq begA (point)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3570 (goto-char endA) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3571 (end-of-line) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3572 (or (eobp) (forward-char)) ; include the newline char |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3573 (setq endA (point))) |
43714
1c34b0b56515
* ediff-init.el: comments.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43220
diff
changeset
|
3574 |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3575 (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
|
3576 (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
|
3577 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
|
3578 (ediff-clone-buffer-for-region-comparison bufB "-Region.B-"))) |
19047 | 3579 (ediff-with-current-buffer bufB |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3580 (setq begB (region-beginning) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3581 endB (region-end)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3582 (goto-char begB) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3583 (beginning-of-line) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3584 (setq begB (point)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3585 (goto-char endB) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3586 (end-of-line) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3587 (or (eobp) (forward-char)) ; include the newline char |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3588 (setq endB (point))) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3589 |
44028
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3590 |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3591 (ediff-regions-internal |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3592 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
|
3593 nil ; setup-hook |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3594 (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
|
3595 'ediff-regions-wordwise |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3596 'ediff-regions-linewise) |
182881d68883
* ediff-diff.el (ediff-install-fine-diff-if-necessary): take
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
43714
diff
changeset
|
3597 (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
|
3598 t nil) |
18054 | 3599 ;; setup param to pass to ediff-setup |
3600 (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
|
3601 )) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3602 |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3603 |
11042 | 3604 |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3605 (defun ediff-remove-flags-from-buffer (buffer overlay) |
19047 | 3606 (ediff-with-current-buffer buffer |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3607 (let ((inhibit-read-only t)) |
11042 | 3608 (if ediff-xemacs-p |
3609 (ediff-overlay-put overlay 'begin-glyph nil) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3610 (ediff-overlay-put overlay 'before-string nil)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3611 |
11042 | 3612 (if ediff-xemacs-p |
3613 (ediff-overlay-put overlay 'end-glyph nil) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3614 (ediff-overlay-put overlay 'after-string nil)) |
11042 | 3615 ))) |
3616 | |
3617 | |
3618 | |
3619 (defun ediff-place-flags-in-buffer (buf-type buffer ctl-buffer diff) | |
19047 | 3620 (ediff-with-current-buffer buffer |
11042 | 3621 (ediff-place-flags-in-buffer1 buf-type ctl-buffer diff))) |
3622 | |
3623 | |
3624 (defun ediff-place-flags-in-buffer1 (buf-type ctl-buffer diff-no) | |
19047 | 3625 (let* ((curr-overl (ediff-with-current-buffer ctl-buffer |
11042 | 3626 (ediff-get-diff-overlay diff-no buf-type))) |
3627 (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
|
3628 after beg-of-line flag) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3629 |
11042 | 3630 ;; insert flag before the difference |
3631 (goto-char before) | |
3632 (setq beg-of-line (bolp)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3633 |
19047 | 3634 (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
|
3635 (if (eq ediff-highlighting-style 'ascii) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3636 (if beg-of-line |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3637 ediff-before-flag-bol ediff-before-flag-mol)))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3638 |
11042 | 3639 ;; insert the flag itself |
3640 (if ediff-xemacs-p | |
3641 (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
|
3642 (ediff-overlay-put curr-overl 'before-string flag)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3643 |
11042 | 3644 ;; insert the flag after the difference |
3645 ;; `after' must be set here, after the before-flag was inserted | |
3646 (setq after (ediff-get-diff-posn buf-type 'end diff-no ctl-buffer)) | |
3647 (goto-char after) | |
3648 (setq beg-of-line (bolp)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3649 |
19047 | 3650 (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
|
3651 (if (eq ediff-highlighting-style 'ascii) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3652 (if beg-of-line |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3653 ediff-after-flag-eol ediff-after-flag-mol)))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3654 |
11042 | 3655 ;; insert the flag itself |
3656 (if ediff-xemacs-p | |
3657 (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
|
3658 (ediff-overlay-put curr-overl 'after-string flag)) |
11042 | 3659 )) |
3660 | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3661 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3662 ;;; Some diff region tests |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3663 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3664 ;; 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
|
3665 ;; 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
|
3666 ;; 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
|
3667 (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
|
3668 (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
|
3669 (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
|
3670 (= (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
|
3671 (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
|
3672 (= (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
|
3673 (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
|
3674 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3675 ;; 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
|
3676 ;; 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
|
3677 (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
|
3678 (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
|
3679 (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
|
3680 (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
|
3681 (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
|
3682 (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
|
3683 (save-excursion |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3684 (goto-char beg) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3685 (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
|
3686 (>= (point) end)))))) |
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 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3689 (defsubst ediff-get-region-contents (n buf-type ctrl-buf &optional start end) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3690 (ediff-with-current-buffer |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3691 (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
|
3692 (buffer-substring |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3693 (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
|
3694 (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
|
3695 |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3696 ;; Returns positions of difference sectors in the BUF-TYPE buffer. |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3697 ;; 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
|
3698 ;; 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
|
3699 ;; the beginning of a difference or at the end. |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3700 ;; |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3701 ;; The optional argument N says which difference (default: |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3702 ;; `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
|
3703 ;; the user sees). The optional argument CONTROL-BUF says |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3704 ;; 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
|
3705 ;; buffer. |
11042 | 3706 (defun ediff-get-diff-posn (buf-type pos &optional n control-buf) |
3707 (let (diff-overlay) | |
3708 (or control-buf | |
3709 (setq control-buf (current-buffer))) | |
3710 | |
19047 | 3711 (ediff-with-current-buffer control-buf |
11042 | 3712 (or n (setq n ediff-current-difference)) |
3713 (if (or (< n 0) (>= n ediff-number-of-differences)) | |
3714 (if (> ediff-number-of-differences 0) | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3715 (error ediff-BAD-DIFF-NUMBER |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3716 this-command (1+ n) ediff-number-of-differences) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
3717 (error ediff-NO-DIFFERENCES))) |
11042 | 3718 (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
|
3719 (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
|
3720 (error ediff-KILLED-VITAL-BUFFER)) |
11042 | 3721 (if (eq pos 'beg) |
3722 (ediff-overlay-start diff-overlay) | |
3723 (ediff-overlay-end diff-overlay)) | |
3724 )) | |
3725 | |
3726 | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3727 ;; 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
|
3728 ;; ediff-highlighting-style, and ediff-highlight-all-diffs variables. |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3729 (defun ediff-restore-highlighting (&optional ctl-buf) |
19047 | 3730 (ediff-with-current-buffer (or ctl-buf (current-buffer)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3731 (if (and (ediff-has-face-support-p) |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3732 ediff-use-faces |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3733 ediff-highlight-all-diffs) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3734 (ediff-paint-background-regions)) |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
3735 (ediff-select-difference ediff-current-difference))) |
11042 | 3736 |
3737 | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3738 |
11042 | 3739 ;; null out difference overlays so they won't slow down future |
3740 ;; editing operations | |
3741 ;; VEC is either a difference vector or a fine-diff vector | |
3742 (defun ediff-clear-diff-vector (vec-var &optional fine-diffs-also) | |
3743 (if (vectorp (symbol-value vec-var)) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3744 (mapcar (lambda (elt) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3745 (ediff-delete-overlay |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3746 (ediff-get-diff-overlay-from-diff-record elt)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3747 (if fine-diffs-also |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3748 (ediff-clear-fine-diff-vector elt)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3749 ) |
11042 | 3750 (symbol-value vec-var))) |
3751 ;; allow them to be garbage collected | |
3752 (set vec-var nil)) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3753 |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3754 |
11042 | 3755 |
3756 ;;; Misc | |
3757 | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3758 ;; In Emacs, this just makes overlay. In the future, when Emacs will start |
11042 | 3759 ;; supporting sticky overlays, this function will make a sticky overlay. |
3760 ;; BEG and END are expressions telling where overlay starts. | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3761 ;; If they are numbers or buffers, then all is well. Otherwise, they must |
11042 | 3762 ;; be expressions to be evaluated in buffer BUF in order to get the overlay |
3763 ;; bounds. | |
3764 ;; If BUFF is not a live buffer, then return nil; otherwise, return the | |
3765 ;; newly created overlay. | |
3766 (defun ediff-make-bullet-proof-overlay (beg end buff) | |
3767 (if (ediff-buffer-live-p buff) | |
3768 (let (overl) | |
19047 | 3769 (ediff-with-current-buffer buff |
11042 | 3770 (or (number-or-marker-p beg) |
3771 (setq beg (eval beg))) | |
3772 (or (number-or-marker-p end) | |
3773 (setq end (eval end))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3774 (setq overl |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3775 (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
|
3776 (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
|
3777 ;; 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
|
3778 (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
|
3779 )) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3780 |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3781 ;; never detach |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3782 (ediff-overlay-put |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3783 overl (if ediff-emacs-p '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
|
3784 ;; make overlay open-ended |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3785 ;; In emacs, it is made open ended at creation time |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3786 (if ediff-xemacs-p |
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3787 (progn |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3788 (ediff-overlay-put overl 'start-open nil) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
3789 (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
|
3790 (ediff-overlay-put overl 'ediff-diff-num 0) |
11042 | 3791 overl)))) |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3792 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3793 |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3794 (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
|
3795 (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
|
3796 (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
|
3797 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
|
3798 (buffer (ediff-get-buffer type)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3799 (face (face-name |
64215
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64091
diff
changeset
|
3800 (ediff-get-symbol-from-alist |
a4c59075cac8
* viper-cmd.el (viper--key-maps): new variable.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64091
diff
changeset
|
3801 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
|
3802 (set overlay |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
3803 (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
|
3804 (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
|
3805 (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
|
3806 )) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3807 |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3808 |
11042 | 3809 ;; Like other-buffer, but prefers visible buffers and ignores temporary or |
3810 ;; other insignificant buffers (those beginning with "^[ *]"). | |
3811 ;; Gets one arg--buffer name or a list of buffer names (it won't return | |
3812 ;; these buffers). | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3813 ;; EXCL-BUFF-LIST is an exclusion list. |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3814 (defun ediff-other-buffer (excl-buff-lst) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3815 (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
|
3816 (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
|
3817 ;; 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
|
3818 ;; 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
|
3819 ;; append instead of nconc |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3820 (selected-buffers (ediff-get-selected-buffers)) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3821 (prefered-buffer (car all-buffers)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3822 visible-dired-buffers |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3823 (excl-buff-name-list |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3824 (mapcar |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3825 (lambda (b) (cond ((stringp b) b) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3826 ((bufferp b) (buffer-name b)))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3827 excl-buff-lst)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3828 ;; 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
|
3829 ;; 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
|
3830 ;; has already chosen a dired buffer before |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3831 (use-dired-major-mode |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3832 (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
|
3833 ((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
|
3834 'dired-mode) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3835 'yes) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3836 (t 'no))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3837 ;; significant-buffers must be visible and not belong |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3838 ;; to the exclusion list `buff-list' |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3839 ;; 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
|
3840 ;; Furthermore, we exclude dired buffers, unless they are the only |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3841 ;; ones visible (and there are at least two of them). |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3842 ;; 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
|
3843 ;; 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
|
3844 ;; clicked on it or did something to distinguish it). |
11042 | 3845 (significant-buffers |
3846 (mapcar | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3847 (lambda (x) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3848 (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
|
3849 ((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
|
3850 ((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
|
3851 ((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
|
3852 ;; 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
|
3853 ;; dired. |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3854 ((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
|
3855 (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
|
3856 'dired-mode) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3857 x nil)) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3858 ((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
|
3859 'dired-mode) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3860 (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
|
3861 ;; 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
|
3862 ;; 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
|
3863 ;; 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
|
3864 (setq visible-dired-buffers |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3865 (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
|
3866 ;; 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
|
3867 nil) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3868 ((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
|
3869 '(rmail-mode |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3870 vm-mode |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3871 gnus-article-mode |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3872 mh-show-mode)) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3873 x) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3874 ((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
|
3875 ((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
|
3876 (t x))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3877 all-buffers)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3878 (clean-significant-buffers (delq nil significant-buffers)) |
11042 | 3879 less-significant-buffers) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3880 |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3881 (if (and (null clean-significant-buffers) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3882 (> (length visible-dired-buffers) 0)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3883 (setq clean-significant-buffers visible-dired-buffers)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3884 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3885 (cond (clean-significant-buffers (car clean-significant-buffers)) |
11042 | 3886 ;; try also buffers that are not displayed in windows |
3887 ((setq less-significant-buffers | |
3888 (delq nil | |
3889 (mapcar | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3890 (lambda (x) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3891 (cond ((member (buffer-name x) excl-buff-name-list) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3892 nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3893 ((eq use-dired-major-mode 'yes) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3894 (if (eq (ediff-with-current-buffer |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3895 x major-mode) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3896 'dired-mode) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3897 x nil)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3898 ((eq (ediff-with-current-buffer x major-mode) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3899 'dired-mode) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3900 nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3901 ((string-match "^[ *]" (buffer-name x)) nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3902 ((string= "*scratch*" (buffer-name x)) nil) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3903 (t x))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3904 all-buffers))) |
11042 | 3905 (car less-significant-buffers)) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3906 (t "*scratch*")) |
11042 | 3907 )) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3908 |
33019
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3909 |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3910 ;; 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
|
3911 ;; 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
|
3912 ;; 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
|
3913 (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
|
3914 (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
|
3915 (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
|
3916 (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
|
3917 (error)) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3918 )) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3919 (save-excursion |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3920 (goto-char (point-max)) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3921 (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
|
3922 (forward-char 1) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3923 (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
|
3924 lis)) |
6306740f6938
2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
3925 )) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3926 |
11042 | 3927 ;; Construct a unique buffer name. |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3928 ;; The first one tried is prefixsuffix, then prefix<2>suffix, |
11042 | 3929 ;; prefix<3>suffix, etc. |
3930 (defun ediff-unique-buffer-name (prefix suffix) | |
3931 (if (null (get-buffer (concat prefix suffix))) | |
3932 (concat prefix suffix) | |
3933 (let ((n 2)) | |
3934 (while (get-buffer (format "%s<%d>%s" prefix n suffix)) | |
3935 (setq n (1+ n))) | |
3936 (format "%s<%d>%s" prefix n suffix)))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3937 |
11042 | 3938 |
3939 (defun ediff-submit-report () | |
3940 "Submit bug report on Ediff." | |
3941 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3942 (ediff-barf-if-not-control-buffer) |
11042 | 3943 (let ((reporter-prompt-for-summary-p t) |
3944 (ctl-buf ediff-control-buffer) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3945 (ediff-device-type (ediff-device-type)) |
11042 | 3946 varlist salutation buffer-name) |
3947 (setq varlist '(ediff-diff-program ediff-diff-options | |
3948 ediff-patch-program ediff-patch-options | |
3949 ediff-shell | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3950 ediff-use-faces |
11042 | 3951 ediff-auto-refine ediff-highlighting-style |
3952 ediff-buffer-A ediff-buffer-B ediff-control-buffer | |
3953 ediff-forward-word-function | |
3954 ediff-control-frame | |
3955 ediff-control-frame-parameters | |
3956 ediff-control-frame-position-function | |
3957 ediff-prefer-iconified-control-frame | |
3958 ediff-window-setup-function | |
3959 ediff-split-window-function | |
3960 ediff-job-name | |
3961 ediff-word-mode | |
3962 buffer-name | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3963 ediff-device-type |
11042 | 3964 )) |
3965 (setq salutation " | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3966 Congratulations! You may have unearthed a bug in Ediff! |
11042 | 3967 |
3968 Please make a concise and accurate summary of what happened | |
3969 and mail it to the address above. | |
3970 ----------------------------------------------------------- | |
3971 ") | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3972 |
11042 | 3973 (ediff-skip-unsuitable-frames) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3974 (ediff-reset-mouse) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
3975 |
11042 | 3976 (switch-to-buffer ediff-msg-buffer) |
3977 (erase-buffer) | |
3978 (delete-other-windows) | |
3979 (insert " | |
3980 Please read this first: | |
3981 ---------------------- | |
3982 | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
3983 Some ``bugs'' may actually be no bugs at all. For instance, if you are |
11042 | 3984 reporting that certain difference regions are not matched as you think they |
3985 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
|
3986 constitutes a difference region. Ediff is an Emacs interface to diff, and |
11042 | 3987 it has nothing to do with those decisions---it only takes the output from |
3988 diff and presents it in a way that is better suited for human browsing and | |
3989 manipulation. | |
3990 | |
3991 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
|
3992 an Emacs bug. Report this to Emacs maintainers. |
11042 | 3993 |
3994 Another popular topic for reports is compilation messages. Because Ediff | |
3995 interfaces to several other packages and runs under Emacs and XEmacs, | |
3996 byte-compilation may produce output like this: | |
3997 | |
3998 While compiling toplevel forms in file ediff.el: | |
3999 ** reference to free variable pm-color-alist | |
4000 ........................ | |
4001 While compiling the end of the data: | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
4002 ** 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
|
4003 ediff-valid-color-p, ediff-set-face, |
11042 | 4004 ........................ |
4005 | |
4006 These are NOT errors, but inevitable warnings, which ought to be ignored. | |
4007 | |
4008 Please do not report those and similar things. However, comments and | |
4009 suggestions are always welcome. | |
4010 | |
4011 Mail anyway? (y or n) ") | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
4012 |
11042 | 4013 (if (y-or-n-p "Mail anyway? ") |
4014 (progn | |
4015 (if (ediff-buffer-live-p ctl-buf) | |
4016 (set-buffer ctl-buf)) | |
4017 (setq buffer-name (buffer-name)) | |
4018 (require 'reporter) | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4019 (reporter-submit-bug-report "kifer@cs.stonybrook.edu" |
11042 | 4020 (ediff-version) |
4021 varlist | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
4022 nil |
11042 | 4023 'delete-other-windows |
4024 salutation)) | |
4025 (bury-buffer) | |
4026 (beep 1)(message "Bug report aborted") | |
4027 (if (ediff-buffer-live-p ctl-buf) | |
19047 | 4028 (ediff-with-current-buffer ctl-buf |
11042 | 4029 (ediff-recenter 'no-rehighlight)))) |
4030 )) | |
36857
f6386773ce30
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
36456
diff
changeset
|
4031 |
f6386773ce30
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
36456
diff
changeset
|
4032 |
f6386773ce30
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
36456
diff
changeset
|
4033 ;; 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
|
4034 ;; 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
|
4035 ;; 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
|
4036 ;; 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
|
4037 ;; 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
|
4038 ;; during the refinement operation |
f6386773ce30
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
36456
diff
changeset
|
4039 (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
|
4040 (setq ediff-syntax-table |
f6386773ce30
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
36456
diff
changeset
|
4041 (ediff-with-current-buffer ediff-buffer-A |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
4042 (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
|
4043 '(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
|
4044 (syntax-table)))) |
f6386773ce30
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
36456
diff
changeset
|
4045 (if (not ediff-syntax-table) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
4046 (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
|
4047 (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
|
4048 (syntax-table)))) |
f6386773ce30
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
36456
diff
changeset
|
4049 ) |
f6386773ce30
2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
36456
diff
changeset
|
4050 |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
4051 |
11042 | 4052 (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
|
4053 (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
|
4054 (zmacs-deactivate-region) ; xemacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4055 (deactivate-mark) ; emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4056 )) |
16766
beb94a5271e2
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
16248
diff
changeset
|
4057 (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
|
4058 (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
|
4059 (zmacs-activate-region) ; xemacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4060 (setq mark-active t) ; emacs |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4061 )) |
11042 | 4062 |
4063 (cond ((fboundp 'nuke-selective-display) | |
47520
a37b476e1aec
2002-09-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
46822
diff
changeset
|
4064 ;; XEmacs has nuke-selective-display |
a37b476e1aec
2002-09-18 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
46822
diff
changeset
|
4065 (defalias 'ediff-nuke-selective-display 'nuke-selective-display)) |
11042 | 4066 (t |
4067 (defun ediff-nuke-selective-display () | |
4068 (save-excursion | |
4069 (save-restriction | |
4070 (widen) | |
4071 (goto-char (point-min)) | |
4072 (let ((mod-p (buffer-modified-p)) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4073 buffer-read-only end) |
11042 | 4074 (and (eq t selective-display) |
4075 (while (search-forward "\^M" nil t) | |
4076 (end-of-line) | |
4077 (setq end (point)) | |
4078 (beginning-of-line) | |
4079 (while (search-forward "\^M" end t) | |
4080 (delete-char -1) | |
4081 (insert "\^J")))) | |
4082 (set-buffer-modified-p mod-p) | |
4083 (setq selective-display nil))))) | |
4084 )) | |
4085 | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
4086 |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4087 ;; The next two are modified versions from emerge.el. |
11042 | 4088 ;; VARS must be a list of symbols |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4089 ;; 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
|
4090 (defsubst ediff-save-variables (vars) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4091 (mapcar (lambda (v) (cons v (symbol-value v))) |
11042 | 4092 vars)) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4093 ;; VARS is a list of variable symbols. |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4094 (defun ediff-restore-variables (vars assoc-list) |
11042 | 4095 (while vars |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4096 (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
|
4097 (setq vars (cdr vars)))) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
4098 |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4099 (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
|
4100 (let* ((assoc-list |
19047 | 4101 (symbol-value (ediff-get-symbol-from-alist |
4102 buf-type | |
4103 ediff-buffer-values-orig-alist))) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4104 (assoc-elt (assoc var assoc-list))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4105 (if assoc-elt |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4106 (setcdr assoc-elt value)))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
4107 |
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
4108 |
11042 | 4109 ;; must execute in control buf |
4110 (defun ediff-save-protected-variables () | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4111 (setq ediff-buffer-values-orig-A |
19047 | 4112 (ediff-with-current-buffer ediff-buffer-A |
11042 | 4113 (ediff-save-variables ediff-protected-variables))) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4114 (setq ediff-buffer-values-orig-B |
19047 | 4115 (ediff-with-current-buffer ediff-buffer-B |
11042 | 4116 (ediff-save-variables ediff-protected-variables))) |
4117 (if ediff-3way-comparison-job | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4118 (setq ediff-buffer-values-orig-C |
19047 | 4119 (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
|
4120 (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
|
4121 (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
|
4122 (setq ediff-buffer-values-orig-Ancestor |
19047 | 4123 (ediff-with-current-buffer ediff-ancestor-buffer |
11042 | 4124 (ediff-save-variables ediff-protected-variables))))) |
4125 | |
4126 ;; must execute in control buf | |
4127 (defun ediff-restore-protected-variables () | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4128 (let ((values-A ediff-buffer-values-orig-A) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4129 (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
|
4130 (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
|
4131 (values-Ancestor ediff-buffer-values-orig-Ancestor)) |
19047 | 4132 (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
|
4133 (ediff-restore-variables ediff-protected-variables values-A)) |
19047 | 4134 (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
|
4135 (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
|
4136 (if ediff-3way-comparison-job |
19047 | 4137 (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
|
4138 (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
|
4139 (if (ediff-buffer-live-p ediff-ancestor-buffer) |
19047 | 4140 (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
|
4141 (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
|
4142 )) |
11042 | 4143 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4144 ;; save BUFFER in FILE. used in hooks. |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4145 (defun ediff-save-buffer-in-file (buffer file) |
19047 | 4146 (ediff-with-current-buffer buffer |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4147 (write-file file))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4148 |
11042 | 4149 |
4150 ;;; Debug | |
4151 | |
4152 (ediff-defvar-local ediff-command-begin-time '(0 0 0) "") | |
4153 | |
4154 ;; calculate time used by command | |
4155 (defun ediff-calc-command-time () | |
4156 (let ((end (current-time)) | |
4157 micro sec) | |
4158 (setq micro | |
4159 (if (>= (nth 2 end) (nth 2 ediff-command-begin-time)) | |
4160 (- (nth 2 end) (nth 2 ediff-command-begin-time)) | |
4161 (+ (nth 2 end) (- 1000000 (nth 2 ediff-command-begin-time))))) | |
4162 (setq sec (- (nth 1 end) (nth 1 ediff-command-begin-time))) | |
4163 (or (equal ediff-command-begin-time '(0 0 0)) | |
4164 (message "Elapsed time: %d second(s) + %d microsecond(s)" sec micro)))) | |
4165 | |
4166 (defsubst ediff-save-time () | |
4167 (setq ediff-command-begin-time (current-time))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
4168 |
11042 | 4169 (defun ediff-profile () |
4170 "Toggle profiling Ediff commands." | |
4171 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
4172 (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
|
4173 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4174 (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
|
4175 (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
|
4176 nil ; emacs form |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4177 ) |
42288
3ce98f3e0608
2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
38514
diff
changeset
|
4178 |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4179 (let ((pre-hook 'pre-command-hook) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4180 (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
|
4181 (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
|
4182 (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
|
4183 (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
|
4184 (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
|
4185 (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
|
4186 (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
|
4187 (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
|
4188 (message "Ediff profiling enabled")))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
4189 |
11042 | 4190 (defun ediff-print-diff-vector (diff-vector-var) |
4191 (princ (format "\n*** %S ***\n" diff-vector-var)) | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4192 (mapcar (lambda (overl-vec) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4193 (princ |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4194 (format |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4195 "Diff %d: \tOverlay: %S |
11042 | 4196 \t\tFine diffs: %s |
4197 \t\tNo-fine-diff-flag: %S | |
4198 \t\tState-of-diff:\t %S | |
4199 \t\tState-of-merge:\t %S | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
4200 " |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4201 (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
|
4202 (aref overl-vec 0) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4203 ;; fine-diff-vector |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4204 (if (= (length (aref overl-vec 1)) 0) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4205 "none\n" |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4206 (mapconcat 'prin1-to-string |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4207 (aref overl-vec 1) "\n\t\t\t ")) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4208 (aref overl-vec 2) ; no fine diff flag |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4209 (aref overl-vec 3) ; state-of-diff |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4210 (aref overl-vec 4) ; state-of-merge |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4211 ))) |
11042 | 4212 (eval diff-vector-var))) |
4213 | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
4214 |
11042 | 4215 |
4216 (defun ediff-debug-info () | |
4217 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
4218 (ediff-barf-if-not-control-buffer) |
11042 | 4219 (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
|
4220 (ediff-with-current-buffer standard-output |
25fb6fc4f66b
(ediff-status-info, ediff-debug-info): Put temp
Dave Love <fx@gnu.org>
parents:
33019
diff
changeset
|
4221 (fundamental-mode)) |
11042 | 4222 (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
|
4223 (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
|
4224 (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
|
4225 (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
|
4226 (ediff-print-diff-vector (intern "ediff-difference-vector-Ancestor")) |
11042 | 4227 )) |
4228 | |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4229 |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4230 ;;; General utilities |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4231 |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4232 ;; this uses comparison-func to decide who is a member |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4233 (defun ediff-member (elt lis comparison-func) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4234 (while (and lis (not (funcall comparison-func (car lis) elt))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4235 (setq lis (cdr lis))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4236 lis) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4237 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4238 ;; 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
|
4239 ;; 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
|
4240 (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
|
4241 (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
|
4242 overriding-local-map |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4243 nil nil)))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4244 (if desc |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4245 (key-description desc) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42288
diff
changeset
|
4246 (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
|
4247 |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4248 ;; 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
|
4249 ;; intersection looks like |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4250 (defun ediff-intersection (lis1 lis2 comparison-func) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4251 (let ((result (list 'a))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4252 (while lis1 |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4253 (if (ediff-member (car lis1) lis2 comparison-func) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4254 (nconc result (list (car lis1)))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4255 (setq lis1 (cdr lis1))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4256 (cdr result))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
4257 |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4258 |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4259 ;; eliminates duplicates using comparison-func |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4260 (defun ediff-union (lis1 lis2 comparison-func) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4261 (let ((result (list 'a))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4262 (while lis1 |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4263 (or (ediff-member (car lis1) (cdr result) comparison-func) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4264 (nconc result (list (car lis1)))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4265 (setq lis1 (cdr lis1))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4266 (while lis2 |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4267 (or (ediff-member (car lis2) (cdr result) comparison-func) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4268 (nconc result (list (car lis2)))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4269 (setq lis2 (cdr lis2))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4270 (cdr result))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4271 |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4272 ;; eliminates duplicates using comparison-func |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4273 (defun ediff-set-difference (lis1 lis2 comparison-func) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4274 (let ((result (list 'a))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4275 (while lis1 |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4276 (or (ediff-member (car lis1) (cdr result) comparison-func) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4277 (ediff-member (car lis1) lis2 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 (cdr result))) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4281 |
33392
25fb6fc4f66b
(ediff-status-info, ediff-debug-info): Put temp
Dave Love <fx@gnu.org>
parents:
33019
diff
changeset
|
4282 (if (fboundp 'copy-sequence) |
46822
341d8797885c
(ediff-copy-list): Use `defalias' instead of
John Paul Wallington <jpw@pobox.com>
parents:
44615
diff
changeset
|
4283 (defalias 'ediff-copy-list 'copy-sequence) |
33392
25fb6fc4f66b
(ediff-status-info, ediff-debug-info): Put temp
Dave Love <fx@gnu.org>
parents:
33019
diff
changeset
|
4284 (defun ediff-copy-list (list) |
25fb6fc4f66b
(ediff-status-info, ediff-debug-info): Put temp
Dave Love <fx@gnu.org>
parents:
33019
diff
changeset
|
4285 (if (consp list) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4286 ;;;(let ((res nil)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4287 ;;; (while (consp list) (push (pop list) res)) |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4288 ;;; (prog1 (nreverse res) (setcdr res list))) |
33392
25fb6fc4f66b
(ediff-status-info, ediff-debug-info): Put temp
Dave Love <fx@gnu.org>
parents:
33019
diff
changeset
|
4289 (let (res elt) |
25fb6fc4f66b
(ediff-status-info, ediff-debug-info): Put temp
Dave Love <fx@gnu.org>
parents:
33019
diff
changeset
|
4290 (while (consp list) |
25fb6fc4f66b
(ediff-status-info, ediff-debug-info): Put temp
Dave Love <fx@gnu.org>
parents:
33019
diff
changeset
|
4291 (setq elt (car list) |
25fb6fc4f66b
(ediff-status-info, ediff-debug-info): Put temp
Dave Love <fx@gnu.org>
parents:
33019
diff
changeset
|
4292 res (cons elt res) |
25fb6fc4f66b
(ediff-status-info, ediff-debug-info): Put temp
Dave Love <fx@gnu.org>
parents:
33019
diff
changeset
|
4293 list (cdr list))) |
25fb6fc4f66b
(ediff-status-info, ediff-debug-info): Put temp
Dave Love <fx@gnu.org>
parents:
33019
diff
changeset
|
4294 (nreverse res)) |
25fb6fc4f66b
(ediff-status-info, ediff-debug-info): Put temp
Dave Love <fx@gnu.org>
parents:
33019
diff
changeset
|
4295 (car list)))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26039
diff
changeset
|
4296 |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
4297 |
11042 | 4298 ;; don't report error if version control package wasn't found |
4299 ;;(ediff-load-version-control 'silent) | |
4300 | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
4301 (run-hooks 'ediff-load-hook) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47846
diff
changeset
|
4302 |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
4303 |
11042 | 4304 ;;; Local Variables: |
4305 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) | |
19047 | 4306 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) |
4307 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) | |
11042 | 4308 ;;; End: |
4309 | |
52401 | 4310 ;;; arch-tag: f51099b6-ef4b-470f-88a1-3a0e0b03a879 |
11042 | 4311 ;;; ediff-util.el ends here |