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