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