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