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