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