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