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