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