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