Mercurial > emacs
annotate lisp/ediff-diff.el @ 13796:116a22176b36
(enable-flow-control-on): Try the whole TERM name
before trying to strip off words from the end.
author | Karl Heuer <kwzh@gnu.org> |
---|---|
date | Thu, 21 Dec 1995 17:43:20 +0000 |
parents | b9dc8cc658d5 |
children | 90c87743d3ba |
rev | line source |
---|---|
11042 | 1 ;;; ediff-diff.el --- diff-related utilities |
11234 | 2 ;;; Copyright (C) 1994, 1995 Free Software Foundation, Inc. |
11042 | 3 |
4 ;; Author: Michael Kifer <kifer@cs.sunysb.edu> | |
5 | |
6 ;; This file is part of GNU Emacs. | |
7 | |
8 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
9 ;; it under the terms of the GNU General Public License as published by | |
10 ;; the Free Software Foundation; either version 2, or (at your option) | |
11 ;; any later version. | |
12 | |
13 ;; GNU Emacs is distributed in the hope that it will be useful, | |
14 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
16 ;; GNU General Public License for more details. | |
17 | |
18 ;; You should have received a copy of the GNU General Public License | |
19 ;; along with GNU Emacs; see the file COPYING. If not, write to | |
20 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. | |
21 | |
22 (require 'ediff-init) | |
23 | |
24 | |
25 (defvar ediff-shell | |
26 (cond ((eq system-type 'emx) "cmd") ; OS/2 | |
27 ((memq system-type '(vax-vms axp-vms)) "*dcl*") ; VMS | |
28 (t "sh")) ; UNIX | |
29 "*The shell used to run diff and patch. If user's .profile or | |
30 .cshrc files are set up correctly, any shell will do. However, some people | |
31 set $prompt or other things incorrectly, which leads to undesirable output | |
32 messages. These may cause Ediff to fail. In such a case, set ediff-shell | |
33 to a shell that you are not using or, better, fix your shell's startup file.") | |
34 | |
35 | |
36 (defvar ediff-diff-program "diff" | |
37 "*Program to use for generating the differential of the two files.") | |
38 (defvar ediff-diff-options "" | |
39 "*Options to pass to `ediff-diff-program'. | |
40 If diff\(1\) is used as `ediff-diff-program', then the most useful options are | |
41 `-w', to ignore space, and `-i', to ignore case of letters. | |
42 At present, the option `-c' is ignored, since Ediff doesn't understand this | |
43 type of output.") | |
44 | |
45 (defvar ediff-custom-diff-program ediff-diff-program | |
46 "*Program to use for generating custom diff output for saving it in a file. | |
47 This output is not used by Ediff internally.") | |
48 (defvar ediff-custom-diff-options "-c" | |
49 "*Options to pass to `ediff-custom-diff-program'.") | |
50 | |
51 ;;; Support for diff3 | |
52 | |
53 (defvar ediff-match-diff3-line "^====\\(.?\\)$" | |
54 "Pattern to match lines produced by diff3 that describe differences.") | |
55 (defvar ediff-diff3-program "diff3" | |
56 "*Program to be used for three-way comparison. | |
57 Must produce output compatible with Unix's diff3 program.") | |
58 (defvar ediff-diff3-options "" | |
59 "*Options to pass to `ediff-diff3-program'.") | |
60 (defvar ediff-diff3-ok-lines-regexp | |
61 "^\\([1-3]:\\|====\\| \\|.*Warning *:\\|.*No newline\\|.*missing newline\\)" | |
62 "*Regexp that matches normal output lines from `ediff-diff3-program'. | |
63 Lines that do not match are assumed to be error messages.") | |
64 | |
65 ;; keeps the status of the current diff in 3-way jobs. | |
66 ;; the status can be =diff(A), =diff(B), or =diff(A+B) | |
67 (ediff-defvar-local ediff-diff-status "" "") | |
68 | |
69 ;; Support for patch | |
70 | |
71 (defvar ediff-patch-program "patch" | |
72 "*Name of the program that applies patches.") | |
73 (defvar ediff-patch-options "" | |
74 "*Options to pass to ediff-patch-program.") | |
75 | |
76 ;; The buffer of the patch file. | |
77 (defvar ediff-patch-buf nil) | |
78 ;; The buffer where patch would display its diagnostics. | |
79 (defvar ediff-patch-diagnostics nil) | |
80 | |
81 | |
82 ;;; Fine differences | |
83 | |
12086
19458e823866
Changed window-system to ediff-window-display.
Karl Heuer <kwzh@gnu.org>
parents:
11234
diff
changeset
|
84 (ediff-defvar-local ediff-auto-refine (if (ediff-window-display-p) 'on 'nix) |
11042 | 85 "If `on', Ediff auto-highlights fine diffs for the current diff region. |
86 If `off', auto-highlighting is not used. If `nix', no fine diffs are shown | |
87 at all, unless the user force-refines the region by hitting `*'. | |
88 | |
89 This variable can be set either in .emacs or toggled interactively. | |
90 Use `setq-default' if setting it in .emacs") | |
91 | |
92 (ediff-defvar-local ediff-ignore-similar-regions nil | |
93 "*If t, skip over difference regions that differ only in the white space and line breaks. | |
94 This variable can be set either in .emacs or toggled interactively. | |
95 Use `setq-default' if setting it in .emacs") | |
96 | |
97 (ediff-defvar-local ediff-auto-refine-limit 700 | |
98 "Auto-refine only those regions that are smaller than this number of bytes.") | |
99 | |
100 ;;; General | |
101 | |
102 (defvar ediff-diff-ok-lines-regexp | |
103 "^\\([0-9,]+[acd][0-9,]+$\\|[<>] \\|---\\|.*Warning *:\\|.*No newline\\|.*missing newline\\)" | |
104 "Regexp that matches normal output lines from `ediff-diff-program'. | |
105 This is mostly lifted from Emerge, except that Ediff also considers | |
106 warnings and `Missing newline'-type messages to be normal output. | |
107 Lines that do not match are assumed to be error messages.") | |
108 | |
109 (defvar ediff-match-diff-line (let ((x "\\([0-9]+\\)\\(\\|,\\([0-9]+\\)\\)")) | |
110 (concat "^" x "\\([acd]\\)" x "$")) | |
111 "Pattern to match lines produced by diff that describe differences.") | |
112 | |
113 (ediff-defvar-local ediff-setup-diff-regions-function nil | |
114 "value is a function symbol depending on the kind of job is to be done. | |
115 For 2-way jobs and for ediff-merge, it should be `ediff-setup-diff-regions'. | |
116 For jobs requiring diff3, it should be `ediff-setup-diff-regions3'. | |
117 | |
118 The function should take three mandatory arguments, file-A, file-B, and | |
119 file-C. It may ignore file C for diff2 jobs. It should also take | |
120 one optional arguments, diff-number to refine.") | |
121 | |
122 | |
123 ;;; Functions | |
124 | |
125 ;; Generate the difference vector and overlays for the two files | |
126 ;; With optional arg REG-TO-REFINE, refine this region. | |
127 ;; File-C argument is not used here. It is there just because | |
128 ;; ediff-setup-diff-regions is called via a funcall to | |
129 ;; ediff-setup-diff-regions-function, which can also have the value | |
130 ;; ediff-setup-diff-regions3, which takes 4 arguments. | |
131 (defun ediff-setup-diff-regions (file-A file-B file-C) | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
132 ;; Force all minibuffers to display ediff's messages. |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
133 ;; When xemacs implements minibufferless frames, this won't be necessary |
11042 | 134 (if ediff-xemacs-p (setq synchronize-minibuffers t)) |
135 | |
136 (or (ediff-buffer-live-p ediff-diff-buffer) | |
137 (setq ediff-diff-buffer | |
138 (get-buffer-create (ediff-unique-buffer-name "*ediff-diff" "*")))) | |
139 | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
140 (message "Computing differences ...") |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
141 (ediff-exec-process ediff-diff-program ediff-diff-buffer 'synchronize |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
142 ediff-diff-options file-A file-B) |
11042 | 143 |
144 (ediff-prepare-error-list ediff-diff-ok-lines-regexp ediff-diff-buffer) | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
145 ;;(message "Computing differences ... done") |
11042 | 146 (ediff-convert-diffs-to-overlays |
147 (ediff-extract-diffs | |
148 ediff-diff-buffer ediff-word-mode ediff-narrow-bounds)) | |
149 ) | |
150 | |
151 ;; If file-A/B/C is nil, do 2-way comparison with the non-nil buffers | |
152 ;; This function works for diff3 and diff2 jobs | |
153 (defun ediff-setup-fine-diff-regions (file-A file-B file-C reg-num) | |
154 (or (ediff-buffer-live-p ediff-fine-diff-buffer) | |
155 (setq ediff-fine-diff-buffer | |
156 (get-buffer-create | |
157 (ediff-unique-buffer-name "*ediff-fine-diff" "*")))) | |
158 | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
159 (let (diff3-job diff-program ok-regexp diff-list) |
11042 | 160 (setq diff3-job ediff-3way-job |
161 diff-program (if diff3-job ediff-diff3-program ediff-diff-program) | |
162 ok-regexp (if diff3-job | |
163 ediff-diff3-ok-lines-regexp | |
164 ediff-diff-ok-lines-regexp)) | |
165 | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
166 (ediff-message-if-verbose "Refining difference region %d ..." (1+ reg-num)) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
167 (ediff-exec-process diff-program ediff-fine-diff-buffer 'synchronize |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
168 ;; The shuffle below is because we can compare 3-way |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
169 ;; or in several 2-way fashions, like fA fC, fA fB, |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
170 ;; or fB fC. |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
171 (if file-A file-A file-B) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
172 (if file-B file-B file-A) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
173 (if diff3-job |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
174 (if file-C file-C file-B)) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
175 ) ; exec process |
11042 | 176 |
177 (ediff-prepare-error-list ok-regexp ediff-fine-diff-buffer) | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
178 ;;(ediff-message-if-verbose |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
179 ;; "Refining difference region %d ... done" (1+ reg-num)) |
11042 | 180 |
181 (setq diff-list | |
182 (if diff3-job | |
183 (ediff-extract-diffs3 | |
184 ediff-fine-diff-buffer '3way-comparison 'word-mode) | |
185 (ediff-extract-diffs ediff-fine-diff-buffer 'word-mode))) | |
186 ;; fixup diff-list | |
187 (if diff3-job | |
188 (cond ((not file-A) | |
189 (mapcar (function (lambda (elt) | |
190 (aset elt 0 nil) | |
191 (aset elt 1 nil))) | |
192 (cdr diff-list))) | |
193 ((not file-B) | |
194 (mapcar (function (lambda (elt) | |
195 (aset elt 2 nil) | |
196 (aset elt 3 nil))) | |
197 (cdr diff-list))) | |
198 ((not file-C) | |
199 (mapcar (function (lambda (elt) | |
200 (aset elt 4 nil) | |
201 (aset elt 5 nil))) | |
202 (cdr diff-list))) | |
203 )) | |
204 | |
205 (ediff-convert-fine-diffs-to-overlays diff-list reg-num) | |
206 )) | |
207 | |
208 | |
209 (defun ediff-prepare-error-list (ok-regexp diff-buff) | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
210 (or (ediff-buffer-live-p ediff-error-buffer) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
211 (setq ediff-error-buffer |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
212 (get-buffer-create (ediff-unique-buffer-name |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
213 "*ediff-errors" "*")))) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
214 (ediff-eval-in-buffer ediff-error-buffer |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
215 (erase-buffer) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
216 (insert (ediff-eval-in-buffer diff-buff (buffer-string))) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
217 (goto-char (point-min)) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
218 (delete-matching-lines ok-regexp) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
219 (if (memq system-type '(vax-vms axp-vms)) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
220 (delete-matching-lines "^$"))) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
221 ;; If diff reports errors, show them then quit. |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
222 (if (/= 0 (ediff-eval-in-buffer ediff-error-buffer (buffer-size))) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
223 (let ((ctl-buf ediff-control-buffer) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
224 (error-buf ediff-error-buffer)) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
225 (ediff-skip-unsuitable-frames) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
226 (switch-to-buffer error-buf) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
227 (ediff-kill-buffer-carefully ctl-buf) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
228 (error "Errors in diff output. Diff output is in %S" diff-buff)))) |
11042 | 229 |
230 ;; BOUNDS specifies visibility bounds to use. | |
231 ;; WORD-MODE tells whether we are in the word-mode or not. | |
232 ;; If WORD-MODE, also construct vector of diffs using word numbers. | |
233 ;; Else, use point values. | |
234 ;; This function handles diff-2 jobs including the case of | |
235 ;; merging buffers and files without ancestor. | |
236 (defun ediff-extract-diffs (diff-buffer word-mode &optional bounds) | |
237 (let ((A-buffer ediff-buffer-A) | |
238 (B-buffer ediff-buffer-B) | |
239 (C-buffer ediff-buffer-C) | |
240 (a-prev 1) ; this is needed to set the first diff line correctly | |
241 (b-prev 1) | |
242 (c-prev 1) | |
243 diff-list shift-A shift-B | |
244 ) | |
245 | |
246 ;; diff list contains word numbers, unless changed later | |
247 (setq diff-list (cons (if word-mode 'words 'points) | |
248 diff-list)) | |
249 ;; we don't use visibility bounds for buffer C when merging | |
250 (if bounds | |
251 (setq shift-A | |
252 (ediff-overlay-start | |
253 (ediff-get-value-according-to-buffer-type 'A bounds)) | |
254 shift-B | |
255 (ediff-overlay-start | |
256 (ediff-get-value-according-to-buffer-type 'B bounds)))) | |
257 | |
258 ;; reset point in buffers A/B/C | |
259 (ediff-eval-in-buffer A-buffer | |
260 (goto-char (if shift-A shift-A (point-min)))) | |
261 (ediff-eval-in-buffer B-buffer | |
262 (goto-char (if shift-B shift-B (point-min)))) | |
263 (if (ediff-buffer-live-p C-buffer) | |
264 (ediff-eval-in-buffer C-buffer | |
265 (goto-char (point-min)))) | |
266 | |
267 (ediff-eval-in-buffer diff-buffer | |
268 (goto-char (point-min)) | |
269 (while (re-search-forward ediff-match-diff-line nil t) | |
270 (let* ((a-begin (string-to-int (buffer-substring (match-beginning 1) | |
271 (match-end 1)))) | |
272 (a-end (let ((b (match-beginning 3)) | |
273 (e (match-end 3))) | |
274 (if b | |
275 (string-to-int (buffer-substring b e)) | |
276 a-begin))) | |
277 (diff-type (buffer-substring (match-beginning 4) (match-end 4))) | |
278 (b-begin (string-to-int (buffer-substring (match-beginning 5) | |
279 (match-end 5)))) | |
280 (b-end (let ((b (match-beginning 7)) | |
281 (e (match-end 7))) | |
282 (if b | |
283 (string-to-int (buffer-substring b e)) | |
284 b-begin))) | |
285 a-begin-pt a-end-pt b-begin-pt b-end-pt | |
286 c-begin c-end c-begin-pt c-end-pt) | |
287 ;; fix the beginning and end numbers, because diff is somewhat | |
288 ;; strange about how it numbers lines | |
289 (if (string-equal diff-type "a") | |
290 (setq b-end (1+ b-end) | |
291 a-begin (1+ a-begin) | |
292 a-end a-begin) | |
293 (if (string-equal diff-type "d") | |
294 (setq a-end (1+ a-end) | |
295 b-begin (1+ b-begin) | |
296 b-end b-begin) | |
297 ;; (string-equal diff-type "c") | |
298 (setq a-end (1+ a-end) | |
299 b-end (1+ b-end)))) | |
300 | |
301 (if (eq ediff-default-variant 'default-B) | |
302 (setq c-begin b-begin | |
303 c-end b-end) | |
304 (setq c-begin a-begin | |
305 c-end a-end)) | |
306 | |
307 ;; compute main diff vector | |
308 (if word-mode | |
309 ;; make diff-list contain word numbers | |
310 (setq diff-list | |
311 (nconc diff-list | |
312 (list | |
313 (if (ediff-buffer-live-p C-buffer) | |
314 (vector (- a-begin a-prev) (- a-end a-begin) | |
315 (- b-begin b-prev) (- b-end b-begin) | |
316 (- c-begin c-prev) (- c-end c-begin) | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
317 nil nil ; dummy ancestor |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
318 nil ; state of diff |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
319 nil ; state of merge |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
320 nil ; state of ancestor |
11042 | 321 ) |
322 (vector (- a-begin a-prev) (- a-end a-begin) | |
323 (- b-begin b-prev) (- b-end b-begin) | |
324 nil nil ; dummy buf C | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
325 nil nil ; dummy ancestor |
11042 | 326 nil ; state of diff |
327 nil ; state of merge | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
328 nil ; state of ancestor |
11042 | 329 )) |
330 )) | |
331 a-prev a-end | |
332 b-prev b-end | |
333 c-prev c-end) | |
334 ;; else convert lines to points | |
335 (ediff-eval-in-buffer A-buffer | |
336 (forward-line (- a-begin a-prev)) | |
337 (setq a-begin-pt (point)) | |
338 (forward-line (- a-end a-begin)) | |
339 (setq a-end-pt (point) | |
340 a-prev a-end)) | |
341 (ediff-eval-in-buffer B-buffer | |
342 (forward-line (- b-begin b-prev)) | |
343 (setq b-begin-pt (point)) | |
344 (forward-line (- b-end b-begin)) | |
345 (setq b-end-pt (point) | |
346 b-prev b-end)) | |
347 (if (ediff-buffer-live-p C-buffer) | |
348 (ediff-eval-in-buffer C-buffer | |
349 (forward-line (- c-begin c-prev)) | |
350 (setq c-begin-pt (point)) | |
351 (forward-line (- c-end c-begin)) | |
352 (setq c-end-pt (point) | |
353 c-prev c-end))) | |
354 (setq diff-list | |
355 (nconc | |
356 diff-list | |
357 (list | |
358 (if (ediff-buffer-live-p C-buffer) | |
359 (vector | |
360 a-begin-pt a-end-pt b-begin-pt b-end-pt | |
361 c-begin-pt c-end-pt | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
362 nil nil ; dummy ancestor |
11042 | 363 ;; state of diff |
364 ;; shows which buff is different from the other two | |
365 (if (eq ediff-default-variant 'default-B) 'A 'B) | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
366 ediff-default-variant ; state of merge |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
367 nil ; state of ancestor |
11042 | 368 ) |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
369 (vector a-begin-pt a-end-pt |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
370 b-begin-pt b-end-pt |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
371 nil nil ; dummy buf C |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
372 nil nil ; dummy ancestor |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
373 nil nil ; dummy state of diff & merge |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
374 nil ; dummy state of ancestor |
11042 | 375 ))) |
376 ))) | |
377 | |
378 ))) ; end ediff-eval-in-buffer | |
379 diff-list | |
380 )) | |
381 | |
382 | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
383 (defun ediff-convert-diffs-to-overlays (diff-list) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
384 (ediff-set-diff-overlays-in-one-buffer 'A diff-list) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
385 (ediff-set-diff-overlays-in-one-buffer 'B diff-list) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
386 (if ediff-3way-job |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
387 (ediff-set-diff-overlays-in-one-buffer 'C diff-list)) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
388 (if ediff-merge-with-ancestor-job |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
389 (ediff-set-diff-overlays-in-one-buffer 'Ancestor diff-list)) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
390 ;; set up vector showing the status of merge regions |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
391 (if ediff-merge-job |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
392 (setq ediff-state-of-merge |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
393 (vconcat |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
394 (mapcar (function |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
395 (lambda (elt) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
396 (let ((state-of-merge (aref elt 9)) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
397 (state-of-ancestor (aref elt 10))) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
398 (vector |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
399 (if state-of-merge (format "%S" state-of-merge)) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
400 state-of-ancestor)))) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
401 ;; the first elt designates type of list |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
402 (cdr diff-list)) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
403 ))) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
404 (message "Processing difference regions ... done")) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
405 |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
406 |
11042 | 407 (defun ediff-set-diff-overlays-in-one-buffer (buf-type diff-list) |
408 (let* ((current-diff -1) | |
409 (buff (ediff-get-buffer buf-type)) | |
410 ;; ediff-extract-diffs puts the type of diff-list as the first elt | |
411 ;; of this list. The type is either 'points or 'words | |
412 (diff-list-type (car diff-list)) | |
413 (shift (ediff-overlay-start | |
414 (ediff-get-value-according-to-buffer-type | |
415 buf-type ediff-narrow-bounds))) | |
416 (limit (ediff-overlay-end | |
417 (ediff-get-value-according-to-buffer-type | |
418 buf-type ediff-narrow-bounds))) | |
419 diff-overlay-list list-element total-diffs | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
420 begin end pt-saved overlay state-of-diff) |
11042 | 421 |
422 (setq diff-list (cdr diff-list)) ; discard diff list type | |
423 (setq total-diffs (length diff-list)) | |
424 | |
425 ;; shift, if necessary | |
426 (ediff-eval-in-buffer buff (setq pt-saved shift)) | |
427 | |
428 (while diff-list | |
429 (setq current-diff (1+ current-diff) | |
430 list-element (car diff-list) | |
431 begin (aref list-element (cond ((eq buf-type 'A) 0) | |
432 ((eq buf-type 'B) 2) | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
433 ((eq buf-type 'C) 4) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
434 (t 6))) ; Ancestor |
11042 | 435 end (aref list-element (cond ((eq buf-type 'A) 1) |
436 ((eq buf-type 'B) 3) | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
437 ((eq buf-type 'C) 5) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
438 (t 7))) ; Ancestor |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
439 state-of-diff (aref list-element 8) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
440 ) |
11042 | 441 |
442 (cond ((and (not (eq buf-type state-of-diff)) | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
443 (not (eq buf-type 'Ancestor)) |
11042 | 444 (memq state-of-diff '(A B C))) |
445 (setq state-of-diff | |
446 (car (delq buf-type (delq state-of-diff (list 'A 'B 'C))))) | |
447 (setq state-of-diff (format "=diff(%S)" state-of-diff)) | |
448 ) | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
449 (t (setq state-of-diff nil))) |
11042 | 450 |
451 ;; Put overlays at appropriate places in buffer | |
452 ;; convert word numbers to points, if necessary | |
453 (if (eq diff-list-type 'words) | |
454 (progn | |
455 (ediff-eval-in-buffer buff (goto-char pt-saved)) | |
456 (setq begin (ediff-goto-word (1+ begin) buff) | |
457 end (ediff-goto-word end buff 'end)) | |
458 (if (> end limit) (setq end limit)) | |
459 (if (> begin end) (setq begin end)) | |
460 (setq pt-saved (ediff-eval-in-buffer buff (point))))) | |
461 (setq overlay (ediff-make-bullet-proof-overlay begin end buff)) | |
462 | |
463 ;; Priorities of overlays should be equal in all ediff control | |
464 ;; panel buffers. Otherwise it won't work due to Emacs | |
465 ;; bug, as insert-in-front-hooks will be called | |
466 ;; only on behalf of the buffer with higher priority. | |
467 (ediff-overlay-put overlay 'priority ediff-shadow-overlay-priority) | |
468 (ediff-overlay-put overlay 'ediff-diff-num current-diff) | |
469 (ediff-overlay-put | |
470 overlay 'insert-in-front-hooks '(ediff-insert-in-front)) | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
471 (if (and (ediff-window-display-p) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
472 ediff-use-faces ediff-highlight-all-diffs) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
473 (ediff-set-overlay-face |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
474 overlay (ediff-background-face buf-type current-diff))) |
11042 | 475 |
476 (if (= 0 (mod current-diff 10)) | |
477 (message "Buffer %S: Processing difference region %d of %d" | |
478 buf-type current-diff total-diffs)) | |
479 ;; record all overlays for this difference | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
480 ;; the second elt, nil, is a place holder for the fine diff vector. |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
481 ;; the third elt, nil, is a place holder for no-fine-diffs flag. |
11042 | 482 (setq diff-overlay-list |
483 (nconc | |
484 diff-overlay-list | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
485 (list (vector overlay nil nil state-of-diff))) |
11042 | 486 diff-list |
487 (cdr diff-list)) | |
488 ) ; while | |
489 | |
490 (set (intern (format "ediff-difference-vector-%S" buf-type)) | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
491 (vconcat diff-overlay-list)) |
11042 | 492 )) |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
493 |
11042 | 494 ;; `n' is the diff region to work on. Default is ediff-current-difference. |
495 ;; if `flag' is 'noforce then make fine-diffs only if this region's fine | |
496 ;; diffs have not been computed before. | |
497 ;; if `flag' is 'skip then don't compute fine diffs for this region. | |
498 (defun ediff-make-fine-diffs (&optional n flag) | |
499 (or n (setq n ediff-current-difference)) | |
500 | |
501 (if (< ediff-number-of-differences 1) | |
502 (error "No differences found")) | |
503 | |
504 (if ediff-word-mode | |
505 (setq flag 'skip | |
506 ediff-auto-refine 'nix)) | |
507 | |
508 (or (< n 0) | |
509 (>= n ediff-number-of-differences) | |
510 ;; n is within the range | |
511 (let ((tmp-buffer (get-buffer-create ediff-tmp-buffer)) | |
512 (file-A ediff-temp-file-A) | |
513 (file-B ediff-temp-file-B) | |
514 (file-C ediff-temp-file-C) | |
515 (empty-A (ediff-empty-diff-region-p n 'A)) | |
516 (empty-B (ediff-empty-diff-region-p n 'B)) | |
517 (empty-C (ediff-empty-diff-region-p n 'C)) | |
518 (whitespace-A (ediff-whitespace-diff-region-p n 'A)) | |
519 (whitespace-B (ediff-whitespace-diff-region-p n 'B)) | |
520 (whitespace-C (ediff-whitespace-diff-region-p n 'C)) | |
521 cumulative-fine-diff-length) | |
522 | |
523 (cond ((and (eq flag 'noforce) (ediff-get-fine-diff-vector n 'A)) | |
524 ;; don't compute fine diffs if diff vector exists | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
525 (if (ediff-no-fine-diffs-p n) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
526 (ediff-message-if-verbose |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
527 "Only white-space differences in region %d" (1+ n)))) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
528 ;; If one of the regions is empty (or 2 in 3way comparison) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
529 ;; then don't refine. |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
530 ;; If the region happens to be entirely whitespace or empty then |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
531 ;; mark as such. |
11042 | 532 ((> (length (delq nil (list empty-A empty-B empty-C))) 1) |
533 (if (and (ediff-looks-like-combined-merge n) | |
534 ediff-merge-job) | |
535 (ediff-set-fine-overlays-in-one-buffer 'C nil n)) | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
536 (if ediff-3way-comparison-job |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
537 (ediff-message-if-verbose |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
538 "Region %d is empty in all buffers but %S" |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
539 (1+ n) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
540 (cond ((not empty-A) 'A) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
541 ((not empty-B) 'B) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
542 ((not empty-C) 'C))) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
543 (ediff-message-if-verbose |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
544 "Region %d in buffer %S is empty" |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
545 (1+ n) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
546 (cond (empty-A 'A) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
547 (empty-B 'B) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
548 (empty-C 'C))) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
549 ) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
550 ;; if all regions happen to be whitespace, indicate this |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
551 (if (and whitespace-A whitespace-B whitespace-C) |
11042 | 552 (ediff-mark-diff-as-space-only n t) |
553 (ediff-mark-diff-as-space-only n nil))) | |
554 ;; don't compute fine diffs for this region | |
555 ((eq flag 'skip) | |
556 (or (ediff-get-fine-diff-vector n 'A) | |
557 (memq ediff-auto-refine '(off nix)) | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
558 (ediff-message-if-verbose |
11042 | 559 "Region %d exceeds auto-refine limit. `%s' force-refines" |
560 (1+ n) | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
561 (substitute-command-keys |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
562 "\\[ediff-make-or-kill-fine-diffs]") |
11042 | 563 ))) |
564 (t | |
565 ;; recompute fine diffs | |
566 (ediff-wordify | |
567 (ediff-get-diff-posn 'A 'beg n) | |
568 (ediff-get-diff-posn 'A 'end n) | |
569 ediff-buffer-A | |
570 tmp-buffer | |
571 ediff-control-buffer) | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
572 (setq file-A |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
573 (ediff-make-temp-file tmp-buffer "fineDiffA" file-A)) |
11042 | 574 |
575 (ediff-wordify | |
576 (ediff-get-diff-posn 'B 'beg n) | |
577 (ediff-get-diff-posn 'B 'end n) | |
578 ediff-buffer-B | |
579 tmp-buffer | |
580 ediff-control-buffer) | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
581 (setq file-B |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
582 (ediff-make-temp-file tmp-buffer "fineDiffB" file-B)) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
583 |
11042 | 584 (if ediff-3way-job |
585 (progn | |
586 (ediff-wordify | |
587 (ediff-get-diff-posn 'C 'beg n) | |
588 (ediff-get-diff-posn 'C 'end n) | |
589 ediff-buffer-C | |
590 tmp-buffer | |
591 ediff-control-buffer) | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
592 (setq file-C |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
593 (ediff-make-temp-file |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
594 tmp-buffer "fineDiffC" file-C)))) |
11042 | 595 |
596 ;; save temp file names. | |
597 (setq ediff-temp-file-A file-A | |
598 ediff-temp-file-B file-B | |
599 ediff-temp-file-C file-C) | |
600 | |
601 ;; set the new vector of fine diffs, if none exists | |
602 (cond ((and ediff-3way-job whitespace-A) | |
603 (ediff-setup-fine-diff-regions nil file-B file-C n)) | |
604 ((and ediff-3way-job whitespace-B) | |
605 (ediff-setup-fine-diff-regions file-A nil file-C n)) | |
606 ((and ediff-3way-job | |
607 (or whitespace-C | |
608 (and ediff-merge-job | |
609 (ediff-looks-like-combined-merge n)))) | |
610 (ediff-setup-fine-diff-regions file-A file-B nil n)) | |
611 (t | |
612 (ediff-setup-fine-diff-regions file-A file-B file-C n))) | |
613 | |
614 (setq cumulative-fine-diff-length | |
615 (+ (length (ediff-get-fine-diff-vector n 'A)) | |
616 (length (ediff-get-fine-diff-vector n 'B)) | |
617 (if file-C | |
618 (length | |
619 (ediff-get-fine-diff-vector n 'C)) | |
620 0))) | |
621 | |
622 (cond ((or | |
623 ;; all regions are white space | |
624 (and whitespace-A whitespace-B whitespace-C) | |
625 ;; none is white space and no fine diffs detected | |
626 (and (not whitespace-A) | |
627 (not whitespace-B) | |
628 (not (and ediff-3way-job whitespace-C)) | |
629 (eq cumulative-fine-diff-length 0))) | |
630 (ediff-mark-diff-as-space-only n t) | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
631 (ediff-message-if-verbose |
11042 | 632 "Only white-space differences in region %d" (1+ n))) |
633 ((eq cumulative-fine-diff-length 0) | |
634 (ediff-mark-diff-as-space-only n nil) | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
635 (ediff-message-if-verbose |
11042 | 636 "Only white-space differences in region %d %s" |
637 (1+ n) | |
638 (cond (whitespace-A "in buffers B & C") | |
639 (whitespace-B "in buffers A & C") | |
640 (whitespace-C "in buffers A & B")))) | |
641 (t | |
642 (ediff-mark-diff-as-space-only n nil))) | |
643 ) | |
644 ) ; end cond | |
645 (ediff-set-fine-diff-properties n) | |
646 ))) | |
647 | |
648 ;; Interface to ediff-make-fine-diffs. Checks for auto-refine limit, etc. | |
649 (defun ediff-install-fine-diff-if-necessary (n) | |
650 (cond ((eq ediff-auto-refine 'on) | |
651 (if (and | |
652 (> ediff-auto-refine-limit | |
653 (- (ediff-get-diff-posn 'A 'end n) | |
654 (ediff-get-diff-posn 'A 'beg n))) | |
655 (> ediff-auto-refine-limit | |
656 (- (ediff-get-diff-posn 'B 'end n) | |
657 (ediff-get-diff-posn 'B 'beg n)))) | |
658 (ediff-make-fine-diffs n 'noforce) | |
659 (ediff-make-fine-diffs n 'skip))) | |
660 | |
661 ;; highlight iff fine diffs already exist | |
662 ((eq ediff-auto-refine 'off) | |
663 (ediff-make-fine-diffs n 'skip)))) | |
664 | |
665 | |
666 ;; if fine diff vector is not set for diff N, then do nothing | |
667 (defun ediff-set-fine-diff-properties (n &optional default) | |
12086
19458e823866
Changed window-system to ediff-window-display.
Karl Heuer <kwzh@gnu.org>
parents:
11234
diff
changeset
|
668 (or (not (ediff-window-display-p)) |
11042 | 669 (< n 0) |
670 (>= n ediff-number-of-differences) | |
671 ;; in a window system, set faces and priorities of fine overlays | |
672 (progn | |
673 (ediff-set-fine-diff-properties-in-one-buffer 'A n default) | |
674 (ediff-set-fine-diff-properties-in-one-buffer 'B n default) | |
675 (if ediff-3way-job | |
676 (ediff-set-fine-diff-properties-in-one-buffer 'C n default))))) | |
677 | |
678 (defun ediff-set-fine-diff-properties-in-one-buffer (buf-type | |
679 n &optional default) | |
680 (let ((fine-diff-vector (ediff-get-fine-diff-vector n buf-type)) | |
681 (face (if default | |
682 'default | |
683 (face-name | |
684 (intern (format "ediff-fine-diff-face-%S" buf-type))))) | |
685 (priority (if default | |
686 0 | |
687 (1+ (or (ediff-overlay-get | |
688 (symbol-value | |
689 (intern | |
690 (format | |
691 "ediff-current-diff-overlay-%S" buf-type))) | |
692 'priority) | |
693 0))))) | |
694 (mapcar | |
695 (function (lambda (overl) | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
696 (ediff-set-overlay-face overl face) |
11042 | 697 (ediff-overlay-put overl 'priority priority))) |
698 fine-diff-vector))) | |
699 | |
700 ;; This assumes buffer C and that the region looks like a combination of | |
701 ;; regions in buffer A and C. | |
702 (defun ediff-set-fine-overlays-for-combined-merge (diff-list reg-num) | |
703 (let (overlay1 overlay2 overlay3) | |
704 (setq overlay1 (ediff-make-bullet-proof-overlay (nth 0 diff-list) | |
705 (nth 1 diff-list) | |
706 ediff-buffer-C) | |
707 overlay2 (ediff-make-bullet-proof-overlay (nth 2 diff-list) | |
708 (nth 3 diff-list) | |
709 ediff-buffer-C) | |
710 overlay3 (ediff-make-bullet-proof-overlay (nth 4 diff-list) | |
711 (nth 5 diff-list) | |
712 ediff-buffer-C)) | |
713 (ediff-set-fine-diff-vector reg-num 'C (vector overlay1 overlay2 overlay3)) | |
714 )) | |
715 | |
716 | |
717 ;; Convert diff list to overlays for a given DIFF-REGION | |
718 ;; in buffer of type BUF-TYPE | |
719 (defun ediff-set-fine-overlays-in-one-buffer (buf-type diff-list region-num) | |
720 (let* ((current-diff -1) | |
721 (reg-start (ediff-get-diff-posn buf-type 'beg region-num)) | |
722 (buff (ediff-get-buffer buf-type)) | |
723 combined-merge-diff-list | |
724 diff-overlay-list list-element | |
725 begin end overlay) | |
726 | |
727 (ediff-clear-fine-differences-in-one-buffer region-num buf-type) | |
728 (setq diff-list (cdr diff-list)) ; discard list type (words or points) | |
729 (ediff-eval-in-buffer buff (goto-char reg-start)) | |
730 | |
731 ;; if it is a combined merge then set overlays in buff C specially | |
732 (if (and ediff-merge-job (eq buf-type 'C) | |
733 (setq combined-merge-diff-list | |
734 (ediff-looks-like-combined-merge region-num))) | |
735 (ediff-set-fine-overlays-for-combined-merge | |
736 combined-merge-diff-list region-num) | |
737 ;; regular fine diff | |
738 (while diff-list | |
739 (setq current-diff (1+ current-diff) | |
740 list-element (car diff-list) | |
741 begin (aref list-element (cond ((eq buf-type 'A) 0) | |
742 ((eq buf-type 'B) 2) | |
743 (t 4))) ; buf C | |
744 end (aref list-element (cond ((eq buf-type 'A) 1) | |
745 ((eq buf-type 'B) 3) | |
746 (t 5)))) ; buf C | |
747 (if (not (or begin end)) | |
748 () ; skip this diff | |
749 ;; Put overlays at appropriate places in buffers | |
750 ;; convert lines to points, if necessary | |
751 (setq begin (ediff-goto-word (1+ begin) buff) | |
752 end (ediff-goto-word end buff 'end)) | |
753 (setq overlay (ediff-make-bullet-proof-overlay begin end buff)) | |
754 ;; record all overlays for this difference region | |
755 (setq diff-overlay-list (nconc diff-overlay-list (list overlay)))) | |
756 | |
757 (setq diff-list (cdr diff-list)) | |
758 ) ; while | |
759 ;; convert the list of difference information into a vector | |
760 ;; for fast access | |
761 (ediff-set-fine-diff-vector | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
762 region-num buf-type (vconcat diff-overlay-list)) |
11042 | 763 ))) |
764 | |
765 | |
766 ;; Stolen from emerge.el | |
767 (defun ediff-get-diff3-group (file) | |
768 ;; This save-excursion allows ediff-get-diff3-group to be called for the | |
769 ;; various groups of lines (1, 2, 3) in any order, and for the lines to | |
770 ;; appear in any order. The reason this is necessary is that Gnu diff3 | |
771 ;; can produce the groups in the order 1, 2, 3 or 1, 3, 2. | |
772 (save-excursion | |
773 (re-search-forward | |
774 (concat "^" file ":\\([0-9]+\\)\\(,\\([0-9]+\\)\\)?\\([ac]\\)$")) | |
775 (beginning-of-line 2) | |
776 ;; treatment depends on whether it is an "a" group or a "c" group | |
777 (if (string-equal (buffer-substring (match-beginning 4) (match-end 4)) "c") | |
778 ;; it is a "c" group | |
779 (if (match-beginning 2) | |
780 ;; it has two numbers | |
781 (list (string-to-int | |
782 (buffer-substring (match-beginning 1) (match-end 1))) | |
783 (1+ (string-to-int | |
784 (buffer-substring (match-beginning 3) (match-end 3))))) | |
785 ;; it has one number | |
786 (let ((x (string-to-int | |
787 (buffer-substring (match-beginning 1) (match-end 1))))) | |
788 (list x (1+ x)))) | |
789 ;; it is an "a" group | |
790 (let ((x (1+ (string-to-int | |
791 (buffer-substring (match-beginning 1) (match-end 1)))))) | |
792 (list x x))))) | |
793 | |
794 | |
795 ;; If WORD-MODE, construct vector of diffs using word numbers. | |
796 ;; Else, use point values. | |
797 ;; WORD-MODE also tells if we are in the word-mode or not. | |
798 ;; If THREE-WAY-COMP, then it is a 3-way comparison. Else, it is merging | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
799 ;; with ancestor, in which case buffer-C contents is identical to buffer-A/B, |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
800 ;; contents (unless buffer-A is narrowed) depending on ediff-default-variant's |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
801 ;; value. |
11042 | 802 ;; BOUNDS specifies visibility bounds to use. |
803 (defun ediff-extract-diffs3 (diff-buffer word-mode three-way-comp | |
804 &optional bounds) | |
805 (let ((A-buffer ediff-buffer-A) | |
806 (B-buffer ediff-buffer-B) | |
807 (C-buffer ediff-buffer-C) | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
808 (anc-buffer ediff-ancestor-buffer) |
11042 | 809 (a-prev 1) ; needed to set the first diff line correctly |
810 (b-prev 1) | |
811 (c-prev 1) | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
812 (anc-prev 1) |
11042 | 813 diff-list shift-A shift-B shift-C |
814 ) | |
815 | |
816 ;; diff list contains word numbers or points, depending on word-mode | |
817 (setq diff-list (cons (if word-mode 'words 'points) | |
818 diff-list)) | |
819 (if bounds | |
820 (setq shift-A | |
821 (ediff-overlay-start | |
822 (ediff-get-value-according-to-buffer-type 'A bounds)) | |
823 shift-B | |
824 (ediff-overlay-start | |
825 (ediff-get-value-according-to-buffer-type 'B bounds)) | |
826 shift-C | |
827 (if three-way-comp | |
828 (ediff-overlay-start | |
829 (ediff-get-value-according-to-buffer-type 'C bounds))))) | |
830 | |
831 ;; reset point in buffers A, B, C | |
832 (ediff-eval-in-buffer A-buffer | |
833 (goto-char (if shift-A shift-A (point-min)))) | |
834 (ediff-eval-in-buffer B-buffer | |
835 (goto-char (if shift-B shift-B (point-min)))) | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
836 (if three-way-comp |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
837 (ediff-eval-in-buffer C-buffer |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
838 (goto-char (if shift-C shift-C (point-min))))) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
839 (if (ediff-buffer-live-p anc-buffer) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
840 (ediff-eval-in-buffer anc-buffer |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
841 (goto-char (point-min)))) |
11042 | 842 |
843 (ediff-eval-in-buffer diff-buffer | |
844 (goto-char (point-min)) | |
845 (while (re-search-forward ediff-match-diff3-line nil t) | |
846 ;; leave point after matched line | |
847 (beginning-of-line 2) | |
848 (let ((agreement (buffer-substring (match-beginning 1) (match-end 1)))) | |
849 ;; if the A and B files are the same and not 3way-comparison, | |
850 ;; ignore the difference | |
851 (if (or three-way-comp (not (string-equal agreement "3"))) | |
852 (let* ((a-begin (car (ediff-get-diff3-group "1"))) | |
853 (a-end (nth 1 (ediff-get-diff3-group "1"))) | |
854 (b-begin (car (ediff-get-diff3-group "2"))) | |
855 (b-end (nth 1 (ediff-get-diff3-group "2"))) | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
856 (c-or-anc-begin (car (ediff-get-diff3-group "3"))) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
857 (c-or-anc-end (nth 1 (ediff-get-diff3-group "3"))) |
11042 | 858 (state-of-merge |
859 (cond ((string-equal agreement "1") 'prefer-A) | |
860 ((string-equal agreement "2") 'prefer-B) | |
861 (t ediff-default-variant))) | |
862 (state-of-diff-merge | |
863 (if (memq state-of-merge '(default-A prefer-A)) 'B 'A)) | |
864 (state-of-diff-comparison | |
865 (cond ((string-equal agreement "1") 'A) | |
866 ((string-equal agreement "2") 'B) | |
867 ((string-equal agreement "3") 'C))) | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
868 state-of-ancestor |
11042 | 869 c-begin c-end |
870 a-begin-pt a-end-pt | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
871 b-begin-pt b-end-pt |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
872 c-begin-pt c-end-pt |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
873 anc-begin-pt anc-end-pt) |
11042 | 874 |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
875 (setq state-of-ancestor |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
876 (= c-or-anc-begin c-or-anc-end)) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
877 |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
878 (cond (three-way-comp |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
879 (setq c-begin c-or-anc-begin |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
880 c-end c-or-anc-end)) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
881 ((eq ediff-default-variant 'default-B) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
882 (setq c-begin b-begin |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
883 c-end b-end)) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
884 (t |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
885 (setq c-begin a-begin |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
886 c-end a-end))) |
11042 | 887 |
888 ;; compute main diff vector | |
889 (if word-mode | |
890 ;; make diff-list contain word numbers | |
891 (setq diff-list | |
892 (nconc diff-list | |
893 (list (vector | |
894 (- a-begin a-prev) (- a-end a-begin) | |
895 (- b-begin b-prev) (- b-end b-begin) | |
896 (- c-begin c-prev) (- c-end c-begin) | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
897 nil nil ; dummy ancestor |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
898 nil ; state of diff |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
899 nil ; state of merge |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
900 nil ; state of ancestor |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
901 ))) |
11042 | 902 a-prev a-end |
903 b-prev b-end | |
904 c-prev c-end) | |
905 ;; else convert lines to points | |
906 (ediff-eval-in-buffer A-buffer | |
907 (forward-line (- a-begin a-prev)) | |
908 (setq a-begin-pt (point)) | |
909 (forward-line (- a-end a-begin)) | |
910 (setq a-end-pt (point) | |
911 a-prev a-end)) | |
912 (ediff-eval-in-buffer B-buffer | |
913 (forward-line (- b-begin b-prev)) | |
914 (setq b-begin-pt (point)) | |
915 (forward-line (- b-end b-begin)) | |
916 (setq b-end-pt (point) | |
917 b-prev b-end)) | |
918 (ediff-eval-in-buffer C-buffer | |
919 (forward-line (- c-begin c-prev)) | |
920 (setq c-begin-pt (point)) | |
921 (forward-line (- c-end c-begin)) | |
922 (setq c-end-pt (point) | |
923 c-prev c-end)) | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
924 (if (ediff-buffer-live-p anc-buffer) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
925 (ediff-eval-in-buffer anc-buffer |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
926 (forward-line (- c-or-anc-begin anc-prev)) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
927 (setq anc-begin-pt (point)) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
928 (forward-line (- c-or-anc-end c-or-anc-begin)) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
929 (setq anc-end-pt (point) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
930 anc-prev c-or-anc-end))) |
11042 | 931 (setq diff-list |
932 (nconc | |
933 diff-list | |
934 ;; if comparing with ancestor, then there also is a | |
935 ;; state-of-difference marker | |
936 (if three-way-comp | |
937 (list (vector | |
938 a-begin-pt a-end-pt | |
939 b-begin-pt b-end-pt | |
940 c-begin-pt c-end-pt | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
941 nil nil ; ancestor begin/end |
11042 | 942 state-of-diff-comparison |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
943 nil ; state of merge |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
944 nil ; state of ancestor |
11042 | 945 )) |
946 (list (vector a-begin-pt a-end-pt | |
947 b-begin-pt b-end-pt | |
948 c-begin-pt c-end-pt | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
949 anc-begin-pt anc-end-pt |
11042 | 950 state-of-diff-merge |
951 state-of-merge | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
952 state-of-ancestor |
11042 | 953 ))) |
954 ))) | |
955 )) | |
956 | |
957 ))) ; end ediff-eval-in-buffer | |
958 diff-list | |
959 )) | |
960 | |
961 ;; Generate the difference vector and overlays for three files | |
962 ;; File-C is either the third file to compare (in case of 3-way comparison) | |
963 ;; or it is the ancestor file. | |
964 (defun ediff-setup-diff-regions3 (file-A file-B file-C) | |
965 | |
966 ;; force all minibuffers to display ediff's messages. | |
12086
19458e823866
Changed window-system to ediff-window-display.
Karl Heuer <kwzh@gnu.org>
parents:
11234
diff
changeset
|
967 ;; when xemacs implements minibufferless frames, this won't be necessary |
11042 | 968 (if ediff-xemacs-p (setq synchronize-minibuffers t)) |
969 | |
970 (or (ediff-buffer-live-p ediff-diff-buffer) | |
971 (setq ediff-diff-buffer | |
972 (get-buffer-create (ediff-unique-buffer-name "*ediff-diff" "*")))) | |
973 | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
974 (message "Computing differences ...") |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
975 (ediff-exec-process ediff-diff3-program ediff-diff-buffer 'synchronize |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
976 ediff-diff3-options file-A file-B file-C) |
11042 | 977 |
978 (ediff-prepare-error-list ediff-diff3-ok-lines-regexp ediff-diff-buffer) | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
979 ;;(message "Computing differences ... done") |
11042 | 980 (ediff-convert-diffs-to-overlays |
981 (ediff-extract-diffs3 | |
982 ediff-diff-buffer | |
983 ediff-word-mode ediff-3way-comparison-job ediff-narrow-bounds) | |
984 )) | |
985 | |
986 | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
987 ;; Execute PROGRAM asynchronously, unless OS/2 or unless SYNCH is non-nil. |
11042 | 988 ;; BUFFER must be a buffer object, and must be alive. |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
989 ;; All arguments in ARGS must be strings. The first arg may be a blank string, |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
990 ;; in which case we delete it from ARGS list. We also delete nil from args. |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
991 (defun ediff-exec-process (program buffer synch &rest args) |
11042 | 992 (let ((data (match-data))) |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
993 (if (string-match "^[ \t]*$" (car args)) ; delete blank string |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
994 (setq args (cdr args))) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
995 (setq args (delq nil args)) ; delete nil from arguments |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
996 (setq args (ediff-split-string (mapconcat 'identity args " "))) |
11042 | 997 (unwind-protect |
998 (let ((directory default-directory) | |
999 proc) | |
1000 (save-excursion | |
1001 (set-buffer buffer) | |
1002 (erase-buffer) | |
1003 (setq default-directory directory) | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
1004 (if (or (eq system-type 'emx) synch) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
1005 ;; In OS/2 do it synchronously, since OS/2 doesn't let us |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
1006 ;; delete files used by other processes. Thus, in ediff-buffers |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
1007 ;; and similar functions, we can't delete temp files because |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
1008 ;; they might be used by the asynch process that computes |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
1009 ;; custom diffs. So, we have to wait till custom diff |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
1010 ;; subprocess is done. |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
1011 (apply 'call-process program nil buffer nil args) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
1012 ;; On other systems, do it asynchronously. |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
1013 (setq proc (get-buffer-process buffer)) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
1014 (if proc (kill-process proc)) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
1015 (setq proc |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
1016 (apply 'start-process "Custom Diff" buffer program args)) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
1017 (setq mode-line-process '(":%s")) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
1018 (set-process-sentinel proc 'ediff-process-sentinel) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
1019 (set-process-filter proc 'ediff-process-filter) |
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
1020 ))) |
11042 | 1021 (store-match-data data)))) |
1022 | |
1023 ;; This is shell-command-filter from simple.el in FSF Emacs. | |
1024 ;; Copied here because XEmacs doesn't have it. | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
1025 (defun ediff-process-filter (proc string) |
11042 | 1026 ;; Do save-excursion by hand so that we can leave point numerically unchanged |
1027 ;; despite an insertion immediately after it. | |
1028 (let* ((obuf (current-buffer)) | |
1029 (buffer (process-buffer proc)) | |
1030 opoint | |
1031 (window (get-buffer-window buffer)) | |
1032 (pos (window-start window))) | |
1033 (unwind-protect | |
1034 (progn | |
1035 (set-buffer buffer) | |
1036 (or (= (point) (point-max)) | |
1037 (setq opoint (point))) | |
1038 (goto-char (point-max)) | |
1039 (insert-before-markers string)) | |
1040 ;; insert-before-markers moved this marker: set it back. | |
1041 (set-window-start window pos) | |
1042 ;; Finish our save-excursion. | |
1043 (if opoint | |
1044 (goto-char opoint)) | |
1045 (set-buffer obuf)))) | |
1046 | |
1047 ;; like shell-command-sentinel but doesn't print an exit status message | |
1048 ;; we do this because diff always exits with status 1, if diffs are found | |
1049 ;; so shell-command-sentinel displays a confusing message to the user | |
13127
4ca49c2e0c03
(ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12086
diff
changeset
|
1050 (defun ediff-process-sentinel (process signal) |
11042 | 1051 (if (and (memq (process-status process) '(exit signal)) |
1052 (buffer-name (process-buffer process))) | |
1053 (progn | |
1054 (save-excursion | |
1055 (set-buffer (process-buffer process)) | |
1056 (setq mode-line-process nil)) | |
1057 (delete-process process)))) | |
1058 | |
1059 | |
1060 ;;; Word functions used to refine the current diff | |
1061 | |
1062 (defvar ediff-forward-word-function 'ediff-forward-word | |
1063 "*Function to call to move to the next word. | |
1064 Used for splitting difference regions into individual words.") | |
1065 | |
1066 (defvar ediff-whitespace " \n\t\f" | |
1067 "*Characters constituting white space. | |
1068 These characters are ignored when differing regions are split into words.") | |
1069 | |
1070 ;;(defvar ediff-word-1 "a-zA-Z---_`'.?!:" | |
1071 (defvar ediff-word-1 "a-zA-Z---_" | |
1072 "*Characters that constitute words of type 1. | |
1073 More precisely, [ediff-word-1] is a regexp that matches type 1 words. | |
1074 See `ediff-forward-word' for more details.") | |
1075 | |
1076 (defvar ediff-word-2 "0-9.," | |
1077 "*Characters that constitute words of type 2. | |
1078 More precisely, [ediff-word-2] is a regexp that matches type 2 words. | |
1079 See `ediff-forward-word' for more details.") | |
1080 | |
1081 (defvar ediff-word-3 "`'?!:;\"{}[]()" | |
1082 "*Characters that constitute words of type 3. | |
1083 More precisely, [ediff-word-3] is a regexp that matches type 3 words. | |
1084 See `ediff-forward-word' for more details.") | |
1085 | |
1086 (defvar ediff-word-4 | |
1087 (concat "^" ediff-word-1 ediff-word-2 ediff-word-3 ediff-whitespace) | |
1088 "*Characters that constitute words of type 4. | |
1089 More precisely, [ediff-word-4] is a regexp that matches type 4 words. | |
1090 See `ediff-forward-word' for more details.") | |
1091 | |
1092 ;; Split region along word boundaries. Each word will be on its own line. | |
1093 ;; Output to buffer out-buffer. | |
1094 (defun ediff-forward-word () | |
1095 "Move point one word forward. | |
1096 There are four types of words, each of which consists entirely of | |
1097 characters in `ediff-word-1', `ediff-word-2', `ediff-word-3', or | |
1098 `ediff-word-4'. Words are recognized by passing these in turn as the | |
1099 argument to `skip-chars-forward'." | |
1100 (or (> (skip-chars-forward ediff-word-1) 0) | |
1101 (> (skip-chars-forward ediff-word-2) 0) | |
1102 (> (skip-chars-forward ediff-word-3) 0) | |
1103 (> (skip-chars-forward ediff-word-4) 0) | |
1104 )) | |
1105 | |
1106 (defun ediff-wordify (beg end in-buffer out-buffer &optional control-buf) | |
1107 (let (sv-point string) | |
1108 (save-excursion | |
1109 (set-buffer in-buffer) | |
1110 (setq string (buffer-substring beg end)) | |
1111 | |
1112 (set-buffer out-buffer) | |
1113 (erase-buffer) | |
1114 (insert string) | |
1115 (goto-char (point-min)) | |
1116 (skip-chars-forward ediff-whitespace) | |
1117 (delete-region (point-min) (point)) | |
1118 | |
1119 (while (not (eobp)) | |
1120 ;; eval incontrol buf to let user create local versions for | |
1121 ;; different invocations | |
1122 (if control-buf | |
1123 (funcall | |
1124 (ediff-eval-in-buffer control-buf ediff-forward-word-function)) | |
1125 (funcall ediff-forward-word-function)) | |
1126 (setq sv-point (point)) | |
1127 (skip-chars-forward ediff-whitespace) | |
1128 (delete-region sv-point (point)) | |
1129 (insert "\n"))))) | |
1130 | |
1131 ;; copy string from BEG END from IN-BUF to OUT-BUF | |
1132 (defun ediff-copy-to-buffer (beg end in-buffer out-buffer) | |
1133 (let (string) | |
1134 (save-excursion | |
1135 (set-buffer in-buffer) | |
1136 (setq string (buffer-substring beg end)) | |
1137 | |
1138 (set-buffer out-buffer) | |
1139 (erase-buffer) | |
1140 (insert string) | |
1141 (goto-char (point-min))))) | |
1142 | |
1143 | |
1144 ;; goto word #n starting at current position in buffer `buf' | |
1145 ;; For ediff, a word is either a string of a-z,A-Z, incl `-' and `_'; | |
1146 ;; or a string of other non-blanks. A blank is a \n\t\f | |
1147 ;; If `flag' is non-nil, goto the end of the n-th word. | |
1148 (defun ediff-goto-word (n buf &optional flag) | |
1149 ;; remember val ediff-forward-word-function has in ctl buf | |
1150 (let ((fwd-word-fun ediff-forward-word-function)) | |
1151 (ediff-eval-in-buffer buf | |
1152 (skip-chars-forward ediff-whitespace) | |
1153 (while (> n 1) | |
1154 (funcall fwd-word-fun) | |
1155 (skip-chars-forward ediff-whitespace) | |
1156 (setq n (1- n))) | |
1157 (if (and flag (> n 0)) | |
1158 (funcall fwd-word-fun)) | |
1159 (point)))) | |
1160 | |
1161 | |
1162 (provide 'ediff-diff) | |
1163 | |
1164 | |
1165 ;; ediff-diff.el ends here |