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