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