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