Mercurial > emacs
annotate lisp/ediff-util.el @ 14502:37107ad125f0
Include blockinput.h.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Tue, 06 Feb 1996 20:09:50 +0000 |
parents | 83f275dcd93a |
children | c768f6d7daaa |
rev | line source |
---|---|
11042 | 1 ;;; ediff-util.el --- the core commands and utilities of ediff |
14169 | 2 |
3 ;; Copyright (C) 1994, 1995 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 |
24 ;;; Code: | |
25 | |
26 (require 'ediff-init) | |
13605 | 27 (require 'ediff-mult) |
11042 | 28 |
29 | |
30 ;;; Functions | |
31 | |
32 (defun ediff-mode () | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
33 "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
|
34 This mode is entered through one of the following commands: |
11042 | 35 `ediff' |
36 `ediff-files' | |
37 `ediff-buffers' | |
38 `ediff3' | |
39 `ediff-files3' | |
40 `ediff-buffers3' | |
41 `ediff-merge' | |
42 `ediff-merge-files' | |
43 `ediff-merge-files-with-ancestor' | |
44 `ediff-merge-buffers' | |
45 `ediff-merge-buffers-with-ancestor' | |
46 `ediff-merge-revisions' | |
47 `ediff-merge-revisions-with-ancestor' | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
48 `ediff-windows-wordwise' |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
49 `ediff-windows-linewise' |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
50 `ediff-regions-wordwise' |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
51 `ediff-regions-linewise' |
11042 | 52 `epatch' |
53 `ediff-patch-file' | |
54 `ediff-patch-buffer' | |
55 `epatch-buffer' | |
56 `ediff-revision' | |
57 | |
58 Commands: | |
59 \\{ediff-mode-map}" | |
60 (kill-all-local-variables) | |
61 (setq major-mode 'ediff-mode) | |
62 (setq mode-name "Ediff") | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
63 (run-hooks 'ediff-mode-hook)) |
11042 | 64 |
65 | |
66 (require 'ediff-diff) | |
67 (require 'ediff-merg) | |
68 | |
69 | |
70 ;;; Build keymaps | |
71 | |
72 (ediff-defvar-local ediff-mode-map nil | |
73 "Local keymap used in Ediff mode. | |
74 This is local to each Ediff Control Panel, so they may vary from invocation | |
75 to invocation.") | |
76 | |
77 ;; Set up the keymap in the control buffer | |
78 (defun ediff-set-keys () | |
79 "Set up Ediff keymap, if necessary." | |
80 (if (null ediff-mode-map) | |
81 (ediff-setup-keymap)) | |
82 (use-local-map ediff-mode-map)) | |
83 | |
84 ;; Reload Ediff keymap. For debugging only. | |
85 (defun ediff-reload-keymap () | |
86 (interactive) | |
87 (setq ediff-mode-map nil) | |
88 (ediff-set-keys)) | |
89 | |
90 | |
91 (defun ediff-setup-keymap () | |
92 "Set up the keymap used in the control buffer of Ediff." | |
93 (setq ediff-mode-map (make-sparse-keymap)) | |
94 (suppress-keymap ediff-mode-map) | |
95 | |
96 (define-key ediff-mode-map "p" 'ediff-previous-difference) | |
97 (define-key ediff-mode-map "\C-?" 'ediff-previous-difference) | |
98 (define-key ediff-mode-map [backspace] 'ediff-previous-difference) | |
99 (define-key ediff-mode-map [delete] 'ediff-previous-difference) | |
100 (define-key ediff-mode-map "\C-h" (if ediff-no-emacs-help-in-control-buffer | |
101 'ediff-previous-difference nil)) | |
102 (define-key ediff-mode-map "n" 'ediff-next-difference) | |
103 (define-key ediff-mode-map " " 'ediff-next-difference) | |
104 (define-key ediff-mode-map "j" 'ediff-jump-to-difference) | |
105 (define-key ediff-mode-map "g" nil) | |
106 (define-key ediff-mode-map "ga" 'ediff-jump-to-difference-at-point) | |
107 (define-key ediff-mode-map "gb" 'ediff-jump-to-difference-at-point) | |
108 (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
|
109 (define-key ediff-mode-map "D" 'ediff-show-diff-output) |
11042 | 110 (define-key ediff-mode-map "z" 'ediff-suspend) |
111 (define-key ediff-mode-map "\C-l" 'ediff-recenter) | |
112 (define-key ediff-mode-map "|" 'ediff-toggle-split) | |
113 (define-key ediff-mode-map "h" 'ediff-toggle-hilit) | |
114 (or ediff-word-mode | |
115 (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
|
116 (if ediff-narrow-job |
11042 | 117 (define-key ediff-mode-map "%" 'ediff-toggle-narrow-region)) |
118 (define-key ediff-mode-map "~" 'ediff-swap-buffers) | |
119 (define-key ediff-mode-map "v" 'ediff-scroll-vertically) | |
120 (define-key ediff-mode-map "\C-v" 'ediff-scroll-vertically) | |
121 (define-key ediff-mode-map "^" 'ediff-scroll-vertically) | |
122 (define-key ediff-mode-map "\M-v" 'ediff-scroll-vertically) | |
123 (define-key ediff-mode-map "V" 'ediff-scroll-vertically) | |
124 (define-key ediff-mode-map "<" 'ediff-scroll-horizontally) | |
125 (define-key ediff-mode-map ">" 'ediff-scroll-horizontally) | |
126 (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
|
127 (define-key ediff-mode-map "E" 'ediff-documentation) |
11042 | 128 (define-key ediff-mode-map "?" 'ediff-toggle-help) |
129 (define-key ediff-mode-map "!" 'ediff-update-diffs) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
130 (define-key ediff-mode-map "M" 'ediff-show-meta-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
131 (define-key ediff-mode-map "R" 'ediff-show-registry) |
11042 | 132 (or ediff-word-mode |
133 (define-key ediff-mode-map "*" 'ediff-make-or-kill-fine-diffs)) | |
134 (define-key ediff-mode-map "a" nil) | |
135 (define-key ediff-mode-map "b" nil) | |
136 (define-key ediff-mode-map "r" nil) | |
137 (cond (ediff-merge-job | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
138 ;; Will barf if no ancestor |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
139 (define-key ediff-mode-map "/" 'ediff-show-ancestor) |
11042 | 140 ;; In merging, we allow only A->C and B->C copying. |
141 (define-key ediff-mode-map "a" (function | |
142 (lambda (arg) | |
143 (interactive "P") | |
144 (ediff-diff-to-diff arg "ac")))) | |
145 (define-key ediff-mode-map "b" (function | |
146 (lambda (arg) | |
147 (interactive "P") | |
148 (ediff-diff-to-diff arg "bc")))) | |
149 (define-key ediff-mode-map "r" (function | |
150 (lambda (arg) | |
151 (interactive "P") | |
152 (ediff-restore-diff arg ?c)))) | |
153 (define-key ediff-mode-map "s" 'ediff-shrink-window-C) | |
154 (define-key ediff-mode-map "+" 'ediff-combine-diffs) | |
155 (define-key ediff-mode-map "$" 'ediff-toggle-show-clashes-only) | |
156 (define-key ediff-mode-map "&" 'ediff-re-merge)) | |
157 (ediff-3way-comparison-job | |
158 (define-key ediff-mode-map "ab" 'ediff-diff-to-diff) | |
159 (define-key ediff-mode-map "ba" 'ediff-diff-to-diff) | |
160 (define-key ediff-mode-map "ac" 'ediff-diff-to-diff) | |
161 (define-key ediff-mode-map "bc" 'ediff-diff-to-diff) | |
162 (define-key ediff-mode-map "c" nil) | |
163 (define-key ediff-mode-map "ca" 'ediff-diff-to-diff) | |
164 (define-key ediff-mode-map "cb" 'ediff-diff-to-diff) | |
165 (define-key ediff-mode-map "ra" 'ediff-restore-diff) | |
166 (define-key ediff-mode-map "rb" 'ediff-restore-diff) | |
167 (define-key ediff-mode-map "rc" 'ediff-restore-diff) | |
168 (define-key ediff-mode-map "C" 'ediff-toggle-read-only)) | |
169 (t ; 2-way comparison | |
170 (define-key ediff-mode-map "a" (function | |
171 (lambda (arg) | |
172 (interactive "P") | |
173 (ediff-diff-to-diff arg "ab")))) | |
174 (define-key ediff-mode-map "b" (function | |
175 (lambda (arg) | |
176 (interactive "P") | |
177 (ediff-diff-to-diff arg "ba")))) | |
178 (define-key ediff-mode-map "ra" 'ediff-restore-diff) | |
179 (define-key ediff-mode-map "rb" 'ediff-restore-diff)) | |
180 ) ; cond | |
181 (define-key ediff-mode-map "G" 'ediff-submit-report) | |
182 (define-key ediff-mode-map "#" nil) | |
183 (define-key ediff-mode-map "#h" 'ediff-toggle-regexp-match) | |
184 (define-key ediff-mode-map "#f" 'ediff-toggle-regexp-match) | |
185 (or ediff-word-mode | |
186 (define-key ediff-mode-map "##" 'ediff-toggle-skip-similar)) | |
187 (define-key ediff-mode-map "o" nil) | |
188 (define-key ediff-mode-map "A" 'ediff-toggle-read-only) | |
189 (define-key ediff-mode-map "B" 'ediff-toggle-read-only) | |
190 (define-key ediff-mode-map "w" nil) | |
191 (define-key ediff-mode-map "wa" 'ediff-save-buffer) | |
192 (define-key ediff-mode-map "wb" 'ediff-save-buffer) | |
193 (define-key ediff-mode-map "wd" 'ediff-save-buffer) | |
194 (if ediff-3way-job | |
195 (progn | |
196 (define-key ediff-mode-map "wc" 'ediff-save-buffer) | |
197 (define-key ediff-mode-map "gc" 'ediff-jump-to-difference-at-point) | |
198 )) | |
199 | |
200 (define-key ediff-mode-map "m" 'ediff-toggle-wide-display) | |
201 | |
202 ;; Allow ediff-mode-map to be referenced indirectly | |
203 (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
|
204 (run-hooks 'ediff-keymap-setup-hook)) |
11042 | 205 |
206 | |
207 ;;; Setup functions | |
208 | |
209 (require 'ediff-wind) | |
210 | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
211 (or (boundp 'synchronize-minibuffers) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
212 (defvar synchronize-minibuffers nil)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
213 |
11042 | 214 ;; Common startup entry for all Ediff functions |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
215 ;; It now returns control buffer so other functions can do post-processing |
11042 | 216 (defun ediff-setup (buffer-A file-A buffer-B file-B buffer-C file-C |
217 startup-hooks setup-parameters) | |
218 (setq file-A (expand-file-name file-A)) | |
219 (setq file-B (expand-file-name file-B)) | |
220 (if (stringp file-C) | |
221 (setq file-C (expand-file-name file-C))) | |
222 (let* ((control-buffer-name | |
223 (ediff-unique-buffer-name "*Ediff Control Panel" "*")) | |
224 (control-buffer (ediff-eval-in-buffer buffer-A | |
225 (get-buffer-create control-buffer-name)))) | |
226 (ediff-eval-in-buffer control-buffer | |
227 (ediff-mode) | |
228 | |
229 ;; unwrap set up parameters passed as argument | |
230 (while setup-parameters | |
231 (set (car (car setup-parameters)) (cdr (car setup-parameters))) | |
232 (setq setup-parameters (cdr setup-parameters))) | |
233 | |
234 ;; set variables classifying the current ediff job | |
235 (setq ediff-3way-comparison-job (ediff-3way-comparison-job) | |
236 ediff-merge-job (ediff-merge-job) | |
237 ediff-merge-with-ancestor-job (ediff-merge-with-ancestor-job) | |
238 ediff-3way-job (ediff-3way-job) | |
239 ediff-diff3-job (ediff-diff3-job) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
240 ediff-narrow-job (ediff-narrow-job) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
241 ediff-windows-job (ediff-windows-job) |
11042 | 242 ediff-word-mode-job (ediff-word-mode-job)) |
243 | |
244 (make-local-variable 'ediff-prefer-long-help-message) | |
245 (make-local-variable 'ediff-prefer-iconified-control-frame) | |
246 (make-local-variable 'ediff-split-window-function) | |
247 (make-local-variable 'ediff-default-variant) | |
248 (make-local-variable 'ediff-merge-window-share) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
249 (make-local-variable 'ediff-window-setup-function) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
250 (make-local-variable 'ediff-keep-variants) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
251 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
252 ;; 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
|
253 ;; 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
|
254 (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
|
255 (setq ediff-keep-variants t)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
256 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
257 ;; XEmacs has local-pre-command-hook |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
258 (if ediff-emacs-p |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
259 (make-local-variable 'pre-command-hook)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
260 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
261 (if ediff-emacs-p |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
262 (add-hook 'pre-command-hook 'ediff-spy-after-mouse) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
263 (add-hook 'local-pre-command-hook 'ediff-spy-after-mouse)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
264 (setq ediff-mouse-pixel-position (mouse-pixel-position)) |
11042 | 265 |
266 ;; adjust for merge jobs | |
267 (if ediff-merge-job | |
268 (let ((buf | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
269 ;; If default variant is `combined', the right stuff is |
11042 | 270 ;; 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
|
271 ;; Note: at some point, we tried to put ancestor buffer here |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
272 ;; (which is currently buffer C. This didn't work right |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
273 ;; 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
|
274 ;; 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
|
275 ;; 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
|
276 (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
|
277 buffer-B) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
278 (t buffer-A)))) |
11042 | 279 |
280 (setq ediff-split-window-function | |
281 ediff-merge-split-window-function) | |
282 | |
283 ;; remember the ancestor buffer, if any | |
284 (setq ediff-ancestor-buffer buffer-C) | |
285 | |
286 (setq buffer-C | |
287 (get-buffer-create | |
288 (ediff-unique-buffer-name "*ediff-merge" "*"))) | |
289 (save-excursion | |
290 (set-buffer buffer-C) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
291 (insert-buffer buf) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
292 (funcall (ediff-eval-in-buffer buf major-mode)) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
293 ;; after Stig@hackvan.com |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
294 (add-hook 'local-write-file-hooks 'ediff-set-merge-mode) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
295 ))) |
11042 | 296 (setq buffer-read-only nil |
297 ediff-buffer-A buffer-A | |
298 ediff-buffer-B buffer-B | |
299 ediff-buffer-C buffer-C | |
300 ediff-control-buffer control-buffer) | |
301 | |
302 (setq ediff-control-buffer-suffix | |
303 (if (string-match "<[0-9]*>" control-buffer-name) | |
304 (substring control-buffer-name | |
305 (match-beginning 0) (match-end 0)) | |
306 "") | |
307 ediff-control-buffer-number | |
308 (max | |
309 0 | |
310 (1- | |
311 (string-to-number | |
312 (substring | |
313 ediff-control-buffer-suffix | |
314 (or | |
315 (string-match "[0-9]+" ediff-control-buffer-suffix) | |
316 0)))))) | |
317 | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
318 (setq ediff-error-buffer |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
319 (get-buffer-create (ediff-unique-buffer-name "*ediff-errors" "*"))) |
11042 | 320 |
321 (ediff-eval-in-buffer buffer-A (ediff-strip-mode-line-format)) | |
322 (ediff-eval-in-buffer buffer-B (ediff-strip-mode-line-format)) | |
323 (if ediff-3way-job | |
324 (ediff-eval-in-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
|
325 (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
|
326 (ediff-eval-in-buffer ediff-ancestor-buffer |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
327 (ediff-strip-mode-line-format))) |
11042 | 328 |
329 (ediff-save-protected-variables) ; save variables to be restored on exit | |
330 | |
331 ;; ediff-setup-diff-regions-function must be set after setup | |
332 ;; parameters are processed. | |
333 (setq ediff-setup-diff-regions-function | |
334 (if ediff-diff3-job | |
335 'ediff-setup-diff-regions3 | |
336 'ediff-setup-diff-regions)) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
337 |
11042 | 338 (setq ediff-wide-bounds |
339 (list (ediff-make-bullet-proof-overlay | |
340 '(point-min) '(point-max) ediff-buffer-A) | |
341 (ediff-make-bullet-proof-overlay | |
342 '(point-min) '(point-max) ediff-buffer-B) | |
343 (ediff-make-bullet-proof-overlay | |
344 '(point-min) '(point-max) ediff-buffer-C))) | |
345 | |
346 ;; This has effect only on ediff-windows/regions | |
347 ;; In all other cases, ediff-visible-region sets visibility bounds to | |
348 ;; ediff-wide-bounds, and ediff-narrow-bounds are ignored. | |
349 (if ediff-start-narrowed | |
350 (setq ediff-visible-bounds ediff-narrow-bounds) | |
351 (setq ediff-visible-bounds ediff-wide-bounds)) | |
352 | |
353 (ediff-set-keys) ; comes after parameter setup | |
354 | |
355 ;; set up ediff-narrow-bounds, if not set | |
356 (or ediff-narrow-bounds | |
357 (setq ediff-narrow-bounds ediff-wide-bounds)) | |
358 | |
359 ;; All these must be inside ediff-eval-in-buffer control-buffer, | |
360 ;; since these vars are local to control-buffer | |
361 ;; These won't run if there are errors in diff | |
362 (ediff-eval-in-buffer ediff-buffer-A | |
363 (ediff-nuke-selective-display) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
364 (run-hooks 'ediff-prepare-buffer-hook) |
11042 | 365 (if (ediff-eval-in-buffer control-buffer ediff-merge-job) |
366 (setq buffer-read-only t)) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
367 ;; 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
|
368 ;; 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
|
369 (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
|
370 (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
|
371 (cons control-buffer ediff-this-buffer-ediff-sessions))) |
11042 | 372 ) |
373 (ediff-eval-in-buffer ediff-buffer-B | |
374 (ediff-nuke-selective-display) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
375 (run-hooks 'ediff-prepare-buffer-hook) |
11042 | 376 (if (ediff-eval-in-buffer control-buffer ediff-merge-job) |
377 (setq buffer-read-only t)) | |
378 ;; 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
|
379 (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
|
380 (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
|
381 (cons control-buffer ediff-this-buffer-ediff-sessions))) |
11042 | 382 ) |
383 (if ediff-3way-job | |
384 (ediff-eval-in-buffer ediff-buffer-C | |
385 (ediff-nuke-selective-display) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
386 (run-hooks 'ediff-prepare-buffer-hook) |
11042 | 387 ;; 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
|
388 (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
|
389 (setq ediff-this-buffer-ediff-sessions |
11042 | 390 (cons control-buffer |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
391 ediff-this-buffer-ediff-sessions))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
392 )) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
393 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
394 (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
|
395 (ediff-eval-in-buffer ediff-ancestor-buffer |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
396 (ediff-nuke-selective-display) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
397 (setq buffer-read-only t) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
398 (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
|
399 (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
|
400 (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
|
401 (cons control-buffer |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
402 ediff-this-buffer-ediff-sessions))) |
11042 | 403 )) |
404 | |
405 ;; must come after setting up ediff-narrow-bounds AND after | |
406 ;; nuking selective display | |
407 (funcall ediff-setup-diff-regions-function file-A file-B file-C) | |
408 (setq ediff-number-of-differences (length ediff-difference-vector-A)) | |
409 (setq ediff-current-difference -1) | |
410 | |
411 (ediff-make-current-diff-overlay 'A) | |
412 (ediff-make-current-diff-overlay 'B) | |
413 (if ediff-3way-job | |
414 (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
|
415 (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
|
416 (ediff-make-current-diff-overlay 'Ancestor)) |
11042 | 417 |
418 (ediff-setup-windows buffer-A buffer-B buffer-C control-buffer) | |
419 | |
420 (let ((shift-A (ediff-overlay-start | |
421 (ediff-get-value-according-to-buffer-type | |
422 'A ediff-narrow-bounds))) | |
423 (shift-B (ediff-overlay-start | |
424 (ediff-get-value-according-to-buffer-type | |
425 'B ediff-narrow-bounds))) | |
426 (shift-C (ediff-overlay-start | |
427 (ediff-get-value-according-to-buffer-type | |
428 'C ediff-narrow-bounds)))) | |
429 ;; position point in buf A | |
430 (save-excursion | |
431 (select-window ediff-window-A) | |
432 (goto-char shift-A)) | |
433 ;; position point in buf B | |
434 (save-excursion | |
435 (select-window ediff-window-B) | |
436 (goto-char shift-B)) | |
437 (if ediff-3way-job | |
438 (save-excursion | |
439 (select-window ediff-window-C) | |
440 (goto-char shift-C))) | |
441 ) | |
442 | |
443 (select-window ediff-control-window) | |
444 (ediff-visible-region) | |
445 | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
446 (run-hooks 'startup-hooks) |
11042 | 447 (ediff-refresh-mode-lines) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
448 (setq buffer-read-only t) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
449 (setq ediff-session-registry |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
450 (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
|
451 (ediff-update-registry) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
452 (if (ediff-buffer-live-p ediff-meta-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
453 (ediff-update-meta-buffer ediff-meta-buffer)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
454 (run-hooks 'ediff-startup-hook) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
455 ) ; eval in control-buffer |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
456 control-buffer)) |
11042 | 457 |
458 | |
459 ;; This function assumes that we are in the window where control buffer is | |
460 ;; to reside. | |
461 (defun ediff-setup-control-buffer (ctl-buf) | |
462 "Set up window for control buffer." | |
463 (if (window-dedicated-p (selected-window)) | |
464 (set-buffer ctl-buf) ; we are in control frame but just in case | |
465 (switch-to-buffer ctl-buf)) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
466 (let ((window-min-height 2)) |
11042 | 467 (erase-buffer) |
468 (ediff-set-help-message) | |
469 (insert ediff-help-message) | |
470 (shrink-window-if-larger-than-buffer) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
471 (or (ediff-multiframe-setup-p) |
11042 | 472 (ediff-indent-help-message)) |
473 (set-buffer-modified-p nil) | |
474 (ediff-refresh-mode-lines) | |
475 (setq ediff-control-window (selected-window)) | |
476 (setq ediff-window-config-saved | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
477 (format "%S%S%S%S%S%S%S" |
11042 | 478 ediff-control-window |
479 ediff-window-A | |
480 ediff-window-B | |
481 ediff-window-C | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
482 ediff-split-window-function |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
483 (ediff-multiframe-setup-p) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
484 ediff-wide-display-p)) |
11042 | 485 (goto-char (point-min)) |
486 (skip-chars-forward ediff-whitespace))) | |
487 | |
488 ;; assuming we are in control window, calculate length of the first line in | |
489 ;; help message | |
490 (defun ediff-help-message-line-length () | |
491 (save-excursion | |
492 (goto-char (point-min)) | |
493 (if ediff-prefer-long-help-message | |
494 (next-line 1)) | |
495 (end-of-line) | |
496 (current-column))) | |
497 | |
498 | |
499 (defun ediff-indent-help-message () | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
500 (let* ((shift (/ (max 0 (- (window-width (selected-window)) |
11042 | 501 (ediff-help-message-line-length))) |
502 2)) | |
503 (str (make-string shift ?\ ))) | |
504 (save-excursion | |
505 (goto-char (point-min)) | |
506 (while (< (point) (point-max)) | |
507 (insert str) | |
508 (beginning-of-line) | |
509 (forward-line 1))))) | |
510 | |
511 | |
512 (defun ediff-set-help-message () | |
513 (setq ediff-long-help-message | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
514 (cond ((and ediff-long-help-message-function |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
515 (or (symbolp ediff-long-help-message-function) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
516 (consp ediff-long-help-message-function))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
517 (funcall ediff-long-help-message-function)) |
11042 | 518 (ediff-word-mode |
519 (concat ediff-long-help-message-head | |
520 ediff-long-help-message-word-mode | |
521 ediff-long-help-message-tail)) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
522 (ediff-narrow-job |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
523 (concat ediff-long-help-message-head |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
524 ediff-long-help-message-narrow2 |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
525 ediff-long-help-message-tail)) |
11042 | 526 (ediff-merge-job |
527 (concat ediff-long-help-message-head | |
528 ediff-long-help-message-merge | |
529 ediff-long-help-message-tail)) | |
530 (ediff-diff3-job | |
531 (concat ediff-long-help-message-head | |
532 ediff-long-help-message-compare3 | |
533 ediff-long-help-message-tail)) | |
534 (t | |
535 (concat ediff-long-help-message-head | |
536 ediff-long-help-message-compare2 | |
537 ediff-long-help-message-tail)))) | |
538 (setq ediff-brief-help-message | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
539 (cond ((and ediff-brief-help-message-function |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
540 (or (symbolp ediff-brief-help-message-function) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
541 (consp ediff-brief-help-message-function))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
542 (funcall ediff-brief-help-message-function)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
543 ((stringp ediff-brief-help-message-function) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
544 ediff-brief-help-message-function) |
11042 | 545 ((ediff-multiframe-setup-p) ediff-brief-message-string) |
546 (t ; long brief msg, not multiframe --- put in the middle | |
547 ediff-brief-message-string) | |
548 )) | |
549 (setq ediff-help-message (if ediff-prefer-long-help-message | |
550 ediff-long-help-message | |
551 ediff-brief-help-message)) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
552 (run-hooks 'ediff-display-help-hook)) |
11042 | 553 |
554 | |
555 | |
556 ;;; Commands for working with Ediff | |
557 | |
558 (defun ediff-update-diffs () | |
559 "Recompute difference regions in buffers A, B, and C. | |
560 Buffers are not synchronized with their respective files, so changes done | |
561 to these buffers are not saved at this point---the user can do this later, | |
562 if necessary." | |
563 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
564 (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
|
565 (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
|
566 (not (y-or-n-p "Recompute differences during merge, really? "))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
567 (error "God forbid!")) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
568 |
11042 | 569 (let ((point-A (ediff-eval-in-buffer ediff-buffer-A (point))) |
570 ;;(point-B (ediff-eval-in-buffer ediff-buffer-B (point))) | |
571 (tmp-buffer (get-buffer-create ediff-tmp-buffer)) | |
572 (buf-A-file-name | |
573 (file-name-nondirectory (or (buffer-file-name ediff-buffer-A) | |
574 (buffer-name ediff-buffer-A) | |
575 ))) | |
576 (buf-B-file-name | |
577 (file-name-nondirectory (or (buffer-file-name ediff-buffer-B) | |
578 (buffer-name ediff-buffer-B) | |
579 ))) | |
580 (buf-C-file-name | |
581 (file-name-nondirectory (or (buffer-file-name ediff-buffer-C) | |
582 ;; if (null ediff-buffer-C), there is | |
583 ;; no danger, since we later check if | |
584 ;; ediff-buffer-C is alive | |
585 (buffer-name ediff-buffer-C) | |
586 ))) | |
587 (overl-A (ediff-get-value-according-to-buffer-type | |
588 'A ediff-narrow-bounds)) | |
589 (overl-B (ediff-get-value-according-to-buffer-type | |
590 'B ediff-narrow-bounds)) | |
591 (overl-C (ediff-get-value-according-to-buffer-type | |
592 'C ediff-narrow-bounds)) | |
593 beg-A end-A beg-B end-B beg-C end-C | |
594 file-A file-B file-C) | |
595 (ediff-unselect-and-select-difference -1) | |
596 | |
597 (setq beg-A (ediff-overlay-start overl-A) | |
598 beg-B (ediff-overlay-start overl-B) | |
599 beg-C (ediff-overlay-start overl-C) | |
600 end-A (ediff-overlay-end overl-A) | |
601 end-B (ediff-overlay-end overl-B) | |
602 end-C (ediff-overlay-end overl-C)) | |
603 | |
604 (if ediff-word-mode | |
605 (progn | |
606 (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
|
607 (setq file-A (ediff-make-temp-file tmp-buffer "regA")) |
11042 | 608 (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
|
609 (setq file-B (ediff-make-temp-file tmp-buffer "regB")) |
11042 | 610 (if ediff-3way-job |
611 (progn | |
612 (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
|
613 (setq file-C (ediff-make-temp-file tmp-buffer "regC")))) |
11042 | 614 ) |
615 ;; not word-mode | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
616 (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
|
617 (setq file-B (ediff-make-temp-file ediff-buffer-B buf-B-file-name)) |
11042 | 618 (if ediff-3way-job |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
619 (setq file-C (ediff-make-temp-file ediff-buffer-C buf-C-file-name))) |
11042 | 620 ) |
621 | |
622 (ediff-clear-diff-vector 'ediff-difference-vector-A 'fine-diffs-also) | |
623 (ediff-clear-diff-vector 'ediff-difference-vector-B 'fine-diffs-also) | |
624 (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
|
625 (ediff-clear-diff-vector |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
626 '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
|
627 ;; let them garbage collect. we can't use the ancestor after recomputing |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
628 ;; the diffs. |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
629 (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
|
630 ediff-ancestor-buffer nil |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
631 ediff-state-of-merge nil) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
632 |
11042 | 633 (setq ediff-killed-diffs-alist nil) ; invalidate saved killed diff regions |
634 | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
635 ;; In case of merge job, fool it into thinking that it is just doing |
11042 | 636 ;; comparison |
637 (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
|
638 (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
|
639 (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
|
640 (ediff-merge-with-ancestor-job ediff-merge-with-ancestor-job) |
11042 | 641 (ediff-job-name ediff-job-name)) |
642 (if ediff-merge-job | |
643 (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
|
644 ediff-3way-comparison-job t |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
645 ediff-merge-job nil |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
646 ediff-merge-with-ancestor-job nil |
11042 | 647 ediff-job-name 'ediff-files3)) |
648 (funcall ediff-setup-diff-regions-function file-A file-B file-C)) | |
649 | |
650 (setq ediff-number-of-differences (length ediff-difference-vector-A)) | |
651 (delete-file file-A) | |
652 (delete-file file-B) | |
653 (if file-C | |
654 (delete-file file-C)) | |
655 | |
656 (if ediff-3way-job | |
657 (ediff-set-state-of-all-diffs-in-all-buffers ediff-control-buffer)) | |
658 | |
659 (ediff-jump-to-difference (ediff-diff-at-point 'A point-A)) | |
660 (message "") | |
661 )) | |
662 | |
663 ;; Not bound to any key---to dangerous. A user can do it if necessary. | |
664 (defun ediff-revert-buffers-then-recompute-diffs (noconfirm) | |
665 "Revert buffers A, B and C. Then rerun Ediff on file A and file B." | |
666 (interactive "P") | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
667 (ediff-barf-if-not-control-buffer) |
11042 | 668 (let ((bufA ediff-buffer-A) |
669 (bufB ediff-buffer-B) | |
670 (bufC ediff-buffer-C) | |
671 (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
|
672 (keep-variants ediff-keep-variants) |
11042 | 673 (ancestor-buf ediff-ancestor-buffer) |
674 (ancestor-job ediff-merge-with-ancestor-job) | |
675 (merge ediff-merge-job) | |
676 (comparison ediff-3way-comparison-job)) | |
677 (ediff-eval-in-buffer bufA | |
678 (revert-buffer t noconfirm)) | |
679 (ediff-eval-in-buffer bufB | |
680 (revert-buffer t noconfirm)) | |
681 ;; this should only be executed in a 3way comparison, not in merge | |
682 (if comparison | |
683 (ediff-eval-in-buffer bufC | |
684 (revert-buffer t noconfirm))) | |
685 (if merge | |
686 (progn | |
687 (set-buffer ctl-buf) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
688 ;; 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
|
689 ;; 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
|
690 ;; variants kept. |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
691 (ediff-really-quit (not keep-variants)) |
11042 | 692 (kill-buffer bufC) |
693 (if ancestor-job | |
694 (ediff-merge-buffers-with-ancestor bufA bufB ancestor-buf) | |
695 (ediff-merge-buffers bufA bufB))) | |
696 (ediff-update-diffs)))) | |
697 | |
698 | |
699 ;; optional NO-REHIGHLIGHT says to not rehighlight buffers | |
700 (defun ediff-recenter (&optional no-rehighlight) | |
701 "Bring the highlighted region of all buffers being compared into view. | |
702 Reestablish the default three-window display." | |
703 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
704 (ediff-barf-if-not-control-buffer) |
11042 | 705 |
706 ;; force all minibuffer to display ediff's messages. | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
707 ;; when xemacs implements minibufferless frames, this won't be necessary |
11042 | 708 (if ediff-xemacs-p (setq synchronize-minibuffers t)) |
709 | |
710 (setq ediff-disturbed-overlays nil) ; clear after use | |
711 (let (buffer-read-only) | |
712 (if (and (ediff-buffer-live-p ediff-buffer-A) | |
713 (ediff-buffer-live-p ediff-buffer-B) | |
714 (or (not ediff-3way-job) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
715 (ediff-buffer-live-p ediff-buffer-C))) |
11042 | 716 (ediff-setup-windows |
717 ediff-buffer-A ediff-buffer-B ediff-buffer-C ediff-control-buffer) | |
718 (or (eq this-command 'ediff-quit) | |
719 (message | |
720 "You've killed an essential Ediff buffer---Please quit Ediff" | |
721 (beep 1))) | |
722 )) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
723 |
11042 | 724 ;; set visibility range appropriate to this invocation of Ediff. |
725 (ediff-visible-region) | |
726 ;; raise | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
727 (if (and (ediff-window-display-p) |
11042 | 728 (symbolp this-command) |
729 (symbolp last-command) | |
730 ;; Either one of the display-changing commands | |
731 (or (memq this-command | |
732 '(ediff-recenter | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
733 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
|
734 ediff-patch-action |
11042 | 735 ediff-toggle-wide-display ediff-toggle-multiframe)) |
736 ;; Or one of the movement cmds and prev cmd was an Ediff cmd | |
14040 | 737 ;; This avoids raising frames unnecessarily. |
11042 | 738 (and (memq this-command |
739 '(ediff-next-difference | |
740 ediff-previous-difference | |
741 ediff-jump-to-difference | |
742 ediff-jump-to-difference-at-point)) | |
743 (not (string-match "^ediff-" (symbol-name last-command))) | |
744 ))) | |
745 (progn | |
746 (if (window-live-p ediff-window-A) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
747 (raise-frame (window-frame ediff-window-A))) |
11042 | 748 (if (window-live-p ediff-window-B) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
749 (raise-frame (window-frame ediff-window-B))) |
11042 | 750 (if (window-live-p ediff-window-C) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
751 (raise-frame (window-frame ediff-window-C))))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
752 (if (and (ediff-window-display-p) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
753 (frame-live-p ediff-control-frame) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
754 (not ediff-prefer-long-help-message) |
11042 | 755 (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
|
756 (raise-frame ediff-control-frame)) |
11042 | 757 |
758 ;; 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
|
759 (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
|
760 (control-buf ediff-control-buffer)) |
11042 | 761 (if (and (ediff-buffer-live-p ediff-buffer-A) |
762 (ediff-buffer-live-p ediff-buffer-B) | |
763 (or (not ediff-3way-job) | |
764 (ediff-buffer-live-p ediff-buffer-C)) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
765 ) |
11042 | 766 (progn |
767 (or no-rehighlight | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
768 (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
|
769 |
11042 | 770 (ediff-recenter-one-window 'A) |
771 (ediff-recenter-one-window 'B) | |
772 (if ediff-3way-job | |
773 (ediff-recenter-one-window 'C)) | |
774 | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
775 (ediff-eval-in-buffer control-buf |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
776 (ediff-recenter-ancestor) ; it checks if ancestor is alive |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
777 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
778 (if (and (ediff-multiframe-setup-p) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
779 (not ediff-prefer-long-help-message) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
780 (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
|
781 ;; 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
|
782 (ediff-reset-mouse |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
783 control-frame |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
784 (eq this-command 'ediff-quit)))) |
11042 | 785 )) |
786 (ediff-eval-in-buffer control-buf | |
787 (ediff-refresh-mode-lines)) | |
788 )) | |
789 | |
790 ;; this function returns to the window it was called from | |
791 ;; (which was the control window) | |
792 (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
|
793 (if (ediff-valid-difference-p) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
794 ;; 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
|
795 (let* ((ctl-wind (selected-window)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
796 (shift (ediff-overlay-start |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
797 (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
|
798 buf-type ediff-narrow-bounds))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
799 (job-name ediff-job-name) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
800 (control-buf ediff-control-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
801 (window-name (intern (format "ediff-window-%S" buf-type))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
802 (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
|
803 (symbol-value window-name)))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
804 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
805 (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
|
806 (set-window-start window shift)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
807 (if window |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
808 (progn |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
809 (select-window window) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
810 (ediff-deactivate-mark) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
811 (ediff-position-region |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
812 (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
|
813 (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
|
814 (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
|
815 job-name |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
816 ))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
817 (select-window ctl-wind) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
818 ))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
819 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
820 (defun ediff-recenter-ancestor () |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
821 ;; 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
|
822 ;; visible. |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
823 (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
|
824 (ediff-valid-difference-p)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
825 (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
|
826 (ctl-wind (selected-window)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
827 (job-name ediff-job-name) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
828 (ctl-buf ediff-control-buffer)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
829 (ediff-eval-in-buffer ediff-ancestor-buffer |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
830 (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
|
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-position-region |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
835 (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
|
836 (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
|
837 (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
|
838 job-name)))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
839 (select-window ctl-wind) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
840 ))) |
11042 | 841 |
842 | |
843 ;; This will have to be refined for 3way jobs | |
844 (defun ediff-toggle-split () | |
845 "Toggle vertical/horizontal window split. | |
846 Does nothing if file-A and file-B are in different frames." | |
847 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
848 (ediff-barf-if-not-control-buffer) |
11042 | 849 (let* ((wind-A (if (window-live-p ediff-window-A) ediff-window-A)) |
850 (wind-B (if (window-live-p ediff-window-B) ediff-window-B)) | |
851 (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
|
852 (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
|
853 (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
|
854 (frame-C (if wind-C (window-frame wind-C)))) |
11042 | 855 (if (or (eq frame-A frame-B) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
856 (not (frame-live-p frame-A)) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
857 (not (frame-live-p frame-B)) |
11042 | 858 (if ediff-3way-comparison-job |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
859 (or (not (frame-live-p frame-C)) |
11042 | 860 (eq frame-A frame-C) (eq frame-B frame-C)))) |
861 (setq ediff-split-window-function | |
862 (if (eq ediff-split-window-function 'split-window-vertically) | |
863 'split-window-horizontally | |
864 'split-window-vertically)) | |
865 (message "Buffers being compared are in different frames")) | |
866 (ediff-recenter 'no-rehighlight))) | |
867 | |
868 (defun ediff-toggle-hilit () | |
869 "Switch between highlighting using ASCII flags and highlighting using faces. | |
870 On a dumb terminal, switches between ASCII highlighting and no highlighting." | |
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) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
873 (if (not (ediff-window-display-p)) |
11042 | 874 (if (eq ediff-highlighting-style 'ascii) |
875 (progn | |
876 (message "ASCII highlighting flags removed") | |
877 (ediff-unselect-and-select-difference ediff-current-difference | |
878 'unselect-only) | |
879 (setq ediff-highlighting-style 'off)) | |
880 (ediff-unselect-and-select-difference ediff-current-difference | |
881 'select-only)) | |
882 (ediff-unselect-and-select-difference ediff-current-difference | |
883 'unselect-only) | |
884 ;; cycle through highlighting | |
885 (cond ((and ediff-use-faces ediff-highlight-all-diffs) | |
886 (message "Unhighlighting unselected difference regions") | |
887 (setq ediff-highlight-all-diffs nil)) | |
888 (ediff-use-faces | |
889 (message "Highlighting with ASCII flags") | |
890 (setq ediff-use-faces nil)) | |
891 (t | |
892 (message "Re-highlighting all difference regions") | |
893 (setq ediff-use-faces t | |
894 ediff-highlight-all-diffs t))) | |
895 | |
896 (if (and ediff-use-faces ediff-highlight-all-diffs) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
897 (ediff-color-background-regions) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
898 (ediff-color-background-regions 'unhighlight)) |
11042 | 899 |
900 (ediff-unselect-and-select-difference | |
901 ediff-current-difference 'select-only)) | |
902 ) | |
903 | |
904 (defun ediff-toggle-autorefine () | |
905 "Toggle auto-refine mode." | |
906 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
907 (ediff-barf-if-not-control-buffer) |
11042 | 908 (if ediff-word-mode |
909 (error "No fine differences in this mode")) | |
910 (cond ((eq ediff-auto-refine 'nix) | |
911 (setq ediff-auto-refine 'on) | |
912 (ediff-make-fine-diffs ediff-current-difference 'noforce) | |
913 (message "Auto-refining is ON")) | |
914 ((eq ediff-auto-refine 'on) | |
915 (message "Auto-refining is OFF") | |
916 (setq ediff-auto-refine 'off)) | |
917 (t ;; nix 'em | |
918 (ediff-set-fine-diff-properties ediff-current-difference 'default) | |
919 (message "Refinements are HIDDEN") | |
920 (setq ediff-auto-refine 'nix)) | |
921 )) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
922 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
923 (defun ediff-show-ancestor () |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
924 "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
|
925 (interactive) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
926 (ediff-recenter) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
927 (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
|
928 (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
|
929 (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
|
930 (error "Not merging with ancestor"))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
931 (let (wind) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
932 (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
|
933 (raise-frame (window-frame wind))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
934 (t (set-window-buffer ediff-window-C ediff-ancestor-buffer))))) |
11042 | 935 |
936 (defun ediff-make-or-kill-fine-diffs (arg) | |
937 "Compute fine diffs. With negative prefix arg, kill fine diffs. | |
938 In both cases, operates on the currrent difference region." | |
939 (interactive "P") | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
940 (ediff-barf-if-not-control-buffer) |
11042 | 941 (cond ((eq arg '-) |
942 (ediff-clear-fine-differences ediff-current-difference)) | |
943 ((and (numberp arg) (< arg 0)) | |
944 (ediff-clear-fine-differences ediff-current-difference)) | |
945 (t (ediff-make-fine-diffs)))) | |
946 | |
947 | |
948 (defun ediff-toggle-help () | |
949 "Toggle short/long help message." | |
950 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
951 (ediff-barf-if-not-control-buffer) |
11042 | 952 (let (buffer-read-only) |
953 (erase-buffer) | |
954 (setq ediff-prefer-long-help-message (not ediff-prefer-long-help-message)) | |
955 (ediff-set-help-message)) | |
956 ;; remember the icon status of the control frame when the user requested | |
957 ;; full control message | |
958 (if (and ediff-prefer-long-help-message (ediff-multiframe-setup-p)) | |
959 (setq ediff-prefer-iconified-control-frame | |
960 (ediff-frame-iconified-p ediff-control-frame))) | |
961 | |
962 (setq ediff-window-config-saved "") ; force redisplay | |
963 (ediff-recenter 'no-rehighlight)) | |
964 | |
965 | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
966 ;; 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
|
967 (defun ediff-toggle-read-only (&optional buf) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
968 "Toggle read-only in current buffer. |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
969 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
|
970 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
|
971 of the current buffer." |
11042 | 972 (interactive) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
973 (ediff-barf-if-not-control-buffer) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
974 (let ((ctl-buf (if (null buf) (current-buffer)))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
975 (or buf (ediff-recenter)) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
976 (or buf |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
977 (setq buf |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
978 (ediff-get-buffer (ediff-char-to-buftype last-command-char)))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
979 |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
980 (ediff-eval-in-buffer buf ; eval in buf A/B/C |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
981 (let* ((file (buffer-file-name buf)) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
982 (file-writable (and file |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
983 (file-exists-p file) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
984 (file-writable-p file))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
985 (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
|
986 ((ediff-file-checked-out-p file) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
987 'toggle-read-only) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
988 (file-writable 'toggle-read-only) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
989 (t (key-binding "\C-x\C-q"))))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
990 ;; If the file is checked in, make sure we don't make buffer modifiable |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
991 ;; without warning the user. The user can fool our checks by making the |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
992 ;; buffer non-RO without checking the file out. We regard this as a |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
993 ;; user problem. |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
994 (if (and (ediff-file-checked-in-p file) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
995 ;; 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
|
996 ;; 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
|
997 ctl-buf) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
998 (cond ((not buffer-read-only) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
999 (setq toggle-ro-cmd 'toggle-read-only)) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1000 ((and (or (beep 1) t) ; always beep |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1001 (y-or-n-p |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1002 (format |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1003 "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
|
1004 (ediff-abbreviate-file-name file)))) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1005 ;; 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
|
1006 ;; 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
|
1007 ;; 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
|
1008 ;; 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
|
1009 ;; is checked in. |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1010 (ediff-eval-in-buffer ctl-buf |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1011 (ediff-change-saved-variable |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1012 'buffer-read-only nil |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1013 (ediff-char-to-buftype last-command-char)))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1014 (t |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1015 (setq toggle-ro-cmd 'toggle-read-only) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1016 (beep 1) (beep 1) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1017 (message |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1018 "Boy, this is risky! Better don't change this file...") |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1019 (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
|
1020 (if (and toggle-ro-cmd |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1021 (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
|
1022 (save-excursion |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1023 (save-window-excursion |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1024 (command-execute toggle-ro-cmd))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1025 (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
|
1026 |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1027 ;; 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
|
1028 ;; Signal a warning in this case. |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1029 (if (and file (not buffer-read-only) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1030 (eq this-command 'ediff-toggle-read-only) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1031 (file-exists-p file) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1032 (not (file-writable-p file))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1033 (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
|
1034 (ediff-abbreviate-file-name file) (beep 1))) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1035 )))) |
11042 | 1036 |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1037 |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1038 ;; This is a simple-minded check for whether a file is under version control |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1039 ;; and is checked out. |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1040 ;; 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
|
1041 ;; 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
|
1042 ;; able to read such a file anyway). |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1043 ;; FILE is a string representing file name |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1044 (defsubst ediff-file-checked-out-p (file) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1045 (and (stringp file) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1046 (file-exists-p file) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1047 (file-writable-p file) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1048 (file-exists-p (concat file ",v")))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1049 (defsubst ediff-file-checked-in-p (file) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1050 (and (stringp file) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1051 (file-exists-p file) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1052 (not (file-writable-p file)) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1053 (file-exists-p (concat file ",v")))) |
11042 | 1054 |
1055 (defun ediff-swap-buffers () | |
1056 "Rotate the display of buffers A, B, and C." | |
1057 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1058 (ediff-barf-if-not-control-buffer) |
11042 | 1059 (if (and (window-live-p ediff-window-A) (window-live-p ediff-window-B)) |
1060 (let ((buf ediff-buffer-A) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1061 (values ediff-buffer-values-orig-A) |
11042 | 1062 (diff-vec ediff-difference-vector-A) |
1063 (hide-regexp ediff-regexp-hide-A) | |
1064 (focus-regexp ediff-regexp-focus-A) | |
1065 (wide-visibility-p (eq ediff-visible-bounds ediff-wide-bounds)) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1066 (overlay (if (ediff-window-display-p) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1067 ediff-current-diff-overlay-A))) |
11042 | 1068 (if ediff-3way-comparison-job |
1069 (progn | |
1070 (set-window-buffer ediff-window-A ediff-buffer-C) | |
1071 (set-window-buffer ediff-window-B ediff-buffer-A) | |
1072 (set-window-buffer ediff-window-C ediff-buffer-B) | |
1073 ) | |
1074 (set-window-buffer ediff-window-A ediff-buffer-B) | |
1075 (set-window-buffer ediff-window-B ediff-buffer-A)) | |
1076 ;; swap diff buffers | |
1077 (if ediff-3way-comparison-job | |
1078 (setq ediff-buffer-A ediff-buffer-C | |
1079 ediff-buffer-C ediff-buffer-B | |
1080 ediff-buffer-B buf) | |
1081 (setq ediff-buffer-A ediff-buffer-B | |
1082 ediff-buffer-B buf)) | |
1083 | |
1084 ;; swap saved buffer characteristics | |
1085 (if ediff-3way-comparison-job | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1086 (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
|
1087 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
|
1088 ediff-buffer-values-orig-B values) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1089 (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
|
1090 ediff-buffer-values-orig-B values)) |
11042 | 1091 |
1092 ;; swap diff vectors | |
1093 (if ediff-3way-comparison-job | |
1094 (setq ediff-difference-vector-A ediff-difference-vector-C | |
1095 ediff-difference-vector-C ediff-difference-vector-B | |
1096 ediff-difference-vector-B diff-vec) | |
1097 (setq ediff-difference-vector-A ediff-difference-vector-B | |
1098 ediff-difference-vector-B diff-vec)) | |
1099 | |
1100 ;; swap hide/focus regexp | |
1101 (if ediff-3way-comparison-job | |
1102 (setq ediff-regexp-hide-A ediff-regexp-hide-C | |
1103 ediff-regexp-hide-C ediff-regexp-hide-B | |
1104 ediff-regexp-hide-B hide-regexp | |
1105 ediff-regexp-focus-A ediff-regexp-focus-C | |
1106 ediff-regexp-focus-C ediff-regexp-focus-B | |
1107 ediff-regexp-focus-B focus-regexp) | |
1108 (setq ediff-regexp-hide-A ediff-regexp-hide-B | |
1109 ediff-regexp-hide-B hide-regexp | |
1110 ediff-regexp-focus-A ediff-regexp-focus-B | |
1111 ediff-regexp-focus-B focus-regexp)) | |
1112 | |
1113 ;; The following is needed for XEmacs, since there one can't move | |
1114 ;; overlay to another buffer. In Emacs, this swap is redundant. | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1115 (if (ediff-window-display-p) |
11042 | 1116 (if ediff-3way-comparison-job |
1117 (setq ediff-current-diff-overlay-A ediff-current-diff-overlay-C | |
1118 ediff-current-diff-overlay-C ediff-current-diff-overlay-B | |
1119 ediff-current-diff-overlay-B overlay) | |
1120 (setq ediff-current-diff-overlay-A ediff-current-diff-overlay-B | |
1121 ediff-current-diff-overlay-B overlay))) | |
1122 | |
1123 ;; swap wide bounds | |
1124 (setq ediff-wide-bounds | |
1125 (cond (ediff-3way-comparison-job | |
1126 (list (nth 2 ediff-wide-bounds) | |
1127 (nth 0 ediff-wide-bounds) | |
1128 (nth 1 ediff-wide-bounds))) | |
1129 (ediff-3way-job | |
1130 (list (nth 1 ediff-wide-bounds) | |
1131 (nth 0 ediff-wide-bounds) | |
1132 (nth 2 ediff-wide-bounds))) | |
1133 (t | |
1134 (list (nth 1 ediff-wide-bounds) | |
1135 (nth 0 ediff-wide-bounds))))) | |
1136 ;; swap narrow bounds | |
1137 (setq ediff-narrow-bounds | |
1138 (cond (ediff-3way-comparison-job | |
1139 (list (nth 2 ediff-narrow-bounds) | |
1140 (nth 0 ediff-narrow-bounds) | |
1141 (nth 1 ediff-narrow-bounds))) | |
1142 (ediff-3way-job | |
1143 (list (nth 1 ediff-narrow-bounds) | |
1144 (nth 0 ediff-narrow-bounds) | |
1145 (nth 2 ediff-narrow-bounds))) | |
1146 (t | |
1147 (list (nth 1 ediff-narrow-bounds) | |
1148 (nth 0 ediff-narrow-bounds))))) | |
1149 (if wide-visibility-p | |
1150 (setq ediff-visible-bounds ediff-wide-bounds) | |
1151 (setq ediff-visible-bounds ediff-narrow-bounds)) | |
1152 )) | |
1153 (if ediff-3way-job | |
1154 (ediff-set-state-of-all-diffs-in-all-buffers ediff-control-buffer)) | |
1155 (ediff-recenter 'no-rehighlight) | |
1156 ) | |
1157 | |
1158 | |
1159 (defun ediff-toggle-wide-display () | |
1160 "Toggle wide/regular display. | |
1161 This is especially useful when comparing buffers side-by-side." | |
1162 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1163 (ediff-barf-if-not-control-buffer) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1164 (or (ediff-window-display-p) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1165 (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
|
1166 (if ediff-emacs-p "" "X"))) |
11042 | 1167 (ediff-recenter 'no-rehighlight) ; make sure buffs are displayed in windows |
1168 (let ((ctl-buf ediff-control-buffer)) | |
1169 (setq ediff-wide-display-p (not ediff-wide-display-p)) | |
1170 (if (not ediff-wide-display-p) | |
1171 (ediff-eval-in-buffer ctl-buf | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1172 (modify-frame-parameters |
11042 | 1173 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
|
1174 ;;(sit-for (if ediff-xemacs-p 0.4 0)) |
11042 | 1175 ;; restore control buf, since ctl window may have been deleted |
1176 ;; during resizing | |
1177 (set-buffer ctl-buf) | |
1178 (setq ediff-wide-display-orig-parameters nil | |
1179 ediff-window-B nil) ; force update of window config | |
1180 (ediff-recenter 'no-rehighlight)) | |
1181 (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
|
1182 ;;(sit-for (if ediff-xemacs-p 0.4 0)) |
11042 | 1183 (ediff-eval-in-buffer ctl-buf |
1184 (setq ediff-window-B nil) ; force update of window config | |
1185 (ediff-recenter 'no-rehighlight))))) | |
1186 | |
1187 (defun ediff-toggle-multiframe () | |
1188 "Switch from the multiframe display to single-frame display and back. | |
1189 This is primarily for debugging, but one can use it for fun, too." | |
1190 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1191 (ediff-barf-if-not-control-buffer) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1192 (or (ediff-window-display-p) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1193 (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
|
1194 (if ediff-emacs-p "" "X"))) |
11042 | 1195 (cond ((eq ediff-window-setup-function 'ediff-setup-windows-multiframe) |
1196 (setq ediff-window-setup-function 'ediff-setup-windows-plain)) | |
1197 ((eq ediff-window-setup-function 'ediff-setup-windows-plain) | |
1198 (setq ediff-window-setup-function 'ediff-setup-windows-multiframe))) | |
1199 (setq ediff-window-B nil) | |
1200 (ediff-recenter 'no-rehighlight)) | |
1201 | |
1202 ;; Merging | |
1203 | |
1204 (defun ediff-toggle-show-clashes-only () | |
1205 "Toggle the mode where only the regions where both buffers differ with the ancestor are shown." | |
1206 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1207 (ediff-barf-if-not-control-buffer) |
11042 | 1208 (if (not ediff-merge-with-ancestor-job) |
1209 (error "This command makes sense only when merging with an ancestor")) | |
1210 (setq ediff-show-clashes-only (not ediff-show-clashes-only)) | |
1211 (if ediff-show-clashes-only | |
1212 (message "Focus on regions where both buffers differ from the ancestor") | |
1213 (message "Canceling focus on regions where changes clash"))) | |
1214 | |
1215 ;; Widening/narrowing | |
1216 | |
1217 (defun ediff-toggle-narrow-region () | |
1218 "Toggle narrowing in buffers A, B, and C. | |
1219 Used in ediff-windows/regions only." | |
1220 (interactive) | |
1221 (if (eq ediff-buffer-A ediff-buffer-B) | |
1222 (error | |
1223 "Buffers A and B are the same. Can't narrow to two different regions")) | |
1224 (if (eq ediff-visible-bounds ediff-wide-bounds) | |
1225 (setq ediff-visible-bounds ediff-narrow-bounds) | |
1226 (setq ediff-visible-bounds ediff-wide-bounds)) | |
1227 (ediff-recenter 'no-rehighlight)) | |
1228 | |
1229 ;; Narrow bufs A/B/C to ediff-visible-bounds. If this is currently set to | |
1230 ;; ediff-wide-bounds, then this actually widens. | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1231 ;; 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
|
1232 ;; ediff-regions-wordwise/linewise or ediff-windows-wordwise/linewise. |
11042 | 1233 ;; Does nothing if buffer-A = buffer-B since we can't narrow |
1234 ;; to two different regions in one buffer. | |
1235 (defun ediff-visible-region () | |
1236 (if (or (eq ediff-buffer-A ediff-buffer-B) | |
1237 (eq ediff-buffer-A ediff-buffer-C) | |
1238 (eq ediff-buffer-C ediff-buffer-B)) | |
1239 () | |
1240 ;; If ediff-*-regions/windows, ediff-visible-bounds is already set | |
1241 ;; Otherwise, always use full range. | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1242 (if (not ediff-narrow-job) |
11042 | 1243 (setq ediff-visible-bounds ediff-wide-bounds)) |
1244 (let ((overl-A (ediff-get-value-according-to-buffer-type | |
1245 'A ediff-visible-bounds)) | |
1246 (overl-B (ediff-get-value-according-to-buffer-type | |
1247 'B ediff-visible-bounds)) | |
1248 (overl-C (ediff-get-value-according-to-buffer-type | |
1249 'C ediff-visible-bounds)) | |
1250 ) | |
1251 (ediff-eval-in-buffer ediff-buffer-A | |
1252 (narrow-to-region | |
1253 (ediff-overlay-start overl-A) (ediff-overlay-end overl-A))) | |
1254 (ediff-eval-in-buffer ediff-buffer-B | |
1255 (narrow-to-region | |
1256 (ediff-overlay-start overl-B) (ediff-overlay-end overl-B))) | |
1257 | |
1258 (if ediff-3way-job | |
1259 (ediff-eval-in-buffer ediff-buffer-C | |
1260 (narrow-to-region | |
1261 (ediff-overlay-start overl-C) (ediff-overlay-end overl-C)))) | |
1262 ))) | |
1263 | |
1264 | |
1265 ;; Window scrolling operations | |
1266 | |
1267 ;; Performs some operation on the two file windows (if they are showing). | |
1268 ;; Traps all errors on the operation in windows A/B/C. | |
1269 ;; Usually, errors come from scrolling off the | |
1270 ;; beginning or end of the buffer, and this gives error messages. | |
1271 (defun ediff-operate-on-windows (operation arg) | |
1272 | |
1273 ;; make sure windows aren't dead | |
1274 (if (not (and (window-live-p ediff-window-A) (window-live-p ediff-window-B))) | |
1275 (ediff-recenter 'no-rehighlight)) | |
1276 (if (not (and (ediff-buffer-live-p ediff-buffer-A) | |
1277 (ediff-buffer-live-p ediff-buffer-B) | |
1278 (or (not ediff-3way-job) ediff-buffer-C) | |
1279 )) | |
1280 (error "You've killed an essential Ediff buffer---Please quit Ediff")) | |
1281 | |
1282 (let* ((wind (selected-window)) | |
1283 (wind-A ediff-window-A) | |
1284 (wind-B ediff-window-B) | |
1285 (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
|
1286 (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
|
1287 (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
|
1288 (three-way ediff-3way-job) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1289 (coefC (if three-way |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1290 (ediff-get-region-size-coefficient 'C operation)))) |
11042 | 1291 |
1292 (select-window wind-A) | |
1293 (condition-case nil | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1294 (funcall operation (round (* coefA arg))) |
11042 | 1295 (error)) |
1296 (select-window wind-B) | |
1297 (condition-case nil | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1298 (funcall operation (round (* coefB arg))) |
11042 | 1299 (error)) |
1300 (if three-way | |
1301 (progn | |
1302 (select-window wind-C) | |
1303 (condition-case nil | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1304 (funcall operation (round (* coefC arg))) |
11042 | 1305 (error)))) |
1306 (select-window wind))) | |
1307 | |
1308 (defun ediff-scroll-vertically (&optional arg) | |
1309 "Vertically scroll buffers A, B \(and C if appropriate\). | |
1310 With optional argument ARG, scroll ARG lines; otherwise scroll by nearly | |
1311 the height of window-A." | |
1312 (interactive "P") | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1313 (ediff-barf-if-not-control-buffer) |
11042 | 1314 |
1315 ;; make sure windows aren't dead | |
1316 (if (not (and (window-live-p ediff-window-A) (window-live-p ediff-window-B))) | |
1317 (ediff-recenter 'no-rehighlight)) | |
1318 (if (not (and (ediff-buffer-live-p ediff-buffer-A) | |
1319 (ediff-buffer-live-p ediff-buffer-B) | |
1320 (or (not ediff-3way-job) | |
1321 (ediff-buffer-live-p ediff-buffer-C)) | |
1322 )) | |
1323 (error "You've killed an essential Ediff buffer---Please quit Ediff")) | |
1324 | |
1325 (ediff-operate-on-windows | |
1326 (if (memq last-command-char '(?v ?\C-v)) | |
1327 'scroll-up | |
1328 'scroll-down) | |
1329 ;; calculate argument to scroll-up/down | |
1330 ;; if there is an explicit argument | |
1331 (if (and arg (not (equal arg '-))) | |
1332 ;; use it | |
1333 (prefix-numeric-value arg) | |
1334 ;; 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
|
1335 (let (default-amount) |
11042 | 1336 (setq default-amount |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1337 (- (/ (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
|
1338 (window-height ediff-window-B) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1339 (if ediff-3way-job |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1340 (window-height ediff-window-C) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1341 500)) ; some large number |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1342 2) |
11042 | 1343 1 next-screen-context-lines)) |
1344 ;; window found | |
1345 (if arg | |
1346 ;; C-u as argument means half of default amount | |
1347 (/ default-amount 2) | |
1348 ;; no argument means default amount | |
1349 default-amount))))) | |
1350 | |
1351 | |
1352 (defun ediff-scroll-horizontally (&optional arg) | |
1353 "Horizontally scroll buffers A, B \(and C if appropriate\). | |
1354 If an argument is given, that is how many columns are scrolled, else nearly | |
1355 the width of the A/B/C windows." | |
1356 (interactive "P") | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1357 (ediff-barf-if-not-control-buffer) |
11042 | 1358 |
1359 ;; make sure windows aren't dead | |
1360 (if (not (and (window-live-p ediff-window-A) (window-live-p ediff-window-B))) | |
1361 (ediff-recenter 'no-rehighlight)) | |
1362 (if (not (and (ediff-buffer-live-p ediff-buffer-A) | |
1363 (ediff-buffer-live-p ediff-buffer-B) | |
1364 (or (not ediff-3way-job) | |
1365 (ediff-buffer-live-p ediff-buffer-C)) | |
1366 )) | |
1367 (error "You've killed an essential Ediff buffer---Please quit Ediff")) | |
1368 | |
1369 (ediff-operate-on-windows | |
1370 (if (= last-command-char ?<) | |
1371 'scroll-left | |
1372 'scroll-right) | |
1373 ;; calculate argument to scroll-left/right | |
1374 ;; if there is an explicit argument | |
1375 (if (and arg (not (equal arg '-))) | |
1376 ;; use it | |
1377 (prefix-numeric-value arg) | |
1378 ;; if not, see if we can determine a default amount | |
1379 ;; (half the window width) | |
1380 (if (null ediff-control-window) | |
1381 ;; no control window, use nil | |
1382 nil | |
1383 (let ((default-amount | |
1384 (- (/ (min (window-width ediff-window-A) | |
1385 (window-width ediff-window-B) | |
1386 (if ediff-3way-comparison-job | |
1387 (window-width ediff-window-C) | |
1388 500) ; some large number | |
1389 ) | |
1390 2) | |
1391 3))) | |
1392 ;; window found | |
1393 (if arg | |
1394 ;; C-u as argument means half of default amount | |
1395 (/ default-amount 2) | |
1396 ;; no argument means default amount | |
1397 default-amount)))))) | |
1398 | |
1399 | |
1400 ;;BEG, END show the region to be positioned. | |
1401 ;;JOB-NAME holds ediff-job-name. Ediff-windows job positions regions | |
1402 ;;differently. | |
1403 (defun ediff-position-region (beg end pos job-name) | |
1404 (if (> end (point-max)) | |
1405 (setq end (point-max))) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1406 (if ediff-windows-job |
11042 | 1407 (if (pos-visible-in-window-p end) |
1408 () ; do nothing, wind is already positioned | |
1409 ;; at this point, windows are positioned at the beginning of the | |
1410 ;; file regions (not diff-regions) being compared. | |
1411 (save-excursion | |
1412 (move-to-window-line (- (window-height) 2)) | |
1413 (let ((amount (+ 2 (count-lines (point) end)))) | |
1414 (scroll-up amount)))) | |
1415 (set-window-start (selected-window) beg) | |
1416 (if (pos-visible-in-window-p end) | |
1417 ;; 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
|
1418 (let ((lines 0) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1419 (prev-point 0)) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1420 (while ( and (> end (progn |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1421 (move-to-window-line lines) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1422 (point))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1423 ;; `end' may be beyond the window bottom, so check |
14040 | 1424 ;; that we are making progress |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1425 (< prev-point (point))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1426 (setq prev-point (point)) |
11042 | 1427 (setq lines (1+ lines))) |
1428 ;; And position the beginning on the right line | |
1429 (goto-char beg) | |
1430 (recenter (/ (1+ (max (- (1- (window-height (selected-window))) | |
1431 lines) | |
1432 1) | |
1433 ) | |
1434 2)))) | |
1435 (goto-char pos) | |
1436 )) | |
1437 | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1438 ;; 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
|
1439 (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
|
1440 (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
|
1441 (or ctl-buf (setq ctl-buf ediff-control-buffer)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1442 (ediff-eval-in-buffer ctl-buf |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1443 (let* ((buf (ediff-get-buffer buf-type)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1444 (wind (eval (intern (format "ediff-window-%S" buf-type)))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1445 (beg (window-start wind)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1446 (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
|
1447 lines) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1448 (ediff-eval-in-buffer buf |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1449 (if (< beg end) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1450 (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
|
1451 (setq lines 0)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1452 lines |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1453 )))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1454 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1455 ;; get number of lines from window end to region start |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1456 (defun ediff-get-lines-to-region-start (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
|
1457 (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
|
1458 (or ctl-buf (setq ctl-buf ediff-control-buffer)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1459 (ediff-eval-in-buffer ctl-buf |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1460 (let* ((buf (ediff-get-buffer buf-type)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1461 (wind (eval (intern (format "ediff-window-%S" buf-type)))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1462 (end (window-end wind)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1463 (beg (ediff-get-diff-posn buf-type 'beg))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1464 (ediff-eval-in-buffer buf |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1465 (if (< beg end) (count-lines beg end) 0)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1466 ))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1467 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1468 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1469 (defun ediff-get-region-size-coefficient (buf-type op &optional n ctl-buf) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1470 (ediff-eval-in-buffer (or ctl-buf ediff-control-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1471 (let* ((func (cond ((eq op 'scroll-down) 'ediff-get-lines-to-region-start) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1472 ((eq op 'scroll-up) 'ediff-get-lines-to-region-end) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1473 (t '(lambda (a b c) 0)))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1474 (max-lines (max (funcall func 'A n ctl-buf) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1475 (funcall func 'B n ctl-buf) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1476 (if (ediff-buffer-live-p ediff-buffer-C) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1477 (funcall func 'C n ctl-buf) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1478 0)))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1479 ;; this covers the horizontal coefficient as well: |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1480 ;; if max-lines = 0 then coef = 1 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1481 (if (> max-lines 0) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1482 (/ (+ (funcall func buf-type n ctl-buf) 0.0) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1483 (+ max-lines 0.0)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1484 1) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1485 ))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1486 |
11042 | 1487 |
1488 (defun ediff-next-difference (&optional arg) | |
1489 "Advance to the next difference. | |
1490 With a prefix argument, go back that many differences." | |
1491 (interactive "P") | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1492 (ediff-barf-if-not-control-buffer) |
11042 | 1493 (if (< ediff-current-difference ediff-number-of-differences) |
1494 (let ((n (min ediff-number-of-differences | |
1495 (+ ediff-current-difference (if arg arg 1)))) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1496 regexp-skip) |
11042 | 1497 |
1498 (or (>= n ediff-number-of-differences) | |
1499 (setq regexp-skip (funcall ediff-skip-diff-region-function n)) | |
1500 (ediff-install-fine-diff-if-necessary n)) | |
1501 (while (and (< n ediff-number-of-differences) | |
1502 (or | |
1503 ;; regexp skip | |
1504 regexp-skip | |
1505 ;; skip clashes, if necessary | |
1506 (and ediff-show-clashes-only | |
1507 (string-match "prefer" | |
1508 (or (ediff-get-state-of-merge n) ""))) | |
1509 ;; skip difference regions that differ in white space | |
1510 (and ediff-ignore-similar-regions | |
1511 (ediff-no-fine-diffs-p n)))) | |
1512 (setq n (1+ n)) | |
1513 (if (= 0 (mod n 20)) | |
1514 (message "Skipped over region %d and counting ..." n)) | |
1515 (or (>= n ediff-number-of-differences) | |
1516 (setq regexp-skip (funcall ediff-skip-diff-region-function n)) | |
1517 (ediff-install-fine-diff-if-necessary n)) | |
1518 ) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1519 (message "") |
11042 | 1520 (ediff-unselect-and-select-difference n) |
1521 ) ; let | |
1522 (ediff-visible-region) | |
1523 (error "At end of the difference list"))) | |
1524 | |
1525 (defun ediff-previous-difference (&optional arg) | |
1526 "Go to the previous difference. | |
1527 With a prefix argument, go back that many differences." | |
1528 (interactive "P") | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1529 (ediff-barf-if-not-control-buffer) |
11042 | 1530 (if (> ediff-current-difference -1) |
1531 (let ((n (max -1 (- ediff-current-difference (if arg arg 1)))) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1532 regexp-skip) |
11042 | 1533 |
1534 (or (< n 0) | |
1535 (setq regexp-skip (funcall ediff-skip-diff-region-function n)) | |
1536 (ediff-install-fine-diff-if-necessary n)) | |
1537 (while (and (> n -1) | |
1538 (or | |
1539 ;; regexp skip | |
1540 regexp-skip | |
1541 ;; skip clashes, if necessary | |
1542 (and ediff-show-clashes-only | |
1543 (string-match "prefer" | |
1544 (or (ediff-get-state-of-merge n) ""))) | |
1545 ;; skip difference regions that differ in white space | |
1546 (and ediff-ignore-similar-regions | |
1547 (ediff-no-fine-diffs-p n)))) | |
1548 (if (= 0 (mod (1+ n) 20)) | |
1549 (message "Skipped over region %d and counting ..." (1+ n))) | |
1550 (setq n (1- n)) | |
1551 (or (< n 0) | |
1552 (setq regexp-skip (funcall ediff-skip-diff-region-function n)) | |
1553 (ediff-install-fine-diff-if-necessary n)) | |
1554 ) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1555 (message "") |
11042 | 1556 (ediff-unselect-and-select-difference n) |
1557 ) ; let | |
1558 (ediff-visible-region) | |
1559 (error "At beginning of the difference list"))) | |
1560 | |
1561 (defun ediff-jump-to-difference (difference-number) | |
1562 "Go to the difference specified as a prefix argument." | |
1563 (interactive "p") | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1564 (ediff-barf-if-not-control-buffer) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1565 (setq difference-number (1- difference-number)) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1566 (if (and (>= difference-number -1) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1567 (< difference-number (1+ ediff-number-of-differences))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1568 (ediff-unselect-and-select-difference difference-number) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1569 (error "Bad difference number, %d" difference-number))) |
11042 | 1570 |
1571 (defun ediff-jump-to-difference-at-point () | |
1572 "Go to difference closest to the point in buffer A, B, or C. | |
1573 The type of buffer depends on last command character \(a, b, or c\) that | |
1574 invoked this command." | |
1575 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1576 (ediff-barf-if-not-control-buffer) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1577 (let ((buf-type (ediff-char-to-buftype last-command-char))) |
11042 | 1578 (ediff-jump-to-difference (ediff-diff-at-point buf-type)))) |
1579 | |
1580 | |
1581 ;; find region most related to the current point position (or POS, if given) | |
1582 (defun ediff-diff-at-point (buf-type &optional pos) | |
1583 (let ((buffer (ediff-get-buffer buf-type)) | |
1584 (ctl-buffer ediff-control-buffer) | |
1585 (max-dif-num (1- ediff-number-of-differences)) | |
1586 (diff-no -1) | |
1587 (prev-beg 0) | |
1588 (prev-end 0) | |
1589 (beg 0) | |
1590 (end 0)) | |
1591 | |
1592 (ediff-eval-in-buffer buffer | |
1593 (setq pos (or pos (point))) | |
1594 (while (and (or (< pos prev-beg) (> pos beg)) | |
1595 (< diff-no max-dif-num)) | |
1596 (setq diff-no (1+ diff-no)) | |
1597 (setq prev-beg beg | |
1598 prev-end end) | |
1599 (setq beg (ediff-get-diff-posn buf-type 'beg diff-no ctl-buffer) | |
1600 end (ediff-get-diff-posn buf-type 'end diff-no ctl-buffer)) | |
1601 ) | |
1602 | |
1603 (if (< (abs (- pos prev-end)) | |
1604 (abs (- pos beg))) | |
1605 diff-no | |
1606 (1+ diff-no)) ; jump-to-diff works with diff nums higher by 1 | |
1607 ))) | |
1608 | |
1609 | |
1610 ;;; Copying diffs. | |
1611 | |
1612 (defun ediff-diff-to-diff (arg &optional keys) | |
1613 "Copy buffer-X'th diff to buffer Y \(X,Y are A, B, or C\). | |
1614 If numerical prefix argument, copy this diff specified in the arg. | |
1615 Otherwise, copy the difference given by `ediff-current-difference'. | |
1616 This command assumes it is bound to a 2-character key sequence, `ab', `ba', | |
1617 `ac', etc., which is used to determine the types of buffers to be used for | |
1618 copying difference regions. The first character in the sequence specifies | |
1619 the source buffer and the second specifies the target. | |
1620 | |
1621 If the second optional argument, a 2-character string, is given, use it to | |
1622 determine the source and the target buffers instead of the command keys." | |
1623 (interactive "P") | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1624 (ediff-barf-if-not-control-buffer) |
11042 | 1625 (or keys (setq keys (this-command-keys))) |
1626 (if arg | |
1627 (ediff-jump-to-difference arg)) | |
1628 (let* ((key1 (aref keys 0)) | |
1629 (key2 (aref keys 1)) | |
1630 (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
|
1631 (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
|
1632 ediff-verbose-p) |
11042 | 1633 (ediff-copy-diff ediff-current-difference |
1634 (ediff-char-to-buftype char1) | |
1635 (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
|
1636 ;; 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
|
1637 (ediff-recenter))) |
11042 | 1638 |
1639 | |
1640 ;; Copy diff N from FROM-BUF-TYPE \(given as A, B or C\) to TO-BUF-TYPE. | |
1641 ;; If optional DO-NOT-SAVE is non-nil, do not save the old value of the | |
1642 ;; target diff. This is used in merging, when constructing the merged | |
1643 ;; version. | |
1644 (defun ediff-copy-diff (n from-buf-type to-buf-type | |
1645 &optional batch-invocation reg-to-copy) | |
1646 (let* ((to-buf (ediff-get-buffer to-buf-type)) | |
1647 ;;(from-buf (if (not reg-to-copy) (ediff-get-buffer from-buf-type))) | |
1648 (ctrl-buf ediff-control-buffer) | |
1649 (saved-p t) | |
1650 (three-way ediff-3way-job) | |
1651 messg | |
1652 ediff-verbose-p | |
1653 reg-to-delete reg-to-delete-beg reg-to-delete-end) | |
1654 | |
1655 (setq reg-to-delete-beg | |
1656 (ediff-get-diff-posn to-buf-type 'beg n ctrl-buf)) | |
1657 (setq reg-to-delete-end | |
1658 (ediff-get-diff-posn to-buf-type 'end n ctrl-buf)) | |
1659 | |
1660 (if reg-to-copy | |
1661 (setq from-buf-type nil) | |
1662 (setq reg-to-copy (ediff-get-region-contents n from-buf-type ctrl-buf))) | |
1663 | |
1664 (setq reg-to-delete (ediff-get-region-contents | |
1665 n to-buf-type ctrl-buf | |
1666 reg-to-delete-beg reg-to-delete-end)) | |
1667 | |
1668 (setq ediff-disturbed-overlays nil) ; clear before use | |
1669 | |
1670 (if (string= reg-to-delete reg-to-copy) | |
1671 (setq saved-p nil) ; refuse to copy identical buffers | |
1672 ;; seems ok to copy | |
1673 (if (or batch-invocation (ediff-test-save-region n to-buf-type)) | |
1674 (condition-case conds | |
1675 (progn | |
1676 (ediff-eval-in-buffer to-buf | |
1677 ;; 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
|
1678 (let ((inhibit-read-only (null buffer-read-only))) |
11042 | 1679 ;; these two insert a dummy char to overcome a bug in |
1680 ;; XEmacs, which sometimes prevents 0-length extents | |
1681 ;; from sensing insertion at its end-points. | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1682 ;; (need to check if 19.12 still has the bug) |
11042 | 1683 (if ediff-xemacs-p |
1684 (progn | |
1685 (goto-char reg-to-delete-end) | |
1686 (insert-before-markers "@"))) | |
1687 | |
1688 (goto-char reg-to-delete-end) | |
1689 (insert-before-markers reg-to-copy) | |
1690 | |
1691 ;; delete the dummy char "@" | |
1692 (if ediff-xemacs-p | |
1693 (delete-char 1)) | |
1694 | |
1695 (if ediff-xemacs-p | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1696 (if (> reg-to-delete-end reg-to-delete-beg) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1697 (kill-region reg-to-delete-beg |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1698 reg-to-delete-end)) |
11042 | 1699 (if (> reg-to-delete-end reg-to-delete-beg) |
1700 (kill-region reg-to-delete-beg reg-to-delete-end) | |
1701 (ediff-move-disturbed-overlays reg-to-delete-beg) | |
1702 )) | |
1703 )) | |
1704 (or batch-invocation | |
1705 (setq | |
1706 messg | |
1707 (ediff-save-diff-region n to-buf-type reg-to-delete)))) | |
1708 (error (message "ediff-copy-diff: %s %s" | |
1709 (car conds) | |
1710 (mapconcat 'prin1-to-string (cdr conds) " ")) | |
1711 (beep 1) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1712 (sit-for 2) ; let the user see the error msg |
11042 | 1713 (setq saved-p nil) |
1714 ))) | |
1715 ) | |
1716 | |
1717 ;; adjust state of difference in case 3-way and diff was copied ok | |
1718 (if (and saved-p three-way) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1719 (ediff-set-state-of-diff-in-all-buffers n ctrl-buf)) |
11042 | 1720 |
1721 (if batch-invocation | |
1722 (ediff-clear-fine-differences n) | |
1723 ;; If diff3 job, we should recompute fine diffs so we clear them | |
1724 ;; before reinserting flags (and thus before ediff-recenter). | |
1725 (if (and saved-p three-way) | |
1726 (ediff-clear-fine-differences n)) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1727 |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1728 (ediff-refresh-mode-lines) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1729 |
11042 | 1730 ;; For diff2 jobs, don't recompute fine diffs, since we know there |
1731 ;; aren't any. So we clear diffs after ediff-recenter. | |
1732 (if (and saved-p (not three-way)) | |
1733 (ediff-clear-fine-differences n)) | |
1734 ;; Make sure that the message about saving and how to restore is seen | |
1735 ;; by the user | |
1736 (message messg)) | |
1737 )) | |
1738 | |
1739 ;; Save Nth diff of buffer BUF-TYPE \(A, B, or C\). | |
1740 ;; That is to say, the Nth diff on the `ediff-killed-diffs-alist'. REG | |
1741 ;; is the region to save. It is redundant here, but is passed anyway, for | |
1742 ;; convenience. | |
1743 (defun ediff-save-diff-region (n buf-type reg) | |
1744 (let* ((n-th-diff-saved (assoc n ediff-killed-diffs-alist)) | |
1745 (buf (ediff-get-buffer buf-type)) | |
1746 (this-buf-n-th-diff-saved (assoc buf (cdr n-th-diff-saved)))) | |
1747 | |
1748 (if this-buf-n-th-diff-saved | |
1749 ;; either nothing saved for n-th diff and buffer or we OK'ed | |
1750 ;; overriding | |
1751 (setcdr this-buf-n-th-diff-saved reg) | |
1752 (if n-th-diff-saved ;; n-th diff saved, but for another buffer | |
1753 (nconc n-th-diff-saved (list (cons buf reg))) | |
1754 (setq ediff-killed-diffs-alist ;; create record for n-th diff | |
1755 (cons (list n (cons buf reg)) | |
1756 ediff-killed-diffs-alist)))) | |
1757 (message "Saving old diff region #%d of buffer %S. To recover, type `r%s'" | |
1758 (1+ n) buf-type | |
1759 (if ediff-merge-job | |
1760 "" (downcase (symbol-name buf-type)))) | |
1761 )) | |
1762 | |
1763 ;; Test if saving Nth difference region of buffer BUF-TYPE is possible. | |
1764 (defun ediff-test-save-region (n buf-type) | |
1765 (let* ((n-th-diff-saved (assoc n ediff-killed-diffs-alist)) | |
1766 (buf (ediff-get-buffer buf-type)) | |
1767 (this-buf-n-th-diff-saved (assoc buf (cdr n-th-diff-saved)))) | |
1768 | |
1769 (if this-buf-n-th-diff-saved | |
1770 (if (yes-or-no-p | |
1771 (format | |
1772 "You've previously copied diff region %d to buffer %S. Confirm " | |
1773 (1+ n) buf-type)) | |
1774 t | |
1775 (error "Quit")) | |
1776 t))) | |
1777 | |
1778 (defun ediff-pop-diff (n buf-type) | |
1779 "Pop last killed Nth diff region from buffer BUF-TYPE." | |
1780 (let* ((n-th-record (assoc n ediff-killed-diffs-alist)) | |
1781 (buf (ediff-get-buffer buf-type)) | |
1782 (saved-rec (assoc buf (cdr n-th-record))) | |
1783 (three-way ediff-3way-job) | |
1784 (ctl-buf ediff-control-buffer) | |
1785 ediff-verbose-p | |
1786 saved-diff reg-beg reg-end recovered) | |
1787 | |
1788 (if (cdr saved-rec) | |
1789 (setq saved-diff (cdr saved-rec)) | |
1790 (if (> ediff-number-of-differences 0) | |
1791 (error "Nothing saved for diff %d in buffer %S" (1+ n) buf-type) | |
1792 (error "No differences found"))) | |
1793 | |
1794 (setq reg-beg (ediff-get-diff-posn buf-type 'beg n ediff-control-buffer)) | |
1795 (setq reg-end (ediff-get-diff-posn buf-type 'end n ediff-control-buffer)) | |
1796 (setq ediff-disturbed-overlays nil) ; clear before use | |
1797 | |
1798 (condition-case conds | |
1799 (ediff-eval-in-buffer buf | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1800 (let ((inhibit-read-only (null buffer-read-only))) |
11042 | 1801 ;; these two insert a dummy char to overcome a bug in XEmacs, |
1802 ;; which sometimes prevents 0-length extents from sensing | |
1803 ;; insertion at its end-points. | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1804 ;; (need to check if 19.12 still has the bug) |
11042 | 1805 (if ediff-xemacs-p |
1806 (progn | |
1807 (goto-char reg-end) | |
1808 (insert-before-markers "@"))) | |
1809 | |
1810 (goto-char reg-end) | |
1811 (insert-before-markers saved-diff) | |
1812 | |
1813 ;; delete dummy char | |
1814 (if ediff-xemacs-p | |
1815 (delete-char 1)) | |
1816 | |
1817 (if ediff-xemacs-p | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1818 (if (> reg-end reg-beg) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1819 (kill-region reg-beg reg-end)) |
11042 | 1820 (if (> reg-end reg-beg) |
1821 (kill-region reg-beg reg-end) | |
1822 (ediff-move-disturbed-overlays reg-beg) | |
1823 )) | |
1824 | |
1825 (setq recovered t) | |
1826 )) | |
1827 (error (message "ediff-pop-diff: %s %s" | |
1828 (car conds) | |
1829 (mapconcat 'prin1-to-string (cdr conds) " ")) | |
1830 (beep 1))) | |
1831 | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1832 ;; Clearing fine diffs is necessary for |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1833 ;; ediff-unselect-and-select-difference to properly recompute them. We |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1834 ;; 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
|
1835 ;; 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
|
1836 ;; fine diffs. |
11042 | 1837 (if recovered |
1838 (ediff-clear-fine-differences n)) | |
1839 | |
1840 ;; adjust state of difference | |
1841 (if (and three-way recovered) | |
1842 (ediff-set-state-of-diff-in-all-buffers n ctl-buf)) | |
1843 | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1844 (ediff-refresh-mode-lines) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
1845 |
11042 | 1846 (if recovered |
1847 (progn | |
1848 (setq n-th-record (delq saved-rec n-th-record)) | |
1849 (message "Diff region %d in buffer %S restored" (1+ n) buf-type) | |
1850 )) | |
1851 )) | |
1852 | |
1853 (defun ediff-restore-diff (arg &optional key) | |
1854 "Restore ARGth diff from `ediff-killed-diffs-alist'. | |
1855 ARG is a prefix argument. If ARG is nil, restore current-difference. | |
1856 | |
1857 If the second optional argument, a character, is given, use it to | |
1858 determine the target buffer instead of last-command-char" | |
1859 (interactive "P") | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1860 (ediff-barf-if-not-control-buffer) |
11042 | 1861 (if arg |
1862 (ediff-jump-to-difference arg)) | |
1863 (ediff-pop-diff ediff-current-difference | |
1864 (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
|
1865 ;; 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
|
1866 (let (ediff-verbose-p) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1867 (ediff-recenter))) |
11042 | 1868 |
1869 (defun ediff-toggle-regexp-match () | |
1870 "Toggle between focusing and hiding of difference regions that match | |
1871 a regular expression typed in by the user." | |
1872 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1873 (ediff-barf-if-not-control-buffer) |
11042 | 1874 (let ((regexp-A "") |
1875 (regexp-B "") | |
1876 (regexp-C "") | |
1877 msg-connective alt-msg-connective alt-connective) | |
1878 (cond | |
1879 ((or (and (eq ediff-skip-diff-region-function | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1880 'ediff-focus-on-regexp-matches-function) |
11042 | 1881 (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
|
1882 (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
|
1883 ediff-hide-regexp-matches-function) |
11042 | 1884 (eq last-command-char ?h))) |
1885 (message "Selective browsing by regexp turned off") | |
1886 (setq ediff-skip-diff-region-function 'ediff-show-all-diffs)) | |
1887 ((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
|
1888 (setq ediff-skip-diff-region-function ediff-hide-regexp-matches-function |
11042 | 1889 regexp-A |
1890 (read-string | |
1891 (format | |
1892 "Ignore A-regions matching this regexp (default \"%s\"): " | |
1893 ediff-regexp-hide-A)) | |
1894 regexp-B | |
1895 (read-string | |
1896 (format | |
1897 "Ignore B-regions matching this regexp (default \"%s\"): " | |
1898 ediff-regexp-hide-B))) | |
1899 (if ediff-3way-comparison-job | |
1900 (setq regexp-C | |
1901 (read-string | |
1902 (format | |
1903 "Ignore C-regions matching this regexp (default \"%s\"): " | |
1904 ediff-regexp-hide-C)))) | |
1905 (if (eq ediff-hide-regexp-connective 'and) | |
1906 (setq msg-connective "BOTH" | |
1907 alt-msg-connective "ONE OF" | |
1908 alt-connective 'or) | |
1909 (setq msg-connective "ONE OF" | |
1910 alt-msg-connective "BOTH" | |
1911 alt-connective 'and)) | |
1912 (if (y-or-n-p | |
1913 (format | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1914 "Ignore regions that match %s regexps, OK? " |
11042 | 1915 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
|
1916 (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
|
1917 (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
|
1918 (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
|
1919 alt-msg-connective)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1920 |
11042 | 1921 (or (string= regexp-A "") (setq ediff-regexp-hide-A regexp-A)) |
1922 (or (string= regexp-B "") (setq ediff-regexp-hide-B regexp-B)) | |
1923 (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
|
1924 |
11042 | 1925 ((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
|
1926 (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
|
1927 ediff-focus-on-regexp-matches-function |
11042 | 1928 regexp-A |
1929 (read-string | |
1930 (format | |
1931 "Focus on A-regions matching this regexp (default \"%s\"): " | |
1932 ediff-regexp-focus-A)) | |
1933 regexp-B | |
1934 (read-string | |
1935 (format | |
1936 "Focus on B-regions matching this regexp (default \"%s\"): " | |
1937 ediff-regexp-focus-B))) | |
1938 (if ediff-3way-comparison-job | |
1939 (setq regexp-C | |
1940 (read-string | |
1941 (format | |
1942 "Focus on C-regions matching this regexp (default \"%s\"): " | |
1943 ediff-regexp-focus-C)))) | |
1944 (if (eq ediff-focus-regexp-connective 'and) | |
1945 (setq msg-connective "BOTH" | |
1946 alt-msg-connective "ONE OF" | |
1947 alt-connective 'or) | |
1948 (setq msg-connective "ONE OF" | |
1949 alt-msg-connective "BOTH" | |
1950 alt-connective 'and)) | |
1951 (if (y-or-n-p | |
1952 (format | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1953 "Focus on regions that match %s regexps, OK? " |
11042 | 1954 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
|
1955 (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
|
1956 msg-connective) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1957 (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
|
1958 (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
|
1959 alt-msg-connective)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1960 |
11042 | 1961 (or (string= regexp-A "") (setq ediff-regexp-focus-A regexp-A)) |
1962 (or (string= regexp-B "") (setq ediff-regexp-focus-B regexp-B)) | |
1963 (or (string= regexp-C "") (setq ediff-regexp-focus-C regexp-C)))))) | |
1964 | |
1965 (defun ediff-toggle-skip-similar () | |
1966 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
1967 (ediff-barf-if-not-control-buffer) |
11042 | 1968 (if (not (eq ediff-auto-refine 'on)) |
1969 (error | |
1970 "Can't skip over whitespace regions: first turn auto-refining on")) | |
1971 (setq ediff-ignore-similar-regions (not ediff-ignore-similar-regions)) | |
1972 (if ediff-ignore-similar-regions | |
1973 (message | |
1974 "Skipping regions that differ only in white space & line breaks") | |
1975 (message "Skipping over white-space differences turned off"))) | |
1976 | |
1977 (defun ediff-focus-on-regexp-matches (n) | |
1978 "Focus on diffs that match regexp `ediff-regexp-focus-A/B'. | |
1979 Regions to be ignored according to this function are those where | |
1980 buf A region doesn't match `ediff-regexp-focus-A' and buf B region | |
1981 doesn't match `ediff-regexp-focus-B'. | |
1982 This function returns nil if the region number N (specified as | |
1983 an argument) is not to be ignored and t if region N is to be ignored. | |
1984 | |
1985 N is a region number used by Ediff internally. It is 1 less | |
1986 the number seen by the user." | |
1987 (if (ediff-valid-difference-p n) | |
1988 (let* ((ctl-buf ediff-control-buffer) | |
1989 (regex-A ediff-regexp-focus-A) | |
1990 (regex-B ediff-regexp-focus-B) | |
1991 (regex-C ediff-regexp-focus-C) | |
1992 (reg-A-match (ediff-eval-in-buffer ediff-buffer-A | |
1993 (goto-char (ediff-get-diff-posn 'A 'beg n ctl-buf)) | |
1994 (re-search-forward | |
1995 regex-A | |
1996 (ediff-get-diff-posn 'A 'end n ctl-buf) | |
1997 t))) | |
1998 (reg-B-match (ediff-eval-in-buffer ediff-buffer-B | |
1999 (goto-char (ediff-get-diff-posn 'B 'beg n ctl-buf)) | |
2000 (re-search-forward | |
2001 regex-B | |
2002 (ediff-get-diff-posn 'B 'end n ctl-buf) | |
2003 t))) | |
2004 (reg-C-match (if ediff-3way-comparison-job | |
2005 (ediff-eval-in-buffer ediff-buffer-C | |
2006 (goto-char | |
2007 (ediff-get-diff-posn 'C 'beg n ctl-buf)) | |
2008 (re-search-forward | |
2009 regex-C | |
2010 (ediff-get-diff-posn 'C 'end n ctl-buf) | |
2011 t))))) | |
2012 (not (eval (if ediff-3way-comparison-job | |
2013 (list ediff-focus-regexp-connective | |
2014 reg-A-match reg-B-match reg-C-match) | |
2015 (list ediff-focus-regexp-connective | |
2016 reg-A-match reg-B-match)))) | |
2017 ))) | |
2018 | |
2019 (defun ediff-hide-regexp-matches (n) | |
2020 "Hide diffs that match regexp `ediff-regexp-hide-A/B/C'. | |
2021 Regions to be ignored are those where buf A region matches | |
2022 `ediff-regexp-hide-A' and buf B region matches `ediff-regexp-hide-B'. | |
2023 This function returns nil if the region number N (specified as | |
2024 an argument) is not to be ignored and t if region N is to be ignored. | |
2025 | |
2026 N is a region number used by Ediff internally. It is 1 less | |
2027 the number seen by the user." | |
2028 (if (ediff-valid-difference-p n) | |
2029 (let* ((ctl-buf ediff-control-buffer) | |
2030 (regex-A ediff-regexp-hide-A) | |
2031 (regex-B ediff-regexp-hide-B) | |
2032 (regex-C ediff-regexp-hide-C) | |
2033 (reg-A-match (ediff-eval-in-buffer ediff-buffer-A | |
2034 (goto-char (ediff-get-diff-posn 'A 'beg n ctl-buf)) | |
2035 (re-search-forward | |
2036 regex-A | |
2037 (ediff-get-diff-posn 'A 'end n ctl-buf) | |
2038 t))) | |
2039 (reg-B-match (ediff-eval-in-buffer ediff-buffer-B | |
2040 (goto-char (ediff-get-diff-posn 'B 'beg n ctl-buf)) | |
2041 (re-search-forward | |
2042 regex-B | |
2043 (ediff-get-diff-posn 'B 'end n ctl-buf) | |
2044 t))) | |
2045 (reg-C-match (if ediff-3way-comparison-job | |
2046 (ediff-eval-in-buffer ediff-buffer-C | |
2047 (goto-char | |
2048 (ediff-get-diff-posn 'C 'beg n ctl-buf)) | |
2049 (re-search-forward | |
2050 regex-C | |
2051 (ediff-get-diff-posn 'C 'end n ctl-buf) | |
2052 t))))) | |
2053 (eval (if ediff-3way-comparison-job | |
2054 (list ediff-hide-regexp-connective | |
2055 reg-A-match reg-B-match reg-C-match) | |
2056 (list ediff-hide-regexp-connective reg-A-match reg-B-match))) | |
2057 ))) | |
2058 | |
2059 | |
2060 | |
2061 ;;; Quitting, suspending, etc. | |
2062 | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2063 (defun ediff-quit (reverse-default-keep-variants) |
11042 | 2064 "Finish an Ediff session and exit Ediff. |
2065 Unselects the selected difference, if any, restores the read-only and modified | |
2066 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
|
2067 \(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
|
2068 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2069 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
|
2070 containing the variants should be removed \(if they haven't been modified\). |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2071 If it is t, they will be preserved unconditionally. A prefix argument, |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2072 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
|
2073 (interactive "P") |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2074 (ediff-barf-if-not-control-buffer) |
11042 | 2075 (if (prog1 |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2076 (y-or-n-p |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2077 (format "Quit this Ediff session%s? " |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2078 (if (ediff-buffer-live-p ediff-meta-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2079 " & show containing session group" ""))) |
11042 | 2080 (message "")) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2081 (ediff-really-quit reverse-default-keep-variants))) |
11042 | 2082 |
2083 | |
2084 ;; Perform the quit operations. | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2085 (defun ediff-really-quit (reverse-default-keep-variants) |
11042 | 2086 (ediff-unhighlight-diffs-totally) |
2087 (ediff-clear-diff-vector 'ediff-difference-vector-A 'fine-diffs-also) | |
2088 (ediff-clear-diff-vector 'ediff-difference-vector-B 'fine-diffs-also) | |
2089 (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
|
2090 (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
|
2091 |
11042 | 2092 (ediff-delete-temp-files) |
2093 | |
2094 ;; Restore visibility range. This affects only ediff-*-regions/windows. | |
2095 ;; Since for other job names ediff-visible-region sets | |
2096 ;; ediff-visible-bounds to ediff-wide-bounds, the settings below are | |
2097 ;; ignored for such jobs. | |
2098 (if ediff-quit-widened | |
2099 (setq ediff-visible-bounds ediff-wide-bounds) | |
2100 (setq ediff-visible-bounds ediff-narrow-bounds)) | |
2101 | |
2102 ;; Apply selective display to narrow or widen | |
2103 (ediff-visible-region) | |
2104 (mapcar (function (lambda (overl) | |
2105 (if (ediff-overlayp overl) | |
2106 (ediff-delete-overlay overl)))) | |
2107 ediff-wide-bounds) | |
2108 (mapcar (function (lambda (overl) | |
2109 (if (ediff-overlayp overl) | |
2110 (ediff-delete-overlay overl)))) | |
2111 ediff-narrow-bounds) | |
2112 | |
2113 ;; 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
|
2114 (let ((control-buffer ediff-control-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2115 (meta-buffer ediff-meta-buffer)) |
11042 | 2116 (condition-case nil |
2117 (ediff-eval-in-buffer ediff-buffer-A | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2118 (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
|
2119 (delq control-buffer ediff-this-buffer-ediff-sessions)) |
11042 | 2120 (kill-local-variable 'mode-line-buffer-identification) |
2121 (kill-local-variable 'mode-line-format) | |
2122 ) | |
2123 (error)) | |
2124 | |
2125 (condition-case nil | |
2126 (ediff-eval-in-buffer ediff-buffer-B | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2127 (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
|
2128 (delq control-buffer ediff-this-buffer-ediff-sessions)) |
11042 | 2129 (kill-local-variable 'mode-line-buffer-identification) |
2130 (kill-local-variable 'mode-line-format) | |
2131 ) | |
2132 (error)) | |
2133 | |
2134 (condition-case nil | |
2135 (ediff-eval-in-buffer ediff-buffer-C | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2136 (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
|
2137 (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
|
2138 (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
|
2139 (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
|
2140 ) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2141 (error)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2142 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2143 (condition-case nil |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2144 (ediff-eval-in-buffer ediff-ancestor-buffer |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2145 (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
|
2146 (delq control-buffer ediff-this-buffer-ediff-sessions)) |
11042 | 2147 (kill-local-variable 'mode-line-buffer-identification) |
2148 (kill-local-variable 'mode-line-format) | |
2149 ) | |
2150 (error)) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2151 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2152 (setq ediff-session-registry |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2153 (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
|
2154 (ediff-update-registry) |
11042 | 2155 ;; restore state of buffers to what it was before ediff |
2156 (ediff-restore-protected-variables) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2157 ;; good place to kill buffers A/B/C |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2158 (run-hooks 'ediff-cleanup-hook) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2159 (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
|
2160 (if reverse-default-keep-variants |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2161 (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
|
2162 (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
|
2163 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2164 (run-hooks 'ediff-quit-hook) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2165 (ediff-cleanup-meta-buffer meta-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2166 (if (ediff-buffer-live-p meta-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2167 (ediff-show-meta-buffer meta-buffer)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2168 )) |
11042 | 2169 |
2170 | |
2171 (defun ediff-delete-temp-files () | |
2172 (if (stringp ediff-temp-file-A) | |
2173 (delete-file ediff-temp-file-A)) | |
2174 (if (stringp ediff-temp-file-B) | |
2175 (delete-file ediff-temp-file-B)) | |
2176 (if (stringp ediff-temp-file-C) | |
2177 (delete-file ediff-temp-file-C))) | |
2178 | |
2179 | |
2180 ;; Kill control buffer, other auxiliary Ediff buffers. | |
2181 ;; Leave one of the frames split between buffers A/B/C | |
2182 (defun ediff-cleanup-mess () | |
2183 (let ((buff-A ediff-buffer-A) | |
2184 (buff-B ediff-buffer-B) | |
2185 (buff-C ediff-buffer-C) | |
2186 (ctl-buf ediff-control-buffer) | |
2187 (ctl-frame ediff-control-frame) | |
2188 (three-way-job ediff-3way-job)) | |
2189 | |
2190 (ediff-kill-buffer-carefully ediff-diff-buffer) | |
2191 (ediff-kill-buffer-carefully ediff-custom-diff-buffer) | |
2192 (ediff-kill-buffer-carefully ediff-fine-diff-buffer) | |
2193 (ediff-kill-buffer-carefully ediff-tmp-buffer) | |
2194 (ediff-kill-buffer-carefully ediff-error-buffer) | |
2195 (ediff-kill-buffer-carefully ediff-patch-diagnostics) | |
2196 (ediff-kill-buffer-carefully ediff-msg-buffer) | |
2197 (ediff-kill-buffer-carefully ediff-debug-buffer) | |
2198 | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2199 ;;(redraw-display) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2200 (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
|
2201 (delete-frame ctl-frame)) |
11042 | 2202 (ediff-kill-buffer-carefully ctl-buf) |
2203 | |
2204 (delete-other-windows) | |
2205 | |
2206 ;; display only if not visible | |
2207 (condition-case nil | |
2208 (or (ediff-get-visible-buffer-window buff-B) | |
2209 (switch-to-buffer buff-B)) | |
2210 (error)) | |
2211 (condition-case nil | |
2212 (or (ediff-get-visible-buffer-window buff-A) | |
2213 (progn | |
2214 (if (ediff-get-visible-buffer-window buff-B) | |
2215 (split-window-vertically)) | |
2216 (switch-to-buffer buff-A))) | |
2217 (error)) | |
2218 (if three-way-job | |
2219 (condition-case nil | |
2220 (or (ediff-get-visible-buffer-window buff-C) | |
2221 (progn | |
2222 (if (or (ediff-get-visible-buffer-window buff-A) | |
2223 (ediff-get-visible-buffer-window buff-B)) | |
2224 (split-window-vertically)) | |
2225 (switch-to-buffer buff-C) | |
2226 (balance-windows))) | |
2227 (error))) | |
2228 (message "") | |
2229 )) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2230 |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2231 (defun ediff-janitor (&optional ask) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2232 "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
|
2233 In merge jobs, buffer C is never deleted. |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2234 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
|
2235 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
|
2236 buffer in another session as well." |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2237 (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
|
2238 (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
|
2239 (and ask |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2240 (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
|
2241 (buffer-name ediff-buffer-A))))) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2242 (ediff-kill-buffer-carefully ediff-buffer-A)) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2243 (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
|
2244 (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
|
2245 (and ask |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2246 (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
|
2247 (buffer-name ediff-buffer-B))))) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2248 (ediff-kill-buffer-carefully ediff-buffer-B)) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2249 (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
|
2250 (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
|
2251 (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
|
2252 (and ask |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2253 (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
|
2254 (buffer-name ediff-ancestor-buffer))))) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2255 (ediff-kill-buffer-carefully ediff-ancestor-buffer)) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2256 (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
|
2257 (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
|
2258 (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
|
2259 (buffer-name ediff-buffer-C))))) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2260 (ediff-kill-buffer-carefully ediff-buffer-C)))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2261 |
11042 | 2262 ;; The default way of suspending Ediff. |
2263 ;; 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
|
2264 (defun ediff-default-suspend-function () |
11042 | 2265 (let* ((buf-A ediff-buffer-A) |
2266 (buf-B ediff-buffer-B) | |
2267 (buf-C ediff-buffer-C) | |
2268 (buf-A-wind (ediff-get-visible-buffer-window buf-A)) | |
2269 (buf-B-wind (ediff-get-visible-buffer-window buf-B)) | |
2270 (buf-C-wind (ediff-get-visible-buffer-window buf-C)) | |
2271 (buf-patch ediff-patch-buf) | |
2272 (buf-patch-diag ediff-patch-diagnostics) | |
2273 (buf-err ediff-error-buffer) | |
2274 (buf-diff ediff-diff-buffer) | |
2275 (buf-custom-diff ediff-custom-diff-buffer) | |
2276 (buf-fine-diff ediff-fine-diff-buffer)) | |
2277 | |
2278 ;; hide the control panel | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2279 (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
|
2280 (iconify-frame ediff-control-frame) |
11042 | 2281 (bury-buffer)) |
2282 (if buf-err (bury-buffer buf-err)) | |
2283 (if buf-diff (bury-buffer buf-diff)) | |
2284 (if buf-custom-diff (bury-buffer buf-custom-diff)) | |
2285 (if buf-fine-diff (bury-buffer buf-fine-diff)) | |
2286 (if buf-patch (bury-buffer buf-patch)) | |
2287 (if buf-patch-diag (bury-buffer buf-patch-diag)) | |
2288 (if (window-live-p buf-A-wind) | |
2289 (progn | |
2290 (select-window buf-A-wind) | |
2291 (delete-other-windows) | |
2292 (bury-buffer)) | |
2293 (if (ediff-buffer-live-p buf-A) (bury-buffer buf-A))) | |
2294 (if (window-live-p buf-B-wind) | |
2295 (progn | |
2296 (select-window buf-B-wind) | |
2297 (delete-other-windows) | |
2298 (bury-buffer)) | |
2299 (if (ediff-buffer-live-p buf-B) (bury-buffer buf-B))) | |
2300 (if (window-live-p buf-C-wind) | |
2301 (progn | |
2302 (select-window buf-C-wind) | |
2303 (delete-other-windows) | |
2304 (bury-buffer)) | |
2305 (if (ediff-buffer-live-p buf-C) (bury-buffer buf-C))) | |
2306 | |
2307 )) | |
2308 | |
2309 | |
2310 (defun ediff-suspend () | |
2311 "Suspend Ediff. | |
2312 To resume, switch to the appropriate `Ediff Control Panel' | |
2313 buffer and then type \\[ediff-recenter]. Ediff will automatically set | |
2314 up an appropriate window config." | |
2315 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2316 (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
|
2317 (run-hooks 'ediff-suspend-hook) |
11042 | 2318 (message |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2319 "To resume, type M-x eregistry and select the desired Ediff session")) |
11042 | 2320 |
2321 | |
2322 (defun ediff-status-info () | |
2323 "Show the names of the buffers or files being operated on by Ediff. | |
2324 Hit \\[ediff-recenter] to reset the windows afterward." | |
2325 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2326 (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
|
2327 (save-excursion |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2328 (ediff-skip-unsuitable-frames)) |
11042 | 2329 (with-output-to-temp-buffer " *ediff-info*" |
2330 (princ (ediff-version)) | |
2331 (princ "\n\n") | |
2332 (ediff-eval-in-buffer ediff-buffer-A | |
2333 (if buffer-file-name | |
2334 (princ | |
2335 (format "File A = %S\n" buffer-file-name)) | |
2336 (princ | |
2337 (format "Buffer A = %S\n" (buffer-name))))) | |
2338 (ediff-eval-in-buffer ediff-buffer-B | |
2339 (if buffer-file-name | |
2340 (princ | |
2341 (format "File B = %S\n" buffer-file-name)) | |
2342 (princ | |
2343 (format "Buffer B = %S\n" (buffer-name))))) | |
2344 (if ediff-3way-job | |
2345 (ediff-eval-in-buffer ediff-buffer-C | |
2346 (if buffer-file-name | |
2347 (princ | |
2348 (format "File C = %S\n" buffer-file-name)) | |
2349 (princ | |
2350 (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
|
2351 (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
|
2352 (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
|
2353 (concat "\tin buffer " |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2354 (buffer-name ediff-custom-diff-buffer)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2355 "is not available"))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2356 (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
|
2357 (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
|
2358 (concat "\tin buffer " |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2359 (buffer-name ediff-diff-buffer)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2360 "is not available"))) |
11042 | 2361 |
2362 (let* ((A-line (ediff-eval-in-buffer ediff-buffer-A | |
2363 (1+ (count-lines (point-min) (point))))) | |
2364 (B-line (ediff-eval-in-buffer ediff-buffer-B | |
2365 (1+ (count-lines (point-min) (point))))) | |
2366 C-line) | |
2367 (princ (format "\Buffer A's point is on line %d\n" A-line)) | |
2368 (princ (format "Buffer B's point is on line %d\n" B-line)) | |
2369 (if ediff-3way-job | |
2370 (progn | |
2371 (setq C-line (ediff-eval-in-buffer ediff-buffer-C | |
2372 (1+ (count-lines (point-min) (point))))) | |
2373 (princ (format "Buffer C's point is on line %d\n" C-line))))) | |
2374 | |
2375 (princ (format "\nCurrent difference number = %S\n" | |
2376 (cond ((< ediff-current-difference 0) 'start) | |
2377 ((>= ediff-current-difference | |
2378 ediff-number-of-differences) 'end) | |
2379 (t (1+ ediff-current-difference))))) | |
2380 | |
2381 (cond (ediff-ignore-similar-regions | |
2382 (princ "\nSkipping regions that differ only in white space & line breaks")) | |
2383 (t | |
2384 (princ "\nNot skipping regions that differ in white space & line breaks"))) | |
2385 | |
2386 (cond ((eq ediff-skip-diff-region-function 'ediff-show-all-diffs) | |
2387 (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
|
2388 ((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
|
2389 ediff-hide-regexp-matches-function) |
11042 | 2390 (princ |
2391 "\nIgnoring regions that match") | |
2392 (princ | |
2393 (format | |
2394 "\n\t regexp `%s' in buffer A %S\n\t regexp `%s' in buffer B\n" | |
2395 ediff-regexp-hide-A ediff-hide-regexp-connective | |
2396 ediff-regexp-hide-B))) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2397 ((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
|
2398 ediff-focus-on-regexp-matches-function) |
11042 | 2399 (princ |
2400 "\nFocusing on regions that match") | |
2401 (princ | |
2402 (format | |
2403 "\n\t regexp `%s' in buffer A %S\n\t regexp `%s' in buffer B\n" | |
2404 ediff-regexp-focus-A ediff-focus-regexp-connective | |
2405 ediff-regexp-focus-B))) | |
2406 (t (princ "\nSelective browsing via a user-defined method.\n"))) | |
2407 | |
2408 (princ | |
2409 (format "\nBugs/suggestions: type `%s' while in Ediff Control Panel." | |
2410 (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
|
2411 ) ; with output |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2412 (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
|
2413 (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
|
2414 (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
|
2415 (select-window ediff-control-window))) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2416 |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2417 (defun ediff-documentation () |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2418 "Jump to Ediff's Info file." |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2419 (interactive) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2420 (let ((ctl-window ediff-control-window) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2421 (ctl-buf ediff-control-buffer)) |
11042 | 2422 |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2423 (ediff-skip-unsuitable-frames) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2424 (condition-case nil |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2425 (progn |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2426 (pop-to-buffer (get-buffer-create "*info*")) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2427 (info "ediff.info") |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2428 (message "Type `i' to search for a specific topic")) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2429 (error (beep 1) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2430 (with-output-to-temp-buffer " *ediff-info*" |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2431 (princ (format " |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2432 The Info file for Ediff does not seem to be installed. |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2433 |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2434 This file is part of the distribution of %sEmacs. |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2435 Please contact your system administrator. " |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2436 (if ediff-xemacs-p "X" "")))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2437 (if (window-live-p ctl-window) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2438 (progn |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2439 (select-window ctl-window) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2440 (set-window-buffer ctl-window ctl-buf))))))) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2441 |
11042 | 2442 |
2443 | |
2444 | |
2445 ;;; Support routines | |
2446 | |
2447 ;; Select a difference by placing the ASCII flags around the appropriate | |
2448 ;; group of lines in the A, B buffers | |
2449 ;; This may have to be modified for buffer C, when it will be supported. | |
2450 (defun ediff-select-difference (n) | |
2451 (if (and (ediff-buffer-live-p ediff-buffer-A) | |
2452 (ediff-buffer-live-p ediff-buffer-B) | |
2453 (ediff-valid-difference-p n)) | |
2454 (progn | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2455 (if (and (ediff-window-display-p) ediff-use-faces) |
11042 | 2456 (progn |
2457 (ediff-highlight-diff n) | |
2458 (setq ediff-highlighting-style 'face)) | |
2459 (setq ediff-highlighting-style 'ascii) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2460 (ediff-place-flags-in-buffer |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2461 'A ediff-buffer-A ediff-control-buffer n) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2462 (ediff-place-flags-in-buffer |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2463 'B ediff-buffer-B ediff-control-buffer n) |
11042 | 2464 (if ediff-3way-job |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2465 (ediff-place-flags-in-buffer |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2466 '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
|
2467 (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
|
2468 (ediff-place-flags-in-buffer |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2469 'Ancestor ediff-ancestor-buffer |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2470 ediff-control-buffer n)) |
11042 | 2471 ) |
2472 | |
2473 (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
|
2474 (run-hooks 'ediff-select-hook)))) |
11042 | 2475 |
2476 | |
2477 ;; Unselect a difference by removing the ASCII flags in the buffers. | |
2478 ;; This may have to be modified for buffer C, when it will be supported. | |
2479 (defun ediff-unselect-difference (n) | |
2480 (if (ediff-valid-difference-p n) | |
2481 (progn | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2482 (cond ((and (ediff-window-display-p) ediff-use-faces) |
11042 | 2483 (ediff-unhighlight-diff)) |
2484 ((eq ediff-highlighting-style 'ascii) | |
2485 (ediff-remove-flags-from-buffer | |
2486 ediff-buffer-A | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2487 (ediff-get-diff-overlay n 'A)) |
11042 | 2488 (ediff-remove-flags-from-buffer |
2489 ediff-buffer-B | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2490 (ediff-get-diff-overlay n 'B)) |
11042 | 2491 (if ediff-3way-job |
2492 (ediff-remove-flags-from-buffer | |
2493 ediff-buffer-C | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2494 (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
|
2495 (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
|
2496 (ediff-remove-flags-from-buffer |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2497 ediff-ancestor-buffer |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2498 (ediff-get-diff-overlay n 'Ancestor))) |
11042 | 2499 )) |
2500 (setq ediff-highlighting-style nil) | |
2501 | |
2502 ;; unhighlight fine diffs | |
2503 (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
|
2504 (run-hooks 'ediff-unselect-hook)))) |
11042 | 2505 |
2506 | |
2507 ;; Unselects prev diff and selects a new one, if FLAG has value other than | |
2508 ;; 'select-only or 'unselect-only. If FLAG is 'select-only, the | |
2509 ;; next difference is selected, but the current selection is not | |
2510 ;; unselected. If FLAG is 'unselect-only then the current selection is | |
2511 ;; unselected, but the next one is not selected. If NO-RECENTER is non-nil, | |
2512 ;; don't recenter buffers after selecting/unselecting. | |
2513 (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
|
2514 (let ((ediff-current-difference n)) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2515 (or no-recenter |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2516 (ediff-recenter 'no-rehighlight))) |
11042 | 2517 |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2518 (let ((control-buf ediff-control-buffer)) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2519 (unwind-protect |
11042 | 2520 (progn |
2521 (or (eq flag 'select-only) | |
2522 (ediff-unselect-difference ediff-current-difference)) | |
2523 | |
2524 (or (eq flag 'unselect-only) | |
2525 (ediff-select-difference n)) | |
2526 (setq ediff-current-difference n) | |
2527 ) ; end protected section | |
2528 | |
2529 (ediff-eval-in-buffer control-buf | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2530 (ediff-refresh-mode-lines)) |
11042 | 2531 ))) |
2532 | |
2533 | |
2534 (defun ediff-read-file-name (prompt default-dir default-file) | |
2535 ; This is a modified version of a similar function in `emerge.el'. | |
2536 ; PROMPT should not have trailing ': ', so that it can be modified | |
2537 ; according to context. | |
2538 ; If default-file is set, it should be used as the default value. | |
2539 ; If default-dir is non-nil, use it as the default directory. | |
2540 ; Otherwise, use the value of Emacs' variable `default-directory.' | |
2541 | |
2542 ;; hack default-dir if it is not set | |
2543 (setq default-dir | |
2544 (file-name-as-directory | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2545 (ediff-abbreviate-file-name |
11042 | 2546 (expand-file-name (or default-dir |
2547 (and default-file | |
2548 (file-name-directory default-file)) | |
2549 default-directory))))) | |
2550 | |
2551 ;; strip the directory from default-file | |
2552 (if default-file | |
2553 (setq default-file (file-name-nondirectory default-file))) | |
2554 (if (string= default-file "") | |
2555 (setq default-file nil)) | |
2556 | |
2557 (let (f) | |
2558 (setq f (expand-file-name | |
2559 (read-file-name | |
2560 (format "%s%s: " | |
2561 prompt | |
2562 (if default-file | |
2563 (concat " (default " default-file ")") | |
2564 "")) | |
2565 default-dir | |
2566 default-file | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2567 t ; must match, no-confirm |
11042 | 2568 (if default-file (file-name-directory default-file)) |
2569 ) | |
2570 default-dir | |
2571 )) | |
2572 ;; If user enters a directory name, expand the default file in that | |
2573 ;; directory. This allows the user to enter a directory name for the | |
2574 ;; B-file and diff against the default-file in that directory instead | |
2575 ;; of a DIRED listing! | |
2576 (if (and (file-directory-p f) default-file) | |
2577 (setq f (expand-file-name | |
2578 (file-name-nondirectory default-file) f))) | |
2579 f)) | |
2580 | |
2581 ;; If `prefix' is given, then it is used as a prefix for the temp file | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2582 ;; name. Otherwise, `ediff_' is used. If `file' is given, use this |
11042 | 2583 ;; file and don't create a new one. |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2584 ;; 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
|
2585 ;; 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
|
2586 (defun ediff-make-temp-file (buff &optional prefix given-file start end) |
11042 | 2587 (let ((f (or given-file |
2588 (make-temp-name (concat | |
2589 ediff-temp-file-prefix | |
2590 (if prefix | |
2591 (concat prefix "_") | |
2592 "ediff_")))))) | |
2593 ;; create the file | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2594 (ediff-eval-in-buffer buff |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2595 (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
|
2596 (if end end (point-max)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2597 f |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2598 nil ; don't append---erase |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2599 'no-message) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2600 (set-file-modes f ediff-temp-file-mode) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2601 f))) |
11042 | 2602 |
2603 ;; Quote metacharacters (using \) when executing diff in Unix, but not in | |
2604 ;; EMX OS/2 | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2605 ;;(defun ediff-protect-metachars (str) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2606 ;; (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
|
2607 ;; (let ((limit 0)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2608 ;; (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
|
2609 ;; (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
|
2610 ;; "\\" |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2611 ;; (substring str (match-beginning 0)))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2612 ;; (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
|
2613 ;; str) |
11042 | 2614 |
2615 ;; Make sure the current buffer (for a file) has the same contents as the | |
2616 ;; file on disk, and attempt to remedy the situation if not. | |
2617 ;; Signal an error if we can't make them the same, or the user doesn't want | |
2618 ;; to do what is necessary to make them the same. | |
2619 ;; If file has file handlers (indicated by the optional arg), then we | |
2620 ;; offer to instead of saving. This is one difference with Emerge. | |
2621 ;; Another is that we always offer to revert obsolete files, whether they | |
2622 ;; are modified or not. | |
2623 (defun ediff-verify-file-buffer (&optional file-magic) | |
2624 ;; First check if the file has been modified since the buffer visited it. | |
2625 (if (verify-visited-file-modtime (current-buffer)) | |
2626 (if (buffer-modified-p) | |
2627 ;; If buffer is not obsolete and is modified, offer to save | |
2628 (if (yes-or-no-p | |
2629 (format "Buffer out of sync with visited file. %s file %s? " | |
2630 (if file-magic "Revert" "Save") | |
2631 buffer-file-name)) | |
2632 (if (not file-magic) | |
2633 (save-buffer) | |
2634 ;; for some reason, file-name-handlers append instead of | |
2635 ;; replacing, so we have to erase first. | |
2636 (erase-buffer) | |
2637 (revert-buffer t t)) | |
2638 (error "Buffer out of sync for file %s" buffer-file-name)) | |
2639 ;; If buffer is not obsolete and is not modified, do nothing | |
2640 nil) | |
2641 ;; If buffer is obsolete, offer to revert | |
2642 (if (yes-or-no-p | |
2643 (format "Buffer out of sync with visited file. Revert file %s? " | |
2644 buffer-file-name)) | |
2645 (progn | |
2646 (if file-magic | |
2647 (erase-buffer)) | |
2648 (revert-buffer t t)) | |
2649 (error "Buffer out of sync for file %s" buffer-file-name)))) | |
2650 | |
2651 | |
2652 | |
2653 ;; It would be nice to use these two functions as hooks instead of | |
2654 ;; ediff-insert-in-front and ediff-move-disturbed-overlays. | |
2655 ;; However, Emacs has a bug that causes BEG and END, below, to be | |
2656 ;; the same, i.e., the end of inserted text is not passed correctly. | |
2657 ;; Since the overlay doesn't move when these hooks run, | |
2658 ;; there is no way to correctly determine the new (desired) position of | |
2659 ;; the overlay end. | |
2660 ;; Either this bug is fixed, or (better) use sticky overlays when they will | |
2661 ;; be implemented in Emacs, like they are in XEmacs. | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2662 ;;(defun ediff-capture-inserts-in-front (overl flag beg end &optional len) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2663 ;; (if (and flag (ediff-overlay-get overl 'ediff-diff-num)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2664 ;; (ediff-move-overlay overl beg (ediff-overlay-end overl)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2665 ;; )) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2666 ;; |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2667 ;;(defun ediff-capture-inserts-behind (overl flag beg end &optional len) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2668 ;; (if (and flag (ediff-overlay-get overl 'ediff-diff-num)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2669 ;; (ediff-move-overlay overl (ediff-overlay-start overl) (point)) |
11042 | 2670 ;; )) |
2671 | |
2672 ;; to be deleted in due time | |
2673 ;; Capture overlays that had insertions in the front. | |
2674 ;; Called when overlay OVERL gets insertion in front. | |
2675 (defun ediff-insert-in-front (overl &optional flag beg end length) | |
2676 (if (ediff-overlay-get overl 'ediff-diff-num) | |
2677 (setq ediff-disturbed-overlays | |
2678 (cons overl ediff-disturbed-overlays)))) | |
2679 | |
2680 | |
2681 ;; to be deleted in due time | |
2682 ;; We can't move overlays directly in insert-in-front-hooks | |
2683 ;; because when diff is highlighted with ascii flags, they will disturb | |
2684 ;; overlays and so they will be included in them, which we don't want. | |
2685 (defun ediff-move-disturbed-overlays (posn) | |
2686 (mapcar (function (lambda (overl) | |
2687 (ediff-move-overlay overl | |
2688 posn | |
2689 (ediff-overlay-end overl)) | |
2690 )) | |
2691 ediff-disturbed-overlays) | |
2692 (setq ediff-disturbed-overlays nil)) | |
2693 | |
2694 | |
2695 (defun ediff-save-buffer (arg) | |
2696 "Safe way of saving buffers A, B, C, and the diff output. | |
2697 `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
|
2698 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
|
2699 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2700 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
|
2701 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
|
2702 \(and plain output, if customized output was not generated\)." |
11042 | 2703 (interactive "P") |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2704 (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
|
2705 (ediff-compute-custom-diffs-maybe) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2706 (ediff-eval-in-buffer |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2707 (cond ((memq last-command-char '(?a ?b ?c)) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2708 (ediff-get-buffer |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2709 (ediff-char-to-buftype last-command-char))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2710 ((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
|
2711 (message "Saving diff output ...") |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2712 (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
|
2713 (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
|
2714 ediff-diff-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2715 ((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
|
2716 ediff-custom-diff-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2717 ((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
|
2718 ediff-diff-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2719 (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
|
2720 ) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2721 (save-buffer))) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2722 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2723 (defun ediff-compute-custom-diffs-maybe () |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2724 (or ediff-3way-job |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2725 (let ((file-A (ediff-make-temp-file ediff-buffer-A)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2726 (file-B (ediff-make-temp-file ediff-buffer-B))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2727 (or (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
|
2728 (setq ediff-custom-diff-buffer |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2729 (get-buffer-create |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2730 (ediff-unique-buffer-name "*ediff-custom-diff" "*")))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2731 (ediff-exec-process |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2732 ediff-custom-diff-program ediff-custom-diff-buffer 'synchronize |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2733 ediff-custom-diff-options file-A file-B)))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2734 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2735 (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
|
2736 (interactive "P") |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2737 (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
|
2738 (ediff-compute-custom-diffs-maybe) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2739 (save-excursion |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2740 (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
|
2741 (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
|
2742 ediff-diff-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2743 ((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
|
2744 ediff-custom-diff-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2745 ((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
|
2746 ediff-diff-buffer) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2747 (t |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2748 (beep) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2749 (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
|
2750 nil)))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2751 (if buf |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2752 (progn |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2753 (ediff-eval-in-buffer buf |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2754 (goto-char (point-min))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2755 (switch-to-buffer buf) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2756 (raise-frame (selected-frame))))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2757 (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
|
2758 (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
|
2759 (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
|
2760 (select-window ediff-control-window))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2761 |
11042 | 2762 |
2763 | |
2764 ;; will simplify it in due time, when emacs acquires before/after strings | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2765 (defun ediff-remove-flags-from-buffer (buffer overlay) |
11042 | 2766 (ediff-eval-in-buffer buffer |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2767 (let ((inhibit-read-only t)) |
11042 | 2768 (if ediff-xemacs-p |
2769 (ediff-overlay-put overlay 'begin-glyph nil) | |
2770 ;; before-string is not yet implemented in emacs. | |
2771 ;; when it will be, I will be able to delete much of the rest of | |
2772 ;; this function | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2773 (ediff-overlay-put overlay 'before-string nil)) |
11042 | 2774 |
2775 (if ediff-xemacs-p | |
2776 (ediff-overlay-put overlay 'end-glyph nil) | |
2777 ;; after-string is not yet implemented in emacs. | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2778 (ediff-overlay-put overlay 'after-string nil)) |
11042 | 2779 ))) |
2780 | |
2781 | |
2782 | |
2783 ;; will simplify it in due time, when emacs acquires before/after strings | |
2784 (defun ediff-place-flags-in-buffer (buf-type buffer ctl-buffer diff) | |
2785 (ediff-eval-in-buffer buffer | |
2786 (ediff-place-flags-in-buffer1 buf-type ctl-buffer diff))) | |
2787 | |
2788 | |
2789 (defun ediff-place-flags-in-buffer1 (buf-type ctl-buffer diff-no) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2790 (let* ((curr-overl (ediff-eval-in-buffer ctl-buffer |
11042 | 2791 (ediff-get-diff-overlay diff-no buf-type))) |
2792 (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
|
2793 after beg-of-line flag) |
11042 | 2794 |
2795 ;; insert flag before the difference | |
2796 (goto-char before) | |
2797 (setq beg-of-line (bolp)) | |
2798 | |
2799 (setq flag (ediff-eval-in-buffer ctl-buffer | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2800 (if (eq ediff-highlighting-style 'ascii) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2801 (if beg-of-line |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2802 ediff-before-flag-bol ediff-before-flag-mol)))) |
11042 | 2803 |
2804 ;; insert the flag itself | |
2805 (if ediff-xemacs-p | |
2806 (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
|
2807 (ediff-overlay-put curr-overl 'before-string flag)) |
11042 | 2808 |
2809 ;; insert the flag after the difference | |
2810 ;; `after' must be set here, after the before-flag was inserted | |
2811 (setq after (ediff-get-diff-posn buf-type 'end diff-no ctl-buffer)) | |
2812 (goto-char after) | |
2813 (setq beg-of-line (bolp)) | |
2814 | |
2815 (setq flag (ediff-eval-in-buffer ctl-buffer | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2816 (if (eq ediff-highlighting-style 'ascii) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2817 (if beg-of-line |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2818 ediff-after-flag-eol ediff-after-flag-mol)))) |
11042 | 2819 |
2820 ;; insert the flag itself | |
2821 (if ediff-xemacs-p | |
2822 (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
|
2823 (ediff-overlay-put curr-overl 'after-string flag)) |
11042 | 2824 )) |
2825 | |
2826 | |
2827 (defun ediff-get-diff-posn (buf-type pos &optional n control-buf) | |
2828 "Returns positions of difference sectors in the BUF-TYPE buffer. | |
2829 BUF-TYPE should be a symbol--either `A' or `B'. | |
2830 POS is either `beg' or `end'--it specifies whether you want the position at the | |
2831 beginning of a difference or at the end. | |
2832 | |
2833 The optional argument N says which difference \(default: | |
2834 `ediff-current-difference'\). The optional argument CONTROL-BUF says | |
2835 which control buffer is in effect in case it is not the current | |
2836 buffer." | |
2837 (let (diff-overlay) | |
2838 (or control-buf | |
2839 (setq control-buf (current-buffer))) | |
2840 | |
2841 (ediff-eval-in-buffer control-buf | |
2842 (or n (setq n ediff-current-difference)) | |
2843 (if (or (< n 0) (>= n ediff-number-of-differences)) | |
2844 (if (> ediff-number-of-differences 0) | |
2845 (error "There is no diff %d. Valid diffs are 1 to %d" | |
2846 (1+ n) ediff-number-of-differences) | |
2847 (error "No differences found"))) | |
2848 (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
|
2849 (if (not (ediff-buffer-live-p (ediff-overlay-buffer diff-overlay))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2850 (error |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2851 "You have killed an essential Ediff buffer---Please exit Ediff")) |
11042 | 2852 (if (eq pos 'beg) |
2853 (ediff-overlay-start diff-overlay) | |
2854 (ediff-overlay-end diff-overlay)) | |
2855 )) | |
2856 | |
2857 | |
2858 | |
2859 (defun ediff-highlight-diff-in-one-buffer (n buf-type) | |
2860 (if (ediff-buffer-live-p (ediff-get-buffer buf-type)) | |
2861 (let* ((buff (ediff-get-buffer buf-type)) | |
2862 (last (ediff-eval-in-buffer buff (point-max))) | |
2863 (begin (ediff-get-diff-posn buf-type 'beg n)) | |
2864 (end (ediff-get-diff-posn buf-type 'end n)) | |
2865 (xtra (if (equal begin end) 1 0)) | |
2866 (end-hilit (min last (+ end xtra))) | |
2867 (current-diff-overlay | |
2868 (symbol-value | |
2869 (intern (format "ediff-current-diff-overlay-%S" buf-type)))) | |
2870 ) | |
2871 | |
2872 (if ediff-xemacs-p | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2873 (ediff-move-overlay current-diff-overlay begin end-hilit) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2874 (ediff-move-overlay current-diff-overlay begin end-hilit buff)) |
11042 | 2875 ;; giving priority of 0 and then changing it may look funny, but |
2876 ;; this overcomes an obscure Emacs bug. | |
2877 (ediff-overlay-put current-diff-overlay 'priority 0) | |
2878 (ediff-overlay-put current-diff-overlay 'priority | |
2879 (ediff-highest-priority begin end-hilit buff)) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2880 (ediff-overlay-put current-diff-overlay 'ediff-diff-num n) |
11042 | 2881 |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2882 ;; unhighlight the background overlay for diff n so it won't |
11042 | 2883 ;; interfere with the current diff overlay |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2884 (ediff-set-overlay-face (ediff-get-diff-overlay n buf-type) nil) |
11042 | 2885 ))) |
2886 | |
2887 | |
2888 (defun ediff-unhighlight-diff-in-one-buffer (buf-type) | |
2889 (if (ediff-buffer-live-p (ediff-get-buffer buf-type)) | |
2890 (let ((current-diff-overlay | |
2891 (symbol-value | |
2892 (intern (format "ediff-current-diff-overlay-%S" buf-type)))) | |
2893 (overlay | |
2894 (ediff-get-diff-overlay ediff-current-difference buf-type)) | |
2895 ) | |
2896 | |
2897 (ediff-move-overlay current-diff-overlay 1 1) | |
2898 | |
2899 ;; rehighlight the overlay in the background of the | |
2900 ;; current difference region | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2901 (ediff-set-overlay-face |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2902 overlay |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2903 (if (and (ediff-window-display-p) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2904 ediff-use-faces ediff-highlight-all-diffs) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2905 (ediff-background-face buf-type ediff-current-difference))) |
11042 | 2906 ))) |
2907 | |
2908 (defun ediff-unhighlight-diffs-totally-in-one-buffer (buf-type) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2909 (ediff-unselect-and-select-difference -1) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2910 (if (and (ediff-window-display-p) ediff-use-faces) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2911 (let* ((inhibit-quit t) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2912 (current-diff-overlay-var |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2913 (intern (format "ediff-current-diff-overlay-%S" buf-type))) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2914 (current-diff-overlay (symbol-value current-diff-overlay-var))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2915 (ediff-color-background-regions 'unhighlight) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2916 (if (ediff-overlayp current-diff-overlay) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2917 (ediff-delete-overlay current-diff-overlay)) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2918 (set current-diff-overlay-var nil) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2919 ))) |
11042 | 2920 |
2921 | |
2922 ;; null out difference overlays so they won't slow down future | |
2923 ;; editing operations | |
2924 ;; VEC is either a difference vector or a fine-diff vector | |
2925 (defun ediff-clear-diff-vector (vec-var &optional fine-diffs-also) | |
2926 (if (vectorp (symbol-value vec-var)) | |
2927 (mapcar (function | |
2928 (lambda (elt) | |
2929 (ediff-delete-overlay | |
2930 (ediff-get-diff-overlay-from-diff-record elt)) | |
2931 (if fine-diffs-also | |
2932 (ediff-clear-fine-diff-vector elt)) | |
2933 )) | |
2934 (symbol-value vec-var))) | |
2935 ;; allow them to be garbage collected | |
2936 (set vec-var nil)) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2937 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2938 (defun ediff-color-background-regions (&optional unhighlight) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2939 (ediff-color-background-regions-in-one-buffer |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2940 'A unhighlight) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2941 (ediff-color-background-regions-in-one-buffer |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2942 'B unhighlight) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2943 (ediff-color-background-regions-in-one-buffer |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2944 'C unhighlight) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2945 (ediff-color-background-regions-in-one-buffer |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2946 'Ancestor unhighlight)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2947 |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2948 (defun ediff-color-background-regions-in-one-buffer (buf-type unhighlight) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2949 (let ((diff-vector |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2950 (eval (intern (format "ediff-difference-vector-%S" buf-type)))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2951 overl diff-num) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2952 (mapcar (function |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2953 (lambda (rec) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2954 (setq overl (ediff-get-diff-overlay-from-diff-record rec) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2955 diff-num (ediff-overlay-get overl 'ediff-diff-num)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2956 (ediff-set-overlay-face |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2957 overl |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2958 (if (not unhighlight) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2959 (ediff-background-face buf-type diff-num)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2960 ))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
2961 diff-vector))) |
11042 | 2962 |
2963 | |
2964 ;;; Misc | |
2965 | |
14040 | 2966 ;; These two functions are here to neutralize XEmacs's unwillingness to |
11042 | 2967 ;; handle overlays whose buffers were deleted. |
2968 (defun ediff-move-overlay (overlay beg end &optional buffer) | |
2969 "Calls `move-overlay' in Emacs and `set-extent-endpoints' in Lemacs. | |
2970 Checks if overlay's buffer exists before actually doing the move." | |
2971 (let ((buf (and overlay (ediff-overlay-buffer overlay)))) | |
2972 (if (ediff-buffer-live-p buf) | |
2973 (if ediff-xemacs-p | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
2974 (set-extent-endpoints overlay beg end) |
11042 | 2975 (move-overlay overlay beg end buffer)) |
2976 ;; buffer's dead | |
2977 (if overlay | |
2978 (ediff-delete-overlay overlay))))) | |
2979 | |
2980 (defun ediff-overlay-put (overlay prop value) | |
2981 "Calls `overlay-put' or `set-extent-property' depending on Emacs version. | |
2982 Checks if overlay's buffer exists." | |
2983 (if (ediff-buffer-live-p (ediff-overlay-buffer overlay)) | |
2984 (if ediff-xemacs-p | |
2985 (set-extent-property overlay prop value) | |
2986 (overlay-put overlay prop value)) | |
2987 (ediff-delete-overlay overlay))) | |
2988 | |
2989 | |
2990 ;; In Emacs, this just makes overlay. In the future, when Emacs will start | |
2991 ;; supporting sticky overlays, this function will make a sticky overlay. | |
2992 ;; BEG and END are expressions telling where overlay starts. | |
2993 ;; If they are numbers or buffers, then all is well. Otherwise, they must | |
2994 ;; be expressions to be evaluated in buffer BUF in order to get the overlay | |
2995 ;; bounds. | |
2996 ;; If BUFF is not a live buffer, then return nil; otherwise, return the | |
2997 ;; newly created overlay. | |
2998 (defun ediff-make-bullet-proof-overlay (beg end buff) | |
2999 (if (ediff-buffer-live-p buff) | |
3000 (let (overl) | |
3001 (ediff-eval-in-buffer buff | |
3002 (or (number-or-marker-p beg) | |
3003 (setq beg (eval beg))) | |
3004 (or (number-or-marker-p end) | |
3005 (setq end (eval end))) | |
3006 (setq overl (ediff-make-overlay beg end buff)) | |
3007 | |
3008 (if ediff-xemacs-p | |
3009 (progn | |
3010 ;; take precautions against detached extents | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3011 (ediff-overlay-put overl 'detachable nil) |
11042 | 3012 ;; chars inserted at both ends will be inside extent |
3013 (ediff-overlay-put overl 'start-open nil) | |
3014 (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
|
3015 (ediff-overlay-put overl 'evaporate nil) ; don't detach |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3016 ;; doesn't work since emacs buggily doesn't call these functions |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3017 ;; after the change |
11042 | 3018 ;;(ediff-overlay-put overl 'insert-in-front-hooks |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3019 ;; '(ediff-capture-inserts-in-front)) |
11042 | 3020 ;;(ediff-overlay-put overl 'insert-behind-hooks |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3021 ;; '(ediff-capture-inserts-behind)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3022 |
11042 | 3023 ;; These two are not yet implemented in Emacs |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3024 (ediff-overlay-put overl 'rear-sticky t) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3025 (ediff-overlay-put overl 'front-sticky t) |
11042 | 3026 ) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3027 (ediff-overlay-put overl 'ediff-diff-num 0) |
11042 | 3028 overl)))) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3029 |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3030 (defsubst ediff-overlay-start (overl) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3031 (if (ediff-overlayp overl) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3032 (if ediff-emacs-p |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3033 (overlay-start overl) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3034 (extent-start-position overl)))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3035 |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3036 (defsubst ediff-overlay-end (overl) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3037 (if (ediff-overlayp overl) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3038 (if ediff-emacs-p |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3039 (overlay-end overl) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3040 (extent-end-position overl)))) |
11042 | 3041 |
3042 | |
3043 ;; Like other-buffer, but prefers visible buffers and ignores temporary or | |
3044 ;; other insignificant buffers (those beginning with "^[ *]"). | |
3045 ;; Gets one arg--buffer name or a list of buffer names (it won't return | |
3046 ;; these buffers). | |
3047 (defun ediff-other-buffer (buff) | |
3048 (if (not (listp buff)) (setq buff (list buff))) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3049 (let* ((frame-buffers (buffer-list)) |
11042 | 3050 (significant-buffers |
3051 (mapcar | |
3052 (function (lambda (x) | |
3053 (cond ((member (buffer-name x) buff) | |
3054 nil) | |
3055 ((not (ediff-get-visible-buffer-window x)) | |
3056 nil) | |
3057 ((string-match "^ " (buffer-name x)) | |
3058 nil) | |
3059 (t x)))) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3060 frame-buffers)) |
11042 | 3061 (buffers (delq nil significant-buffers)) |
3062 less-significant-buffers) | |
3063 | |
3064 (cond (buffers (car buffers)) | |
3065 ;; try also buffers that are not displayed in windows | |
3066 ((setq less-significant-buffers | |
3067 (delq nil | |
3068 (mapcar | |
3069 (function | |
3070 (lambda (x) | |
3071 (cond ((member (buffer-name x) buff) nil) | |
3072 ((string-match "^[ *]" (buffer-name x)) nil) | |
3073 (t x)))) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3074 frame-buffers))) |
11042 | 3075 (car less-significant-buffers)) |
3076 (t (other-buffer (current-buffer)))) | |
3077 )) | |
3078 | |
3079 | |
3080 ;; Construct a unique buffer name. | |
3081 ;; The first one tried is prefixsuffix, then prefix<2>suffix, | |
3082 ;; prefix<3>suffix, etc. | |
3083 (defun ediff-unique-buffer-name (prefix suffix) | |
3084 (if (null (get-buffer (concat prefix suffix))) | |
3085 (concat prefix suffix) | |
3086 (let ((n 2)) | |
3087 (while (get-buffer (format "%s<%d>%s" prefix n suffix)) | |
3088 (setq n (1+ n))) | |
3089 (format "%s<%d>%s" prefix n suffix)))) | |
3090 | |
3091 | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3092 ;; splits at a white space, returns a list |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3093 (defun ediff-split-string (string) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3094 (let ((start 0) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3095 (result '()) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3096 substr) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3097 (while (string-match "[ \t]+" string start) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3098 (let ((match (string-match "[ \t]+" string start))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3099 (setq substr (substring string start match)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3100 (if (> (length substr) 0) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3101 (setq result (cons substr result))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3102 (setq start (match-end 0)))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3103 (setq substr (substring string start nil)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3104 (if (> (length substr) 0) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3105 (setq result (cons substr result))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3106 (nreverse result))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3107 |
11042 | 3108 (defun ediff-submit-report () |
3109 "Submit bug report on Ediff." | |
3110 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3111 (ediff-barf-if-not-control-buffer) |
11042 | 3112 (let ((reporter-prompt-for-summary-p t) |
3113 (ctl-buf ediff-control-buffer) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3114 (ediff-device-type (ediff-device-type)) |
11042 | 3115 varlist salutation buffer-name) |
3116 (setq varlist '(ediff-diff-program ediff-diff-options | |
3117 ediff-patch-program ediff-patch-options | |
3118 ediff-shell | |
3119 ediff-use-faces | |
3120 ediff-auto-refine ediff-highlighting-style | |
3121 ediff-buffer-A ediff-buffer-B ediff-control-buffer | |
3122 ediff-forward-word-function | |
3123 ediff-control-frame | |
3124 ediff-control-frame-parameters | |
3125 ediff-control-frame-position-function | |
3126 ediff-prefer-iconified-control-frame | |
3127 ediff-window-setup-function | |
3128 ediff-split-window-function | |
3129 ediff-job-name | |
3130 ediff-word-mode | |
3131 buffer-name | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3132 ediff-device-type |
11042 | 3133 )) |
3134 (setq salutation " | |
3135 Congratulations! You may have unearthed a bug in Ediff! | |
3136 | |
3137 Please make a concise and accurate summary of what happened | |
3138 and mail it to the address above. | |
3139 ----------------------------------------------------------- | |
3140 ") | |
3141 | |
3142 (ediff-skip-unsuitable-frames) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3143 (ediff-reset-mouse) |
11042 | 3144 |
3145 (switch-to-buffer ediff-msg-buffer) | |
3146 (erase-buffer) | |
3147 (delete-other-windows) | |
3148 (insert " | |
3149 Please read this first: | |
3150 ---------------------- | |
3151 | |
3152 Some ``bugs'' may actually be no bugs at all. For instance, if you are | |
3153 reporting that certain difference regions are not matched as you think they | |
3154 should, this is most likely due to the way Unix diff program decides what | |
3155 constitutes a difference region. Ediff is an Emacs interface to diff, and | |
3156 it has nothing to do with those decisions---it only takes the output from | |
3157 diff and presents it in a way that is better suited for human browsing and | |
3158 manipulation. | |
3159 | |
3160 If Emacs happens to dump core, this is NOT an Ediff problem---it is | |
3161 an Emacs bug. Report this to Emacs maintainers. | |
3162 | |
3163 Another popular topic for reports is compilation messages. Because Ediff | |
3164 interfaces to several other packages and runs under Emacs and XEmacs, | |
3165 byte-compilation may produce output like this: | |
3166 | |
3167 While compiling toplevel forms in file ediff.el: | |
3168 ** reference to free variable pm-color-alist | |
3169 ........................ | |
3170 While compiling the end of the data: | |
3171 ** 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
|
3172 ediff-valid-color-p, ediff-set-face, |
11042 | 3173 ........................ |
3174 | |
3175 These are NOT errors, but inevitable warnings, which ought to be ignored. | |
3176 | |
3177 Please do not report those and similar things. However, comments and | |
3178 suggestions are always welcome. | |
3179 | |
3180 Mail anyway? (y or n) ") | |
3181 | |
3182 (if (y-or-n-p "Mail anyway? ") | |
3183 (progn | |
3184 (if (ediff-buffer-live-p ctl-buf) | |
3185 (set-buffer ctl-buf)) | |
3186 (setq buffer-name (buffer-name)) | |
3187 (require 'reporter) | |
3188 (reporter-submit-bug-report "kifer@cs.sunysb.edu" | |
3189 (ediff-version) | |
3190 varlist | |
3191 nil | |
3192 'delete-other-windows | |
3193 salutation)) | |
3194 (bury-buffer) | |
3195 (beep 1)(message "Bug report aborted") | |
3196 (if (ediff-buffer-live-p ctl-buf) | |
3197 (ediff-eval-in-buffer ctl-buf | |
3198 (ediff-recenter 'no-rehighlight)))) | |
3199 )) | |
3200 | |
3201 | |
3202 (defun ediff-deactivate-mark () | |
3203 (if ediff-xemacs-p | |
3204 (zmacs-deactivate-region) | |
3205 (deactivate-mark))) | |
3206 | |
3207 (cond ((fboundp 'nuke-selective-display) | |
3208 ;; XEmacs 19.12 has nuke-selective-display | |
3209 (fset 'ediff-nuke-selective-display 'nuke-selective-display)) | |
3210 (t | |
3211 (defun ediff-nuke-selective-display () | |
3212 (save-excursion | |
3213 (save-restriction | |
3214 (widen) | |
3215 (goto-char (point-min)) | |
3216 (let ((mod-p (buffer-modified-p)) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3217 buffer-read-only end) |
11042 | 3218 (and (eq t selective-display) |
3219 (while (search-forward "\^M" nil t) | |
3220 (end-of-line) | |
3221 (setq end (point)) | |
3222 (beginning-of-line) | |
3223 (while (search-forward "\^M" end t) | |
3224 (delete-char -1) | |
3225 (insert "\^J")))) | |
3226 (set-buffer-modified-p mod-p) | |
3227 (setq selective-display nil))))) | |
3228 )) | |
3229 | |
3230 | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3231 ;; The next two are modified versions from emerge.el. |
11042 | 3232 ;; VARS must be a list of symbols |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3233 ;; 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
|
3234 (defsubst ediff-save-variables (vars) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3235 (mapcar (function (lambda (v) (cons v (symbol-value v)))) |
11042 | 3236 vars)) |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3237 ;; VARS is a list of variable symbols. |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3238 (defun ediff-restore-variables (vars assoc-list) |
11042 | 3239 (while vars |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3240 (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
|
3241 (setq vars (cdr vars)))) |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3242 |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3243 (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
|
3244 (let* ((assoc-list |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3245 (symbol-value (intern |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3246 (concat "ediff-buffer-values-orig-" |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3247 (symbol-name buf-type))))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3248 (assoc-elt (assoc var assoc-list))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3249 (if assoc-elt |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3250 (setcdr assoc-elt value)))) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3251 |
11042 | 3252 |
3253 ;; must execute in control buf | |
3254 (defun ediff-save-protected-variables () | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3255 (setq ediff-buffer-values-orig-A |
11042 | 3256 (ediff-eval-in-buffer ediff-buffer-A |
3257 (ediff-save-variables ediff-protected-variables))) | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3258 (setq ediff-buffer-values-orig-B |
11042 | 3259 (ediff-eval-in-buffer ediff-buffer-B |
3260 (ediff-save-variables ediff-protected-variables))) | |
3261 (if ediff-3way-comparison-job | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3262 (setq ediff-buffer-values-orig-C |
11042 | 3263 (ediff-eval-in-buffer ediff-buffer-C |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3264 (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
|
3265 (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
|
3266 (setq ediff-buffer-values-orig-Ancestor |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3267 (ediff-eval-in-buffer ediff-ancestor-buffer |
11042 | 3268 (ediff-save-variables ediff-protected-variables))))) |
3269 | |
3270 ;; must execute in control buf | |
3271 (defun ediff-restore-protected-variables () | |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3272 (let ((values-A ediff-buffer-values-orig-A) |
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3273 (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
|
3274 (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
|
3275 (values-Ancestor ediff-buffer-values-orig-Ancestor)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3276 (ediff-eval-in-buffer ediff-buffer-A |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3277 (ediff-restore-variables ediff-protected-variables values-A)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3278 (ediff-eval-in-buffer ediff-buffer-B |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3279 (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
|
3280 (if ediff-3way-comparison-job |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3281 (ediff-eval-in-buffer ediff-buffer-C |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3282 (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
|
3283 (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
|
3284 (ediff-eval-in-buffer ediff-ancestor-buffer |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3285 (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
|
3286 )) |
11042 | 3287 |
3288 | |
3289 ;;; Debug | |
3290 | |
3291 (ediff-defvar-local ediff-command-begin-time '(0 0 0) "") | |
3292 | |
3293 ;; calculate time used by command | |
3294 (defun ediff-calc-command-time () | |
3295 (let ((end (current-time)) | |
3296 micro sec) | |
3297 (setq micro | |
3298 (if (>= (nth 2 end) (nth 2 ediff-command-begin-time)) | |
3299 (- (nth 2 end) (nth 2 ediff-command-begin-time)) | |
3300 (+ (nth 2 end) (- 1000000 (nth 2 ediff-command-begin-time))))) | |
3301 (setq sec (- (nth 1 end) (nth 1 ediff-command-begin-time))) | |
3302 (or (equal ediff-command-begin-time '(0 0 0)) | |
3303 (message "Elapsed time: %d second(s) + %d microsecond(s)" sec micro)))) | |
3304 | |
3305 (defsubst ediff-save-time () | |
3306 (setq ediff-command-begin-time (current-time))) | |
3307 | |
3308 (defun ediff-profile () | |
3309 "Toggle profiling Ediff commands." | |
3310 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3311 (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
|
3312 (if ediff-emacs-p |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3313 (make-local-variable 'post-command-hook)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3314 (let ((pre-hook (if ediff-emacs-p 'pre-command-hook 'local-pre-command-hook)) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3315 (post-hook |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3316 (if ediff-emacs-p 'post-command-hook 'local-post-command-hook))) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3317 (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
|
3318 (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
|
3319 (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
|
3320 (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
|
3321 (message "Ediff profiling disabled")) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3322 (add-hook pre-hook 'ediff-save-time t) |
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3323 (add-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
|
3324 (message "Ediff profiling enabled")))) |
11042 | 3325 |
3326 (defun ediff-print-diff-vector (diff-vector-var) | |
3327 (princ (format "\n*** %S ***\n" diff-vector-var)) | |
3328 (mapcar (function | |
3329 (lambda (overl-vec) | |
3330 (princ | |
3331 (format | |
3332 "Diff %d: \tOverlay: %S | |
3333 \t\tFine diffs: %s | |
3334 \t\tNo-fine-diff-flag: %S | |
3335 \t\tState-of-diff:\t %S | |
3336 \t\tState-of-merge:\t %S | |
3337 " | |
3338 (1+ (ediff-overlay-get (aref overl-vec 0) 'ediff-diff-num)) | |
3339 (aref overl-vec 0) | |
3340 ;; fine-diff-vector | |
3341 (if (= (length (aref overl-vec 1)) 0) | |
3342 "none\n" | |
3343 (mapconcat 'prin1-to-string | |
3344 (aref overl-vec 1) "\n\t\t\t ")) | |
3345 (aref overl-vec 2) ; no fine diff flag | |
3346 (aref overl-vec 3) ; state-of-diff | |
3347 (aref overl-vec 4) ; state-of-merge | |
3348 )))) | |
3349 (eval diff-vector-var))) | |
3350 | |
3351 | |
3352 | |
3353 (defun ediff-debug-info () | |
3354 (interactive) | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3355 (ediff-barf-if-not-control-buffer) |
11042 | 3356 (with-output-to-temp-buffer ediff-debug-buffer |
3357 (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
|
3358 (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
|
3359 (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
|
3360 (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
|
3361 (ediff-print-diff-vector (intern "ediff-difference-vector-Ancestor")) |
11042 | 3362 )) |
3363 | |
3364 ;; don't report error if version control package wasn't found | |
3365 ;;(ediff-load-version-control 'silent) | |
3366 | |
13131
b0cb28b64a3c
(ediff-toggle-read-only,ediff-read-file-name):
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12932
diff
changeset
|
3367 (run-hooks 'ediff-load-hook) |
11042 | 3368 |
12085
589a32fa67a9
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11977
diff
changeset
|
3369 |
11042 | 3370 ;;; Local Variables: |
3371 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) | |
3372 ;;; eval: (put 'ediff-eval-in-buffer 'lisp-indent-hook 1) | |
3373 ;;; End: | |
3374 | |
3375 (provide 'ediff-util) | |
3376 | |
3377 ;;; ediff-util.el ends here |