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