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