1 ;;; ediff-diff.el --- diff-related utilities
2 ;;; Copyright (C) 1994, 1995 Free Software Foundation, Inc.
4 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
6 ;; This file is part of GNU Emacs.
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)
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.
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.
26 (cond ((eq system-type
'emx
) "cmd") ; OS/2
27 ((memq system-type
'(vax-vms axp-vms
)) "*dcl*") ; VMS
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.")
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
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'.")
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.")
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
"" "")
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.")
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
)
84 (ediff-defvar-local ediff-auto-refine
(if window-system
'on
'nix
)
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 `*'.
89 This variable can be set either in .emacs or toggled interactively.
90 Use `setq-default' if setting it in .emacs")
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")
97 (ediff-defvar-local ediff-auto-refine-limit
700
98 "Auto-refine only those regions that are smaller than this number of bytes.")
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.")
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.")
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'.
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.")
126 ;; Generate the difference vector and overlays for the two files
127 ;; With optional arg REG-TO-REFINE, refine this region.
128 ;; File-C argument is not used here. It is there just because
129 ;; ediff-setup-diff-regions is called via a funcall to
130 ;; ediff-setup-diff-regions-function, which can also have the value
131 ;; ediff-setup-diff-regions3, which takes 4 arguments.
132 (defun ediff-setup-diff-regions (file-A file-B file-C
)
133 ;; force all minibuffers to display ediff's messages.
134 ;; when xemacs implements minibufferless screens, this won't be necessary
135 (if ediff-xemacs-p
(setq synchronize-minibuffers t
))
137 (or (ediff-buffer-live-p ediff-diff-buffer
)
138 (setq ediff-diff-buffer
139 (get-buffer-create (ediff-unique-buffer-name "*ediff-diff" "*"))))
140 (or (ediff-buffer-live-p ediff-custom-diff-buffer
)
141 (setq ediff-custom-diff-buffer
143 (ediff-unique-buffer-name "*ediff-custom-diff" "*"))))
145 (ediff-eval-in-buffer ediff-diff-buffer
147 ;; shell-command tends to display old shell command buffers even when it
148 ;; puts output in another buffer---probably an Emacs bug.
149 (ediff-kill-buffer-carefully "*Shell Command Output*")
150 (let ((shell-file-name ediff-shell
))
151 (message "Computing differences ...") (sit-for 0)
153 (format "%s %s %s %s"
154 ediff-diff-program ediff-diff-options
155 (ediff-protect-metachars file-A
)
156 (ediff-protect-metachars file-B
))
160 ;; compute custom diffs
161 (let ((shell-file-name ediff-shell
)
164 (substitute-command-keys "\\[ediff-update-diffs]"))))
165 (if (or (= (buffer-size) 0) ; was the first time
166 (eq last-command-char recomp-diff-key
)) ; was a recompute cmd
167 ;; do asynchronously & insert output in ediff-custom-diff-buffer
169 (format "%s %s %s %s"
170 ediff-custom-diff-program ediff-custom-diff-options
171 (ediff-protect-metachars file-A
)
172 (ediff-protect-metachars file-B
))
173 ediff-custom-diff-buffer
)))
175 (ediff-prepare-error-list ediff-diff-ok-lines-regexp ediff-diff-buffer
)
176 (message "Computing differences ... done")(sit-for 0)
177 (ediff-convert-diffs-to-overlays
179 ediff-diff-buffer ediff-word-mode ediff-narrow-bounds
))
182 ;; If file-A/B/C is nil, do 2-way comparison with the non-nil buffers
183 ;; This function works for diff3 and diff2 jobs
184 (defun ediff-setup-fine-diff-regions (file-A file-B file-C reg-num
)
185 (or (ediff-buffer-live-p ediff-fine-diff-buffer
)
186 (setq ediff-fine-diff-buffer
188 (ediff-unique-buffer-name "*ediff-fine-diff" "*"))))
190 (let (diff3-job diff-program diff-options ok-regexp diff-list
)
191 (setq diff3-job ediff-3way-job
192 diff-program
(if diff3-job ediff-diff3-program ediff-diff-program
)
194 ok-regexp
(if diff3-job
195 ediff-diff3-ok-lines-regexp
196 ediff-diff-ok-lines-regexp
))
198 (ediff-eval-in-buffer ediff-fine-diff-buffer
200 ;; shell-command tends to display old shell command buffers even when
201 ;; it puts output in another buffer---probably an Emacs bug.
202 (ediff-kill-buffer-carefully "*Shell Command Output*")
203 (let ((shell-file-name ediff-shell
))
204 (message "Refining difference region %d ..." (1+ reg-num
))
206 (format "%s %s %s %s %s"
207 diff-program diff-options
209 (ediff-protect-metachars file-A
)
210 (ediff-protect-metachars file-B
))
212 (ediff-protect-metachars file-B
)
213 (ediff-protect-metachars file-A
))
216 (ediff-protect-metachars file-C
)
217 (ediff-protect-metachars file-B
))
223 (ediff-prepare-error-list ok-regexp ediff-fine-diff-buffer
)
224 (message "Refining difference region %d ... done" (1+ reg-num
))
228 (ediff-extract-diffs3
229 ediff-fine-diff-buffer
'3way-comparison
'word-mode
)
230 (ediff-extract-diffs ediff-fine-diff-buffer
'word-mode
)))
234 (mapcar (function (lambda (elt)
239 (mapcar (function (lambda (elt)
244 (mapcar (function (lambda (elt)
250 (ediff-convert-fine-diffs-to-overlays diff-list reg-num
)
254 (defun ediff-prepare-error-list (ok-regexp diff-buff
)
255 (ediff-eval-in-buffer ediff-error-buffer
257 (insert-buffer diff-buff
)
258 (delete-matching-lines ok-regexp
)
259 (if (memq system-type
'(vax-vms axp-vms
))
260 (delete-matching-lines "^$")))
261 ;; If diff reports errors, show them then quit.
262 (if (/= 0 (ediff-eval-in-buffer ediff-error-buffer
(buffer-size)))
263 (let ((ctl-buf ediff-control-buffer
)
264 (error-buf ediff-error-buffer
))
265 (ediff-skip-unsuitable-frames)
266 (switch-to-buffer error-buf
)
267 (ediff-kill-buffer-carefully ctl-buf
)
268 (error "Errors in diff output. Diff output is in %S" diff-buff
))))
270 ;; BOUNDS specifies visibility bounds to use.
271 ;; WORD-MODE tells whether we are in the word-mode or not.
272 ;; If WORD-MODE, also construct vector of diffs using word numbers.
273 ;; Else, use point values.
274 ;; This function handles diff-2 jobs including the case of
275 ;; merging buffers and files without ancestor.
276 (defun ediff-extract-diffs (diff-buffer word-mode
&optional bounds
)
277 (let ((A-buffer ediff-buffer-A
)
278 (B-buffer ediff-buffer-B
)
279 (C-buffer ediff-buffer-C
)
280 (a-prev 1) ; this is needed to set the first diff line correctly
283 diff-list shift-A shift-B
286 ;; diff list contains word numbers, unless changed later
287 (setq diff-list
(cons (if word-mode
'words
'points
)
289 ;; we don't use visibility bounds for buffer C when merging
293 (ediff-get-value-according-to-buffer-type 'A bounds
))
296 (ediff-get-value-according-to-buffer-type 'B bounds
))))
298 ;; reset point in buffers A/B/C
299 (ediff-eval-in-buffer A-buffer
300 (goto-char (if shift-A shift-A
(point-min))))
301 (ediff-eval-in-buffer B-buffer
302 (goto-char (if shift-B shift-B
(point-min))))
303 (if (ediff-buffer-live-p C-buffer
)
304 (ediff-eval-in-buffer C-buffer
305 (goto-char (point-min))))
307 (ediff-eval-in-buffer diff-buffer
308 (goto-char (point-min))
309 (while (re-search-forward ediff-match-diff-line nil t
)
310 (let* ((a-begin (string-to-int (buffer-substring (match-beginning 1)
312 (a-end (let ((b (match-beginning 3))
315 (string-to-int (buffer-substring b e
))
317 (diff-type (buffer-substring (match-beginning 4) (match-end 4)))
318 (b-begin (string-to-int (buffer-substring (match-beginning 5)
320 (b-end (let ((b (match-beginning 7))
323 (string-to-int (buffer-substring b e
))
325 a-begin-pt a-end-pt b-begin-pt b-end-pt
326 c-begin c-end c-begin-pt c-end-pt
)
327 ;; fix the beginning and end numbers, because diff is somewhat
328 ;; strange about how it numbers lines
329 (if (string-equal diff-type
"a")
330 (setq b-end
(1+ b-end
)
333 (if (string-equal diff-type
"d")
334 (setq a-end
(1+ a-end
)
337 ;; (string-equal diff-type "c")
338 (setq a-end
(1+ a-end
)
341 (if (eq ediff-default-variant
'default-B
)
342 (setq c-begin b-begin
344 (setq c-begin a-begin
347 ;; compute main diff vector
349 ;; make diff-list contain word numbers
353 (if (ediff-buffer-live-p C-buffer
)
354 (vector (- a-begin a-prev
) (- a-end a-begin
)
355 (- b-begin b-prev
) (- b-end b-begin
)
356 (- c-begin c-prev
) (- c-end c-begin
)
360 (vector (- a-begin a-prev
) (- a-end a-begin
)
361 (- b-begin b-prev
) (- b-end b-begin
)
362 nil nil
; dummy buf C
370 ;; else convert lines to points
371 (ediff-eval-in-buffer A-buffer
372 (forward-line (- a-begin a-prev
))
373 (setq a-begin-pt
(point))
374 (forward-line (- a-end a-begin
))
375 (setq a-end-pt
(point)
377 (ediff-eval-in-buffer B-buffer
378 (forward-line (- b-begin b-prev
))
379 (setq b-begin-pt
(point))
380 (forward-line (- b-end b-begin
))
381 (setq b-end-pt
(point)
383 (if (ediff-buffer-live-p C-buffer
)
384 (ediff-eval-in-buffer C-buffer
385 (forward-line (- c-begin c-prev
))
386 (setq c-begin-pt
(point))
387 (forward-line (- c-end c-begin
))
388 (setq c-end-pt
(point)
394 (if (ediff-buffer-live-p C-buffer
)
396 a-begin-pt a-end-pt b-begin-pt b-end-pt
399 ;; shows which buff is different from the other two
400 (if (eq ediff-default-variant
'default-B
) 'A
'B
)
402 ediff-default-variant
404 (vector a-begin-pt a-end-pt b-begin-pt b-end-pt
405 nil nil
; dummy buf C
406 nil nil
; dummy state of diff & merge
410 ))) ; end ediff-eval-in-buffer
415 (defun ediff-set-diff-overlays-in-one-buffer (buf-type diff-list
)
416 (let* ((current-diff -
1)
417 (buff (ediff-get-buffer buf-type
))
418 ;; ediff-extract-diffs puts the type of diff-list as the first elt
419 ;; of this list. The type is either 'points or 'words
420 (diff-list-type (car diff-list
))
421 (shift (ediff-overlay-start
422 (ediff-get-value-according-to-buffer-type
423 buf-type ediff-narrow-bounds
)))
424 (limit (ediff-overlay-end
425 (ediff-get-value-according-to-buffer-type
426 buf-type ediff-narrow-bounds
)))
427 diff-overlay-list list-element total-diffs
428 begin end pt-saved overlay state-of-diff state-of-merge
)
430 (setq diff-list
(cdr diff-list
)) ; discard diff list type
431 (setq total-diffs
(length diff-list
))
433 ;; shift, if necessary
434 (ediff-eval-in-buffer buff
(setq pt-saved shift
))
437 (setq current-diff
(1+ current-diff
)
438 list-element
(car diff-list
)
439 begin
(aref list-element
(cond ((eq buf-type
'A
) 0)
442 end
(aref list-element
(cond ((eq buf-type
'A
) 1)
445 state-of-diff
(aref list-element
6)
446 state-of-merge
(aref list-element
7))
448 (cond ((and (not (eq buf-type state-of-diff
))
449 (memq state-of-diff
'(A B C
)))
451 (car (delq buf-type
(delq state-of-diff
(list 'A
'B
'C
)))))
452 (setq state-of-diff
(format "=diff(%S)" state-of-diff
))
453 (if (and ediff-merge-job state-of-merge
(eq buf-type
'C
))
454 (setq state-of-merge
(format "%S" state-of-merge
)))
456 (t (setq state-of-diff nil
457 state-of-merge nil
)))
459 ;; Put overlays at appropriate places in buffer
460 ;; convert word numbers to points, if necessary
461 (if (eq diff-list-type
'words
)
463 (ediff-eval-in-buffer buff
(goto-char pt-saved
))
464 (setq begin
(ediff-goto-word (1+ begin
) buff
)
465 end
(ediff-goto-word end buff
'end
))
466 (if (> end limit
) (setq end limit
))
467 (if (> begin end
) (setq begin end
))
468 (setq pt-saved
(ediff-eval-in-buffer buff
(point)))))
469 (setq overlay
(ediff-make-bullet-proof-overlay begin end buff
))
471 ;; Priorities of overlays should be equal in all ediff control
472 ;; panel buffers. Otherwise it won't work due to Emacs
473 ;; bug, as insert-in-front-hooks will be called
474 ;; only on behalf of the buffer with higher priority.
475 (ediff-overlay-put overlay
'priority ediff-shadow-overlay-priority
)
476 (ediff-overlay-put overlay
'ediff-diff-num current-diff
)
478 overlay
'insert-in-front-hooks
'(ediff-insert-in-front))
480 overlay
'face
(if (ediff-odd-p current-diff
)
482 (format "ediff-odd-diff-face-%S-var" buf-type
))
484 (format "ediff-even-diff-face-%S-var" buf-type
))))
486 (if (= 0 (mod current-diff
10))
487 (message "Buffer %S: Processing difference region %d of %d"
488 buf-type current-diff total-diffs
))
489 ;; record all overlays for this difference
490 ;; the second elt, nill, is a place holder for the fine diff vector.
491 ;; the last nil is a place holder for no-fine-diffs flag.
492 (setq diff-overlay-list
495 (list (vector overlay nil nil state-of-diff state-of-merge
)))
500 (set (intern (format "ediff-difference-vector-%S" buf-type
))
501 (apply 'vector diff-overlay-list
))
504 ;; `n' is the diff region to work on. Default is ediff-current-difference.
505 ;; if `flag' is 'noforce then make fine-diffs only if this region's fine
506 ;; diffs have not been computed before.
507 ;; if `flag' is 'skip then don't compute fine diffs for this region.
509 (defun ediff-make-fine-diffs (&optional n flag
)
510 (or n
(setq n ediff-current-difference
))
512 (if (< ediff-number-of-differences
1)
513 (error "No differences found"))
517 ediff-auto-refine
'nix
))
520 (>= n ediff-number-of-differences
)
521 ;; n is within the range
522 (let ((tmp-buffer (get-buffer-create ediff-tmp-buffer
))
523 (file-A ediff-temp-file-A
)
524 (file-B ediff-temp-file-B
)
525 (file-C ediff-temp-file-C
)
526 (empty-A (ediff-empty-diff-region-p n
'A
))
527 (empty-B (ediff-empty-diff-region-p n
'B
))
528 (empty-C (ediff-empty-diff-region-p n
'C
))
529 (whitespace-A (ediff-whitespace-diff-region-p n
'A
))
530 (whitespace-B (ediff-whitespace-diff-region-p n
'B
))
531 (whitespace-C (ediff-whitespace-diff-region-p n
'C
))
532 cumulative-fine-diff-length
)
534 (cond ((and (eq flag
'noforce
) (ediff-get-fine-diff-vector n
'A
))
535 ;; don't compute fine diffs if diff vector exists
536 (if (and (ediff-no-fine-diffs-p n
) ediff-verbose-p
)
537 (message "Only white-space differences in region %d"
539 ;; if one of the regions is empty (or 2 in 3way comparison
541 ((> (length (delq nil
(list empty-A empty-B empty-C
))) 1)
542 (if (and (ediff-looks-like-combined-merge n
)
544 (ediff-set-fine-overlays-in-one-buffer 'C nil n
))
546 (if ediff-3way-comparison-job
548 "Region %d is empty in all buffers but %S"
550 (cond ((not empty-A
) 'A
)
554 "Region %d in buffer %S is empty"
560 ;; if all regions happen to be empty, say, as a result of
561 ;; deletions from non-empty regions, then mark as space only
562 (if (and empty-A empty-B empty-C
)
563 (ediff-mark-diff-as-space-only n t
)
564 (ediff-mark-diff-as-space-only n nil
)))
565 ;; don't compute fine diffs for this region
567 (or (ediff-get-fine-diff-vector n
'A
)
568 (memq ediff-auto-refine
'(off nix
))
569 (not ediff-verbose-p
)
571 "Region %d exceeds auto-refine limit. `%s' force-refines"
573 (substitute-command-keys "\\[ediff-make-or-kill-fine-diffs]")
576 ;; delete old fine diffs
577 ;;(ediff-clear-fine-differences n)
578 ;; recompute fine diffs
580 (ediff-get-diff-posn 'A
'beg n
)
581 (ediff-get-diff-posn 'A
'end n
)
584 ediff-control-buffer
)
585 (ediff-eval-in-buffer tmp-buffer
586 (setq file-A
(ediff-make-temp-file "fineDiffA" file-A
)))
589 (ediff-get-diff-posn 'B
'beg n
)
590 (ediff-get-diff-posn 'B
'end n
)
593 ediff-control-buffer
)
594 (ediff-eval-in-buffer tmp-buffer
595 (setq file-B
(ediff-make-temp-file "fineDiffB" file-B
)))
600 (ediff-get-diff-posn 'C
'beg n
)
601 (ediff-get-diff-posn 'C
'end n
)
604 ediff-control-buffer
)
605 (ediff-eval-in-buffer tmp-buffer
607 (ediff-make-temp-file "fineDiffC" file-C
)))))
609 ;; save temp file names.
610 (setq ediff-temp-file-A file-A
611 ediff-temp-file-B file-B
612 ediff-temp-file-C file-C
)
614 ;; set the new vector of fine diffs, if none exists
615 (cond ((and ediff-3way-job whitespace-A
)
616 (ediff-setup-fine-diff-regions nil file-B file-C n
))
617 ((and ediff-3way-job whitespace-B
)
618 (ediff-setup-fine-diff-regions file-A nil file-C n
))
622 (ediff-looks-like-combined-merge n
))))
623 (ediff-setup-fine-diff-regions file-A file-B nil n
))
625 (ediff-setup-fine-diff-regions file-A file-B file-C n
)))
627 (setq cumulative-fine-diff-length
628 (+ (length (ediff-get-fine-diff-vector n
'A
))
629 (length (ediff-get-fine-diff-vector n
'B
))
632 (ediff-get-fine-diff-vector n
'C
))
636 ;; all regions are white space
637 (and whitespace-A whitespace-B whitespace-C
)
638 ;; none is white space and no fine diffs detected
639 (and (not whitespace-A
)
641 (not (and ediff-3way-job whitespace-C
))
642 (eq cumulative-fine-diff-length
0)))
643 (ediff-mark-diff-as-space-only n t
)
645 "Only white-space differences in region %d" (1+ n
)))
646 ((eq cumulative-fine-diff-length
0)
647 (ediff-mark-diff-as-space-only n nil
)
649 "Only white-space differences in region %d %s"
651 (cond (whitespace-A "in buffers B & C")
652 (whitespace-B "in buffers A & C")
653 (whitespace-C "in buffers A & B"))))
655 (ediff-mark-diff-as-space-only n nil
)))
658 (ediff-set-fine-diff-properties n
)
661 ;; Interface to ediff-make-fine-diffs. Checks for auto-refine limit, etc.
662 (defun ediff-install-fine-diff-if-necessary (n)
663 (cond ((eq ediff-auto-refine
'on
)
665 (> ediff-auto-refine-limit
666 (- (ediff-get-diff-posn 'A
'end n
)
667 (ediff-get-diff-posn 'A
'beg n
)))
668 (> ediff-auto-refine-limit
669 (- (ediff-get-diff-posn 'B
'end n
)
670 (ediff-get-diff-posn 'B
'beg n
))))
671 (ediff-make-fine-diffs n
'noforce
)
672 (ediff-make-fine-diffs n
'skip
)))
674 ;; highlight iff fine diffs already exist
675 ((eq ediff-auto-refine
'off
)
676 (ediff-make-fine-diffs n
'skip
))))
679 ;; if fine diff vector is not set for diff N, then do nothing
680 (defun ediff-set-fine-diff-properties (n &optional default
)
681 (or (not window-system
)
683 (>= n ediff-number-of-differences
)
684 ;; in a window system, set faces and priorities of fine overlays
686 (ediff-set-fine-diff-properties-in-one-buffer 'A n default
)
687 (ediff-set-fine-diff-properties-in-one-buffer 'B n default
)
689 (ediff-set-fine-diff-properties-in-one-buffer 'C n default
)))))
691 (defun ediff-set-fine-diff-properties-in-one-buffer (buf-type
693 (let ((fine-diff-vector (ediff-get-fine-diff-vector n buf-type
))
697 (intern (format "ediff-fine-diff-face-%S" buf-type
)))))
698 ;; (if (and (eq buf-type 'C)
699 ;; (ediff-looks-like-combined-merge n))
700 ;; 'ediff-combined-diff-face
702 ;; (intern (format "ediff-fine-diff-face-%S" buf-type))))))
703 (priority (if default
705 (1+ (or (ediff-overlay-get
709 "ediff-current-diff-overlay-%S" buf-type
)))
713 (function (lambda (overl)
714 (ediff-overlay-put overl
'face face
)
715 (ediff-overlay-put overl
'priority priority
)))
718 ;; This assumes buffer C and that the region looks like a combination of
719 ;; regions in buffer A and C.
720 (defun ediff-set-fine-overlays-for-combined-merge (diff-list reg-num
)
721 (let (overlay1 overlay2 overlay3
)
722 (setq overlay1
(ediff-make-bullet-proof-overlay (nth 0 diff-list
)
725 overlay2
(ediff-make-bullet-proof-overlay (nth 2 diff-list
)
728 overlay3
(ediff-make-bullet-proof-overlay (nth 4 diff-list
)
731 (ediff-set-fine-diff-vector reg-num
'C
(vector overlay1 overlay2 overlay3
))
735 ;; Convert diff list to overlays for a given DIFF-REGION
736 ;; in buffer of type BUF-TYPE
737 (defun ediff-set-fine-overlays-in-one-buffer (buf-type diff-list region-num
)
738 (let* ((current-diff -
1)
739 (reg-start (ediff-get-diff-posn buf-type
'beg region-num
))
740 (buff (ediff-get-buffer buf-type
))
741 combined-merge-diff-list
742 diff-overlay-list list-element
745 (ediff-clear-fine-differences-in-one-buffer region-num buf-type
)
746 (setq diff-list
(cdr diff-list
)) ; discard list type (words or points)
747 (ediff-eval-in-buffer buff
(goto-char reg-start
))
749 ;; if it is a combined merge then set overlays in buff C specially
750 (if (and ediff-merge-job
(eq buf-type
'C
)
751 (setq combined-merge-diff-list
752 (ediff-looks-like-combined-merge region-num
)))
753 (ediff-set-fine-overlays-for-combined-merge
754 combined-merge-diff-list region-num
)
757 (setq current-diff
(1+ current-diff
)
758 list-element
(car diff-list
)
759 begin
(aref list-element
(cond ((eq buf-type
'A
) 0)
762 end
(aref list-element
(cond ((eq buf-type
'A
) 1)
765 (if (not (or begin end
))
767 ;; Put overlays at appropriate places in buffers
768 ;; convert lines to points, if necessary
769 (setq begin
(ediff-goto-word (1+ begin
) buff
)
770 end
(ediff-goto-word end buff
'end
))
771 (setq overlay
(ediff-make-bullet-proof-overlay begin end buff
))
772 ;; record all overlays for this difference region
773 (setq diff-overlay-list
(nconc diff-overlay-list
(list overlay
))))
775 (setq diff-list
(cdr diff-list
))
777 ;; convert the list of difference information into a vector
779 (ediff-set-fine-diff-vector
780 region-num buf-type
(apply 'vector diff-overlay-list
))
784 ;; Stolen from emerge.el
785 (defun ediff-get-diff3-group (file)
786 ;; This save-excursion allows ediff-get-diff3-group to be called for the
787 ;; various groups of lines (1, 2, 3) in any order, and for the lines to
788 ;; appear in any order. The reason this is necessary is that Gnu diff3
789 ;; can produce the groups in the order 1, 2, 3 or 1, 3, 2.
792 (concat "^" file
":\\([0-9]+\\)\\(,\\([0-9]+\\)\\)?\\([ac]\\)$"))
793 (beginning-of-line 2)
794 ;; treatment depends on whether it is an "a" group or a "c" group
795 (if (string-equal (buffer-substring (match-beginning 4) (match-end 4)) "c")
797 (if (match-beginning 2)
798 ;; it has two numbers
800 (buffer-substring (match-beginning 1) (match-end 1)))
802 (buffer-substring (match-beginning 3) (match-end 3)))))
804 (let ((x (string-to-int
805 (buffer-substring (match-beginning 1) (match-end 1)))))
807 ;; it is an "a" group
808 (let ((x (1+ (string-to-int
809 (buffer-substring (match-beginning 1) (match-end 1))))))
813 ;; If WORD-MODE, construct vector of diffs using word numbers.
814 ;; Else, use point values.
815 ;; WORD-MODE also tells if we are in the word-mode or not.
816 ;; If THREE-WAY-COMP, then it is a 3-way comparison. Else, it is merging
817 ;; with ancestor, in which case buffer-C contents is identical to buffer-A
818 ;; contents (unless buffer-A is narrowed.
819 ;; BOUNDS specifies visibility bounds to use.
820 (defun ediff-extract-diffs3 (diff-buffer word-mode three-way-comp
822 (let ((A-buffer ediff-buffer-A
)
823 (B-buffer ediff-buffer-B
)
824 (C-buffer ediff-buffer-C
)
825 (a-prev 1) ; needed to set the first diff line correctly
828 diff-list shift-A shift-B shift-C
831 ;; diff list contains word numbers or points, depending on word-mode
832 (setq diff-list
(cons (if word-mode
'words
'points
)
837 (ediff-get-value-according-to-buffer-type 'A bounds
))
840 (ediff-get-value-according-to-buffer-type 'B bounds
))
844 (ediff-get-value-according-to-buffer-type 'C bounds
)))))
846 ;; reset point in buffers A, B, C
847 (ediff-eval-in-buffer A-buffer
848 (goto-char (if shift-A shift-A
(point-min))))
849 (ediff-eval-in-buffer B-buffer
850 (goto-char (if shift-B shift-B
(point-min))))
851 (ediff-eval-in-buffer C-buffer
852 (goto-char (if shift-C shift-C
(point-min))))
854 (ediff-eval-in-buffer diff-buffer
855 (goto-char (point-min))
856 (while (re-search-forward ediff-match-diff3-line nil t
)
857 ;; leave point after matched line
858 (beginning-of-line 2)
859 (let ((agreement (buffer-substring (match-beginning 1) (match-end 1))))
860 ;; if the A and B files are the same and not 3way-comparison,
861 ;; ignore the difference
862 (if (or three-way-comp
(not (string-equal agreement
"3")))
863 (let* ((a-begin (car (ediff-get-diff3-group "1")))
864 (a-end (nth 1 (ediff-get-diff3-group "1")))
865 (b-begin (car (ediff-get-diff3-group "2")))
866 (b-end (nth 1 (ediff-get-diff3-group "2")))
868 (cond ((string-equal agreement
"1") 'prefer-A
)
869 ((string-equal agreement
"2") 'prefer-B
)
870 (t ediff-default-variant
)))
872 (if (memq state-of-merge
'(default-A prefer-A
)) 'B
'A
))
873 (state-of-diff-comparison
874 (cond ((string-equal agreement
"1") 'A
)
875 ((string-equal agreement
"2") 'B
)
876 ((string-equal agreement
"3") 'C
)))
879 b-begin-pt b-end-pt c-begin-pt c-end-pt
)
882 (setq c-begin
(car (ediff-get-diff3-group "3"))
883 c-end
(nth 1 (ediff-get-diff3-group "3")))
884 (if (eq ediff-default-variant
'default-B
)
885 (setq c-begin b-begin
887 (setq c-begin a-begin
890 ;; compute main diff vector
892 ;; make diff-list contain word numbers
896 (- a-begin a-prev
) (- a-end a-begin
)
897 (- b-begin b-prev
) (- b-end b-begin
)
898 (- c-begin c-prev
) (- c-end c-begin
)
899 nil nil
))) ; state of diff & merge
903 ;; else convert lines to points
904 (ediff-eval-in-buffer A-buffer
905 (forward-line (- a-begin a-prev
))
906 (setq a-begin-pt
(point))
907 (forward-line (- a-end a-begin
))
908 (setq a-end-pt
(point)
910 (ediff-eval-in-buffer B-buffer
911 (forward-line (- b-begin b-prev
))
912 (setq b-begin-pt
(point))
913 (forward-line (- b-end b-begin
))
914 (setq b-end-pt
(point)
916 (ediff-eval-in-buffer C-buffer
917 (forward-line (- c-begin c-prev
))
918 (setq c-begin-pt
(point))
919 (forward-line (- c-end c-begin
))
920 (setq c-end-pt
(point)
925 ;; if comparing with ancestor, then there also is a
926 ;; state-of-difference marker
932 state-of-diff-comparison
935 (list (vector a-begin-pt a-end-pt
944 ))) ; end ediff-eval-in-buffer
948 ;; Generate the difference vector and overlays for three files
949 ;; File-C is either the third file to compare (in case of 3-way comparison)
950 ;; or it is the ancestor file.
951 (defun ediff-setup-diff-regions3 (file-A file-B file-C
)
953 ;; force all minibuffers to display ediff's messages.
954 ;; when xemacs implements minibufferless screens, this won't be necessary
955 (if ediff-xemacs-p
(setq synchronize-minibuffers t
))
957 (or (ediff-buffer-live-p ediff-diff-buffer
)
958 (setq ediff-diff-buffer
959 (get-buffer-create (ediff-unique-buffer-name "*ediff-diff" "*"))))
961 (ediff-eval-in-buffer ediff-diff-buffer
963 ;; shell-command tends to display old shell command buffers even when it
964 ;; puts output in another buffer---probably an Emacs bug.
965 (ediff-kill-buffer-carefully "*Shell Command Output*")
966 (let ((shell-file-name ediff-shell
))
967 (message "Computing differences ...")(sit-for 0)
969 (format "%s %s %s %s %s"
970 ediff-diff3-program ediff-diff3-options
971 (ediff-protect-metachars file-A
)
972 (ediff-protect-metachars file-B
)
973 (ediff-protect-metachars file-C
))
977 (ediff-prepare-error-list ediff-diff3-ok-lines-regexp ediff-diff-buffer
)
978 (message "Computing differences ... done")(sit-for 0)
979 (ediff-convert-diffs-to-overlays
980 (ediff-extract-diffs3
982 ediff-word-mode ediff-3way-comparison-job ediff-narrow-bounds
)
986 ;; Execute shell COMMAND asynchronously and insert output in BUFFER.
987 ;; BUFFER must be a buffer object, and must be alive.
988 ;; There should be NO ampersand at the end of the command.
989 ;; We introduce this command because Emacs shell-command doesn't let us
990 ;; insert output in current buffer asynchronously.
991 ;; Most of this command was stolen from Emacs shell-command."
992 (defun ediff-shell-command (command buffer
)
993 (let ((data (match-data)))
995 (let ((directory default-directory
)
997 ;; If will kill a process, query first.
998 (setq proc
(get-buffer-process buffer
))
999 (if proc
(kill-process proc
))
1003 (setq default-directory directory
)
1004 (setq proc
(start-process "Shell" buffer
1005 shell-file-name
"-c" command
))
1006 (setq mode-line-process
'(":%s"))
1007 (set-process-sentinel proc
'ediff-shell-command-sentinel
)
1008 (set-process-filter proc
'ediff-shell-command-filter
)
1010 (store-match-data data
))))
1012 ;; This is shell-command-filter from simple.el in FSF Emacs.
1013 ;; Copied here because XEmacs doesn't have it.
1014 (defun ediff-shell-command-filter (proc string
)
1015 ;; Do save-excursion by hand so that we can leave point numerically unchanged
1016 ;; despite an insertion immediately after it.
1017 (let* ((obuf (current-buffer))
1018 (buffer (process-buffer proc
))
1020 (window (get-buffer-window buffer
))
1021 (pos (window-start window
)))
1025 (or (= (point) (point-max))
1026 (setq opoint
(point)))
1027 (goto-char (point-max))
1028 (insert-before-markers string
))
1029 ;; insert-before-markers moved this marker: set it back.
1030 (set-window-start window pos
)
1031 ;; Finish our save-excursion.
1034 (set-buffer obuf
))))
1036 ;; like shell-command-sentinel but doesn't print an exit status message
1037 ;; we do this because diff always exits with status 1, if diffs are found
1038 ;; so shell-command-sentinel displays a confusing message to the user
1039 (defun ediff-shell-command-sentinel (process signal
)
1040 (if (and (memq (process-status process
) '(exit signal
))
1041 (buffer-name (process-buffer process
)))
1044 (set-buffer (process-buffer process
))
1045 (setq mode-line-process nil
))
1046 (delete-process process
))))
1049 ;;; Word functions used to refine the current diff
1051 (defvar ediff-forward-word-function
'ediff-forward-word
1052 "*Function to call to move to the next word.
1053 Used for splitting difference regions into individual words.")
1055 (defvar ediff-whitespace
" \n\t\f"
1056 "*Characters constituting white space.
1057 These characters are ignored when differing regions are split into words.")
1059 ;;(defvar ediff-word-1 "a-zA-Z---_`'.?!:"
1060 (defvar ediff-word-1
"a-zA-Z---_"
1061 "*Characters that constitute words of type 1.
1062 More precisely, [ediff-word-1] is a regexp that matches type 1 words.
1063 See `ediff-forward-word' for more details.")
1065 (defvar ediff-word-2
"0-9.,"
1066 "*Characters that constitute words of type 2.
1067 More precisely, [ediff-word-2] is a regexp that matches type 2 words.
1068 See `ediff-forward-word' for more details.")
1070 (defvar ediff-word-3
"`'?!:;\"{}[]()"
1071 "*Characters that constitute words of type 3.
1072 More precisely, [ediff-word-3] is a regexp that matches type 3 words.
1073 See `ediff-forward-word' for more details.")
1075 (defvar ediff-word-4
1076 (concat "^" ediff-word-1 ediff-word-2 ediff-word-3 ediff-whitespace
)
1077 "*Characters that constitute words of type 4.
1078 More precisely, [ediff-word-4] is a regexp that matches type 4 words.
1079 See `ediff-forward-word' for more details.")
1081 ;; Split region along word boundaries. Each word will be on its own line.
1082 ;; Output to buffer out-buffer.
1083 (defun ediff-forward-word ()
1084 "Move point one word forward.
1085 There are four types of words, each of which consists entirely of
1086 characters in `ediff-word-1', `ediff-word-2', `ediff-word-3', or
1087 `ediff-word-4'. Words are recognized by passing these in turn as the
1088 argument to `skip-chars-forward'."
1089 (or (> (skip-chars-forward ediff-word-1
) 0)
1090 (> (skip-chars-forward ediff-word-2
) 0)
1091 (> (skip-chars-forward ediff-word-3
) 0)
1092 (> (skip-chars-forward ediff-word-4
) 0)
1095 (defun ediff-wordify (beg end in-buffer out-buffer
&optional control-buf
)
1096 (let (sv-point string
)
1098 (set-buffer in-buffer
)
1099 (setq string
(buffer-substring beg end
))
1101 (set-buffer out-buffer
)
1104 (goto-char (point-min))
1105 (skip-chars-forward ediff-whitespace
)
1106 (delete-region (point-min) (point))
1109 ;; eval incontrol buf to let user create local versions for
1110 ;; different invocations
1113 (ediff-eval-in-buffer control-buf ediff-forward-word-function
))
1114 (funcall ediff-forward-word-function
))
1115 (setq sv-point
(point))
1116 (skip-chars-forward ediff-whitespace
)
1117 (delete-region sv-point
(point))
1120 ;; copy string from BEG END from IN-BUF to OUT-BUF
1121 (defun ediff-copy-to-buffer (beg end in-buffer out-buffer
)
1124 (set-buffer in-buffer
)
1125 (setq string
(buffer-substring beg end
))
1127 (set-buffer out-buffer
)
1130 (goto-char (point-min)))))
1133 ;; goto word #n starting at current position in buffer `buf'
1134 ;; For ediff, a word is either a string of a-z,A-Z, incl `-' and `_';
1135 ;; or a string of other non-blanks. A blank is a \n\t\f
1136 ;; If `flag' is non-nil, goto the end of the n-th word.
1137 (defun ediff-goto-word (n buf
&optional flag
)
1138 ;; remember val ediff-forward-word-function has in ctl buf
1139 (let ((fwd-word-fun ediff-forward-word-function
))
1140 (ediff-eval-in-buffer buf
1141 (skip-chars-forward ediff-whitespace
)
1143 (funcall fwd-word-fun
)
1144 (skip-chars-forward ediff-whitespace
)
1146 (if (and flag
(> n
0))
1147 (funcall fwd-word-fun
))
1151 (provide 'ediff-diff
)
1154 ;; ediff-diff.el ends here