Commit | Line | Data |
---|---|---|
475f9031 | 1 | ;;; ediff-diff.el --- diff-related utilities |
b578f267 | 2 | |
0d30b337 | 3 | ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
409cc4a3 | 4 | ;; 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
475f9031 | 5 | |
50a07e18 | 6 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
475f9031 KH |
7 | |
8 | ;; This file is part of GNU Emacs. | |
9 | ||
10 | ;; GNU Emacs is free software; you can redistribute it and/or modify | |
11 | ;; it under the terms of the GNU General Public License as published by | |
b4aa6026 | 12 | ;; the Free Software Foundation; either version 3, or (at your option) |
475f9031 KH |
13 | ;; any later version. |
14 | ||
15 | ;; GNU Emacs is distributed in the hope that it will be useful, | |
16 | ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 | ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 | ;; GNU General Public License for more details. | |
19 | ||
20 | ;; You should have received a copy of the GNU General Public License | |
b578f267 | 21 | ;; along with GNU Emacs; see the file COPYING. If not, write to the |
086add15 LK |
22 | ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
23 | ;; Boston, MA 02110-1301, USA. | |
475f9031 | 24 | |
3afbc435 PJ |
25 | ;;; Commentary: |
26 | ||
b578f267 | 27 | ;;; Code: |
475f9031 | 28 | |
ddc90f39 | 29 | |
2d84cc27 MK |
30 | (provide 'ediff-diff) |
31 | ||
ddc90f39 MK |
32 | ;; compiler pacifier |
33 | (defvar ediff-default-variant) | |
50a07e18 | 34 | (defvar null-device) |
1a24f45a | 35 | (defvar longlines-mode) |
ddc90f39 MK |
36 | |
37 | (eval-when-compile | |
2d84cc27 MK |
38 | (require 'ediff-init) |
39 | (if (not (featurep 'ediff-util)) | |
40 | (require 'ediff-util)) | |
41 | ) | |
ddc90f39 MK |
42 | ;; end pacifier |
43 | ||
b578f267 | 44 | (require 'ediff-init) |
475f9031 | 45 | |
ddc90f39 | 46 | (defgroup ediff-diff nil |
3b9ae202 | 47 | "Diff related utilities." |
ddc90f39 MK |
48 | :prefix "ediff-" |
49 | :group 'ediff) | |
50 | ||
7d027816 MK |
51 | (defcustom ediff-diff-program "diff" |
52 | "*Program to use for generating the differential of the two files." | |
53 | :type 'string | |
54 | :group 'ediff-diff) | |
55 | (defcustom ediff-diff3-program "diff3" | |
56 | "*Program to be used for three-way comparison. | |
57 | Must produce output compatible with Unix's diff3 program." | |
58 | :type 'string | |
59 | :group 'ediff-diff) | |
60 | ||
513bea45 | 61 | |
7d027816 | 62 | ;; The following functions must precede all defcustom-defined variables. |
4ae69eac | 63 | |
ec6aebe8 MK |
64 | (fset 'ediff-set-actual-diff-options '(lambda () nil)) |
65 | ||
ddc90f39 | 66 | (defcustom ediff-shell |
475f9031 | 67 | (cond ((eq system-type 'emx) "cmd") ; OS/2 |
bbe6126c MK |
68 | ((memq system-type '(ms-dos windows-nt windows-95)) |
69 | shell-file-name) ; no standard name on MS-DOS | |
475f9031 KH |
70 | ((memq system-type '(vax-vms axp-vms)) "*dcl*") ; VMS |
71 | (t "sh")) ; UNIX | |
50a07e18 MK |
72 | "*The shell used to run diff and patch. |
73 | If user's .profile or .cshrc files are set up correctly, any shell | |
74 | will do. However, some people set $prompt or other things | |
75 | incorrectly, which leads to undesirable output messages. These may | |
76 | cause Ediff to fail. In such a case, set `ediff-shell' to a shell that | |
77 | you are not using or, better, fix your shell's startup file." | |
ddc90f39 MK |
78 | :type 'string |
79 | :group 'ediff-diff) | |
475f9031 | 80 | |
328b4b70 MK |
81 | (defcustom ediff-cmp-program "cmp" |
82 | "*Utility to use to determine if two files are identical. | |
83 | It must return code 0, if its arguments are identical files." | |
84 | :type 'string | |
85 | :group 'ediff-diff) | |
475f9031 | 86 | |
3af0304a | 87 | (defcustom ediff-cmp-options nil |
ff4968b6 RS |
88 | "*Options to pass to `ediff-cmp-program'. |
89 | If GNU diff is used as `ediff-cmp-program', then the most useful options | |
50a07e18 | 90 | are `-I REGEXP', to ignore changes whose lines match the REGEXP." |
3af0304a MK |
91 | :type '(repeat string) |
92 | :group 'ediff-diff) | |
93 | ||
33468a59 MK |
94 | (defun ediff-set-diff-options (symbol value) |
95 | (set symbol value) | |
96 | (ediff-set-actual-diff-options)) | |
97 | ||
98 | (defcustom ediff-diff-options | |
99 | (if (memq system-type '(ms-dos windows-nt windows-95)) "--binary" "") | |
71296446 | 100 | "*Options to pass to `ediff-diff-program'. |
09fd8197 | 101 | If Unix diff is used as `ediff-diff-program', |
c6a85d16 MK |
102 | then a useful option is `-w', to ignore space. |
103 | Options `-c', `-u', and `-i' are not allowed. Case sensitivity can be | |
104 | toggled interactively using \\[ediff-toggle-ignore-case]. | |
105 | ||
33468a59 MK |
106 | Do not remove the default options. If you need to change this variable, add new |
107 | options after the default ones. | |
108 | ||
c6a85d16 | 109 | This variable is not for customizing the look of the differences produced by |
36ba07ae | 110 | the command \\[ediff-show-diff-output]. Use the variable |
c6a85d16 | 111 | `ediff-custom-diff-options' for that." |
33468a59 | 112 | :set 'ediff-set-diff-options |
ddc90f39 MK |
113 | :type 'string |
114 | :group 'ediff-diff) | |
475f9031 | 115 | |
b6178721 MK |
116 | (ediff-defvar-local ediff-ignore-case nil |
117 | "*If t, skip over difference regions that differ only in letter case. | |
118 | This variable can be set either in .emacs or toggled interactively. | |
119 | Use `setq-default' if setting it in .emacs") | |
120 | ||
121 | (defcustom ediff-ignore-case-option "-i" | |
122 | "*Option that causes the diff program to ignore case of letters." | |
123 | :type 'string | |
124 | :group 'ediff-diff) | |
125 | ||
126 | (defcustom ediff-ignore-case-option3 "" | |
127 | "*Option that causes the diff3 program to ignore case of letters. | |
128 | GNU diff3 doesn't have such an option." | |
129 | :type 'string | |
130 | :group 'ediff-diff) | |
131 | ||
132 | ;; the actual options used in comparison | |
ec6aebe8 | 133 | (ediff-defvar-local ediff-actual-diff-options ediff-diff-options "") |
b6178721 | 134 | |
ddc90f39 | 135 | (defcustom ediff-custom-diff-program ediff-diff-program |
475f9031 | 136 | "*Program to use for generating custom diff output for saving it in a file. |
ddc90f39 MK |
137 | This output is not used by Ediff internally." |
138 | :type 'string | |
139 | :group 'ediff-diff) | |
140 | (defcustom ediff-custom-diff-options "-c" | |
141 | "*Options to pass to `ediff-custom-diff-program'." | |
142 | :type 'string | |
143 | :group 'ediff-diff) | |
475f9031 KH |
144 | |
145 | ;;; Support for diff3 | |
146 | ||
4960e757 | 147 | (defvar ediff-match-diff3-line "^====\\(.?\\)\C-m?$" |
475f9031 | 148 | "Pattern to match lines produced by diff3 that describe differences.") |
50a07e18 | 149 | (defcustom ediff-diff3-options "" |
ddc90f39 | 150 | "*Options to pass to `ediff-diff3-program'." |
33468a59 | 151 | :set 'ediff-set-diff-options |
ddc90f39 MK |
152 | :type 'string |
153 | :group 'ediff-diff) | |
b6178721 MK |
154 | |
155 | ;; the actual options used in comparison | |
ec6aebe8 | 156 | (ediff-defvar-local ediff-actual-diff3-options ediff-diff3-options "") |
b6178721 | 157 | |
ddc90f39 | 158 | (defcustom ediff-diff3-ok-lines-regexp |
bbe6126c | 159 | "^\\([1-3]:\\|====\\| \\|.*Warning *:\\|.*No newline\\|.*missing newline\\|^\C-m$\\)" |
475f9031 | 160 | "*Regexp that matches normal output lines from `ediff-diff3-program'. |
ddc90f39 MK |
161 | Lines that do not match are assumed to be error messages." |
162 | :type 'regexp | |
163 | :group 'ediff-diff) | |
475f9031 KH |
164 | |
165 | ;; keeps the status of the current diff in 3-way jobs. | |
166 | ;; the status can be =diff(A), =diff(B), or =diff(A+B) | |
167 | (ediff-defvar-local ediff-diff-status "" "") | |
168 | ||
71296446 | 169 | |
50a07e18 | 170 | ;;; Fine differences |
475f9031 | 171 | |
4ae69eac | 172 | (ediff-defvar-local ediff-auto-refine (if (ediff-has-face-support-p) 'on 'nix) |
475f9031 KH |
173 | "If `on', Ediff auto-highlights fine diffs for the current diff region. |
174 | If `off', auto-highlighting is not used. If `nix', no fine diffs are shown | |
175 | at all, unless the user force-refines the region by hitting `*'. | |
176 | ||
177 | This variable can be set either in .emacs or toggled interactively. | |
178 | Use `setq-default' if setting it in .emacs") | |
179 | ||
180 | (ediff-defvar-local ediff-ignore-similar-regions nil | |
181 | "*If t, skip over difference regions that differ only in the white space and line breaks. | |
182 | This variable can be set either in .emacs or toggled interactively. | |
183 | Use `setq-default' if setting it in .emacs") | |
184 | ||
b6178721 | 185 | (ediff-defvar-local ediff-auto-refine-limit 14000 |
bbe6126c | 186 | "*Auto-refine only the regions of this size \(in bytes\) or less.") |
71296446 | 187 | |
475f9031 KH |
188 | ;;; General |
189 | ||
50a07e18 | 190 | (defvar ediff-diff-ok-lines-regexp |
c004db97 MK |
191 | (concat |
192 | "^\\(" | |
193 | "[0-9,]+[acd][0-9,]+\C-m?$" | |
194 | "\\|[<>] " | |
195 | "\\|---" | |
196 | "\\|.*Warning *:" | |
197 | "\\|.*No +newline" | |
198 | "\\|.*missing +newline" | |
199 | "\\|^\C-m?$" | |
200 | "\\)") | |
475f9031 KH |
201 | "Regexp that matches normal output lines from `ediff-diff-program'. |
202 | This is mostly lifted from Emerge, except that Ediff also considers | |
203 | warnings and `Missing newline'-type messages to be normal output. | |
204 | Lines that do not match are assumed to be error messages.") | |
205 | ||
c004db97 MK |
206 | (defvar ediff-match-diff-line |
207 | (let ((x "\\([0-9]+\\)\\(\\|,\\([0-9]+\\)\\)")) | |
208 | (concat "^" x "\\([acd]\\)" x "\C-m?$")) | |
475f9031 KH |
209 | "Pattern to match lines produced by diff that describe differences.") |
210 | ||
211 | (ediff-defvar-local ediff-setup-diff-regions-function nil | |
212 | "value is a function symbol depending on the kind of job is to be done. | |
213 | For 2-way jobs and for ediff-merge, it should be `ediff-setup-diff-regions'. | |
214 | For jobs requiring diff3, it should be `ediff-setup-diff-regions3'. | |
215 | ||
216 | The function should take three mandatory arguments, file-A, file-B, and | |
217 | file-C. It may ignore file C for diff2 jobs. It should also take | |
218 | one optional arguments, diff-number to refine.") | |
219 | ||
71296446 | 220 | |
475f9031 KH |
221 | ;;; Functions |
222 | ||
223 | ;; Generate the difference vector and overlays for the two files | |
224 | ;; With optional arg REG-TO-REFINE, refine this region. | |
225 | ;; File-C argument is not used here. It is there just because | |
226 | ;; ediff-setup-diff-regions is called via a funcall to | |
227 | ;; ediff-setup-diff-regions-function, which can also have the value | |
228 | ;; ediff-setup-diff-regions3, which takes 4 arguments. | |
229 | (defun ediff-setup-diff-regions (file-A file-B file-C) | |
c6a85d16 MK |
230 | ;; looking for '-c', '-i', '-u', or 'c', 'i', 'u' among clustered non-long options |
231 | (if (string-match "^-[ciu]\\| -[ciu]\\|\\(^\\| \\)-[^- ]+[ciu]" | |
608c89a9 | 232 | ediff-diff-options) |
c6a85d16 | 233 | (error "Options `-c', `-u', and `-i' are not allowed in `ediff-diff-options'")) |
71296446 | 234 | |
bbe6126c | 235 | ;; create, if it doesn't exist |
475f9031 KH |
236 | (or (ediff-buffer-live-p ediff-diff-buffer) |
237 | (setq ediff-diff-buffer | |
238 | (get-buffer-create (ediff-unique-buffer-name "*ediff-diff" "*")))) | |
bbe6126c | 239 | (ediff-make-diff2-buffer ediff-diff-buffer file-A file-B) |
475f9031 | 240 | (ediff-prepare-error-list ediff-diff-ok-lines-regexp ediff-diff-buffer) |
475f9031 KH |
241 | (ediff-convert-diffs-to-overlays |
242 | (ediff-extract-diffs | |
4ae69eac | 243 | ediff-diff-buffer ediff-word-mode ediff-narrow-bounds))) |
bbe6126c | 244 | |
52fa07ba MK |
245 | ;; Run the diff program on FILE1 and FILE2 and put the output in DIFF-BUFFER |
246 | ;; Return the size of DIFF-BUFFER | |
513bea45 | 247 | ;; The return code isn't used in the program at present. |
bbe6126c | 248 | (defun ediff-make-diff2-buffer (diff-buffer file1 file2) |
92c51e07 MK |
249 | (let ((file1-size (ediff-file-size file1)) |
250 | (file2-size (ediff-file-size file2))) | |
251 | (cond ((not (numberp file1-size)) | |
252 | (message "Can't find file: %s" | |
253 | (ediff-abbreviate-file-name file1)) | |
254 | (sit-for 2) | |
255 | ;; 1 is an error exit code | |
256 | 1) | |
257 | ((not (numberp file2-size)) | |
258 | (message "Can't find file: %s" | |
259 | (ediff-abbreviate-file-name file2)) | |
260 | (sit-for 2) | |
261 | ;; 1 is an error exit code | |
262 | 1) | |
92c51e07 MK |
263 | (t (message "Computing differences between %s and %s ..." |
264 | (file-name-nondirectory file1) | |
265 | (file-name-nondirectory file2)) | |
266 | ;; this erases the diff buffer automatically | |
267 | (ediff-exec-process ediff-diff-program | |
268 | diff-buffer | |
269 | 'synchronize | |
b6178721 | 270 | ediff-actual-diff-options file1 file2) |
92c51e07 | 271 | (message "") |
e756eb9f | 272 | (ediff-with-current-buffer diff-buffer |
92c51e07 | 273 | (buffer-size)))))) |
bbe6126c | 274 | |
71296446 JB |
275 | |
276 | ||
475f9031 KH |
277 | ;; If file-A/B/C is nil, do 2-way comparison with the non-nil buffers |
278 | ;; This function works for diff3 and diff2 jobs | |
279 | (defun ediff-setup-fine-diff-regions (file-A file-B file-C reg-num) | |
280 | (or (ediff-buffer-live-p ediff-fine-diff-buffer) | |
281 | (setq ediff-fine-diff-buffer | |
282 | (get-buffer-create | |
283 | (ediff-unique-buffer-name "*ediff-fine-diff" "*")))) | |
71296446 | 284 | |
ab8a391e | 285 | (let (diff3-job diff-program diff-options ok-regexp diff-list) |
475f9031 KH |
286 | (setq diff3-job ediff-3way-job |
287 | diff-program (if diff3-job ediff-diff3-program ediff-diff-program) | |
b6178721 MK |
288 | diff-options (if diff3-job |
289 | ediff-actual-diff3-options | |
290 | ediff-actual-diff-options) | |
475f9031 KH |
291 | ok-regexp (if diff3-job |
292 | ediff-diff3-ok-lines-regexp | |
293 | ediff-diff-ok-lines-regexp)) | |
71296446 | 294 | |
4ad42cb5 MK |
295 | (ediff-message-if-verbose "Refining difference region %d ..." (1+ reg-num)) |
296 | (ediff-exec-process diff-program ediff-fine-diff-buffer 'synchronize | |
ab8a391e | 297 | diff-options |
4ad42cb5 MK |
298 | ;; The shuffle below is because we can compare 3-way |
299 | ;; or in several 2-way fashions, like fA fC, fA fB, | |
300 | ;; or fB fC. | |
301 | (if file-A file-A file-B) | |
302 | (if file-B file-B file-A) | |
303 | (if diff3-job | |
304 | (if file-C file-C file-B)) | |
305 | ) ; exec process | |
71296446 | 306 | |
475f9031 | 307 | (ediff-prepare-error-list ok-regexp ediff-fine-diff-buffer) |
4ae69eac MK |
308 | (ediff-message-if-verbose |
309 | "") | |
4ad42cb5 | 310 | ;; "Refining difference region %d ... done" (1+ reg-num)) |
71296446 | 311 | |
475f9031 KH |
312 | (setq diff-list |
313 | (if diff3-job | |
314 | (ediff-extract-diffs3 | |
315 | ediff-fine-diff-buffer '3way-comparison 'word-mode) | |
316 | (ediff-extract-diffs ediff-fine-diff-buffer 'word-mode))) | |
317 | ;; fixup diff-list | |
318 | (if diff3-job | |
319 | (cond ((not file-A) | |
36ba07ae JB |
320 | (mapc (lambda (elt) |
321 | (aset elt 0 nil) | |
322 | (aset elt 1 nil)) | |
323 | (cdr diff-list))) | |
475f9031 | 324 | ((not file-B) |
36ba07ae JB |
325 | (mapc (lambda (elt) |
326 | (aset elt 2 nil) | |
327 | (aset elt 3 nil)) | |
328 | (cdr diff-list))) | |
475f9031 | 329 | ((not file-C) |
36ba07ae JB |
330 | (mapc (lambda (elt) |
331 | (aset elt 4 nil) | |
332 | (aset elt 5 nil)) | |
333 | (cdr diff-list))) | |
475f9031 | 334 | )) |
71296446 | 335 | |
475f9031 KH |
336 | (ediff-convert-fine-diffs-to-overlays diff-list reg-num) |
337 | )) | |
71296446 JB |
338 | |
339 | ||
475f9031 | 340 | (defun ediff-prepare-error-list (ok-regexp diff-buff) |
4ad42cb5 MK |
341 | (or (ediff-buffer-live-p ediff-error-buffer) |
342 | (setq ediff-error-buffer | |
343 | (get-buffer-create (ediff-unique-buffer-name | |
344 | "*ediff-errors" "*")))) | |
e756eb9f | 345 | (ediff-with-current-buffer ediff-error-buffer |
e392d1cc | 346 | (setq buffer-undo-list t) |
4ad42cb5 | 347 | (erase-buffer) |
e756eb9f | 348 | (insert (ediff-with-current-buffer diff-buff (buffer-string))) |
4ad42cb5 MK |
349 | (goto-char (point-min)) |
350 | (delete-matching-lines ok-regexp) | |
351 | (if (memq system-type '(vax-vms axp-vms)) | |
352 | (delete-matching-lines "^$"))) | |
353 | ;; If diff reports errors, show them then quit. | |
e756eb9f | 354 | (if (/= 0 (ediff-with-current-buffer ediff-error-buffer (buffer-size))) |
4ad42cb5 MK |
355 | (let ((ctl-buf ediff-control-buffer) |
356 | (error-buf ediff-error-buffer)) | |
357 | (ediff-skip-unsuitable-frames) | |
358 | (switch-to-buffer error-buf) | |
359 | (ediff-kill-buffer-carefully ctl-buf) | |
50a07e18 | 360 | (error "Errors in diff output. Diff output is in %S" diff-buff)))) |
475f9031 KH |
361 | |
362 | ;; BOUNDS specifies visibility bounds to use. | |
363 | ;; WORD-MODE tells whether we are in the word-mode or not. | |
364 | ;; If WORD-MODE, also construct vector of diffs using word numbers. | |
365 | ;; Else, use point values. | |
366 | ;; This function handles diff-2 jobs including the case of | |
367 | ;; merging buffers and files without ancestor. | |
368 | (defun ediff-extract-diffs (diff-buffer word-mode &optional bounds) | |
369 | (let ((A-buffer ediff-buffer-A) | |
370 | (B-buffer ediff-buffer-B) | |
371 | (C-buffer ediff-buffer-C) | |
372 | (a-prev 1) ; this is needed to set the first diff line correctly | |
b6178721 | 373 | (a-prev-pt nil) |
475f9031 | 374 | (b-prev 1) |
b6178721 | 375 | (b-prev-pt nil) |
475f9031 | 376 | (c-prev 1) |
b6178721 | 377 | (c-prev-pt nil) |
475f9031 KH |
378 | diff-list shift-A shift-B |
379 | ) | |
09fd8197 | 380 | |
475f9031 KH |
381 | ;; diff list contains word numbers, unless changed later |
382 | (setq diff-list (cons (if word-mode 'words 'points) | |
383 | diff-list)) | |
384 | ;; we don't use visibility bounds for buffer C when merging | |
385 | (if bounds | |
386 | (setq shift-A | |
387 | (ediff-overlay-start | |
388 | (ediff-get-value-according-to-buffer-type 'A bounds)) | |
50a07e18 | 389 | shift-B |
475f9031 KH |
390 | (ediff-overlay-start |
391 | (ediff-get-value-according-to-buffer-type 'B bounds)))) | |
09fd8197 | 392 | |
475f9031 | 393 | ;; reset point in buffers A/B/C |
e756eb9f | 394 | (ediff-with-current-buffer A-buffer |
475f9031 | 395 | (goto-char (if shift-A shift-A (point-min)))) |
e756eb9f | 396 | (ediff-with-current-buffer B-buffer |
475f9031 KH |
397 | (goto-char (if shift-B shift-B (point-min)))) |
398 | (if (ediff-buffer-live-p C-buffer) | |
e756eb9f | 399 | (ediff-with-current-buffer C-buffer |
475f9031 | 400 | (goto-char (point-min)))) |
71296446 | 401 | |
e756eb9f | 402 | (ediff-with-current-buffer diff-buffer |
475f9031 KH |
403 | (goto-char (point-min)) |
404 | (while (re-search-forward ediff-match-diff-line nil t) | |
027a4b6b JB |
405 | (let* ((a-begin (string-to-number (buffer-substring (match-beginning 1) |
406 | (match-end 1)))) | |
475f9031 KH |
407 | (a-end (let ((b (match-beginning 3)) |
408 | (e (match-end 3))) | |
409 | (if b | |
027a4b6b | 410 | (string-to-number (buffer-substring b e)) |
475f9031 KH |
411 | a-begin))) |
412 | (diff-type (buffer-substring (match-beginning 4) (match-end 4))) | |
027a4b6b JB |
413 | (b-begin (string-to-number (buffer-substring (match-beginning 5) |
414 | (match-end 5)))) | |
475f9031 KH |
415 | (b-end (let ((b (match-beginning 7)) |
416 | (e (match-end 7))) | |
417 | (if b | |
027a4b6b | 418 | (string-to-number (buffer-substring b e)) |
475f9031 KH |
419 | b-begin))) |
420 | a-begin-pt a-end-pt b-begin-pt b-end-pt | |
421 | c-begin c-end c-begin-pt c-end-pt) | |
422 | ;; fix the beginning and end numbers, because diff is somewhat | |
423 | ;; strange about how it numbers lines | |
424 | (if (string-equal diff-type "a") | |
425 | (setq b-end (1+ b-end) | |
426 | a-begin (1+ a-begin) | |
427 | a-end a-begin) | |
428 | (if (string-equal diff-type "d") | |
429 | (setq a-end (1+ a-end) | |
430 | b-begin (1+ b-begin) | |
431 | b-end b-begin) | |
432 | ;; (string-equal diff-type "c") | |
433 | (setq a-end (1+ a-end) | |
434 | b-end (1+ b-end)))) | |
71296446 | 435 | |
475f9031 KH |
436 | (if (eq ediff-default-variant 'default-B) |
437 | (setq c-begin b-begin | |
438 | c-end b-end) | |
439 | (setq c-begin a-begin | |
440 | c-end a-end)) | |
71296446 | 441 | |
475f9031 KH |
442 | ;; compute main diff vector |
443 | (if word-mode | |
444 | ;; make diff-list contain word numbers | |
50a07e18 | 445 | (setq diff-list |
475f9031 KH |
446 | (nconc diff-list |
447 | (list | |
448 | (if (ediff-buffer-live-p C-buffer) | |
449 | (vector (- a-begin a-prev) (- a-end a-begin) | |
450 | (- b-begin b-prev) (- b-end b-begin) | |
451 | (- c-begin c-prev) (- c-end c-begin) | |
4ad42cb5 MK |
452 | nil nil ; dummy ancestor |
453 | nil ; state of diff | |
454 | nil ; state of merge | |
455 | nil ; state of ancestor | |
475f9031 KH |
456 | ) |
457 | (vector (- a-begin a-prev) (- a-end a-begin) | |
458 | (- b-begin b-prev) (- b-end b-begin) | |
459 | nil nil ; dummy buf C | |
4ad42cb5 | 460 | nil nil ; dummy ancestor |
475f9031 KH |
461 | nil ; state of diff |
462 | nil ; state of merge | |
4ad42cb5 | 463 | nil ; state of ancestor |
475f9031 KH |
464 | )) |
465 | )) | |
466 | a-prev a-end | |
467 | b-prev b-end | |
468 | c-prev c-end) | |
469 | ;; else convert lines to points | |
e756eb9f | 470 | (ediff-with-current-buffer A-buffer |
8ea74b0e MK |
471 | (let ((longlines-mode-val |
472 | (if (and (boundp 'longlines-mode) longlines-mode) 1 0))) | |
473 | ;; we must disable and then restore longlines-mode | |
474 | (if (eq longlines-mode-val 1) | |
475 | (longlines-mode 0)) | |
b6178721 | 476 | (goto-char (or a-prev-pt shift-A (point-min))) |
8ea74b0e MK |
477 | (forward-line (- a-begin a-prev)) |
478 | (setq a-begin-pt (point)) | |
479 | (forward-line (- a-end a-begin)) | |
480 | (setq a-end-pt (point) | |
b6178721 MK |
481 | a-prev a-end |
482 | a-prev-pt a-end-pt) | |
8ea74b0e MK |
483 | (if (eq longlines-mode-val 1) |
484 | (longlines-mode longlines-mode-val)) | |
485 | )) | |
e756eb9f | 486 | (ediff-with-current-buffer B-buffer |
8ea74b0e MK |
487 | (let ((longlines-mode-val |
488 | (if (and (boundp 'longlines-mode) longlines-mode) 1 0))) | |
489 | (if (eq longlines-mode-val 1) | |
490 | (longlines-mode 0)) | |
b6178721 | 491 | (goto-char (or b-prev-pt shift-B (point-min))) |
8ea74b0e MK |
492 | (forward-line (- b-begin b-prev)) |
493 | (setq b-begin-pt (point)) | |
494 | (forward-line (- b-end b-begin)) | |
495 | (setq b-end-pt (point) | |
b6178721 MK |
496 | b-prev b-end |
497 | b-prev-pt b-end-pt) | |
8ea74b0e MK |
498 | (if (eq longlines-mode-val 1) |
499 | (longlines-mode longlines-mode-val)) | |
500 | )) | |
475f9031 | 501 | (if (ediff-buffer-live-p C-buffer) |
e756eb9f | 502 | (ediff-with-current-buffer C-buffer |
8ea74b0e MK |
503 | (let ((longlines-mode-val |
504 | (if (and (boundp 'longlines-mode) longlines-mode) 1 0))) | |
505 | (if (eq longlines-mode-val 1) | |
506 | (longlines-mode 0)) | |
b6178721 | 507 | (goto-char (or c-prev-pt (point-min))) |
8ea74b0e MK |
508 | (forward-line (- c-begin c-prev)) |
509 | (setq c-begin-pt (point)) | |
510 | (forward-line (- c-end c-begin)) | |
511 | (setq c-end-pt (point) | |
b6178721 MK |
512 | c-prev c-end |
513 | c-prev-pt c-end-pt) | |
8ea74b0e MK |
514 | (if (eq longlines-mode-val 1) |
515 | (longlines-mode longlines-mode-val)) | |
516 | ))) | |
50a07e18 | 517 | (setq diff-list |
475f9031 KH |
518 | (nconc |
519 | diff-list | |
520 | (list | |
521 | (if (ediff-buffer-live-p C-buffer) | |
522 | (vector | |
523 | a-begin-pt a-end-pt b-begin-pt b-end-pt | |
524 | c-begin-pt c-end-pt | |
4ad42cb5 | 525 | nil nil ; dummy ancestor |
475f9031 KH |
526 | ;; state of diff |
527 | ;; shows which buff is different from the other two | |
528 | (if (eq ediff-default-variant 'default-B) 'A 'B) | |
4ad42cb5 MK |
529 | ediff-default-variant ; state of merge |
530 | nil ; state of ancestor | |
475f9031 | 531 | ) |
4ad42cb5 MK |
532 | (vector a-begin-pt a-end-pt |
533 | b-begin-pt b-end-pt | |
534 | nil nil ; dummy buf C | |
535 | nil nil ; dummy ancestor | |
536 | nil nil ; dummy state of diff & merge | |
537 | nil ; dummy state of ancestor | |
50a07e18 | 538 | ))) |
475f9031 | 539 | ))) |
71296446 | 540 | |
e756eb9f | 541 | ))) ; end ediff-with-current-buffer |
475f9031 KH |
542 | diff-list |
543 | )) | |
71296446 | 544 | |
475f9031 | 545 | |
4ad42cb5 MK |
546 | (defun ediff-convert-diffs-to-overlays (diff-list) |
547 | (ediff-set-diff-overlays-in-one-buffer 'A diff-list) | |
548 | (ediff-set-diff-overlays-in-one-buffer 'B diff-list) | |
549 | (if ediff-3way-job | |
550 | (ediff-set-diff-overlays-in-one-buffer 'C diff-list)) | |
551 | (if ediff-merge-with-ancestor-job | |
552 | (ediff-set-diff-overlays-in-one-buffer 'Ancestor diff-list)) | |
553 | ;; set up vector showing the status of merge regions | |
554 | (if ediff-merge-job | |
555 | (setq ediff-state-of-merge | |
556 | (vconcat | |
3af0304a MK |
557 | (mapcar (lambda (elt) |
558 | (let ((state-of-merge (aref elt 9)) | |
559 | (state-of-ancestor (aref elt 10))) | |
560 | (vector | |
561 | ;; state of merge: prefers/default-A/B or combined | |
562 | (if state-of-merge (format "%S" state-of-merge)) | |
563 | ;; whether the ancestor region is empty | |
564 | state-of-ancestor))) | |
4ad42cb5 MK |
565 | ;; the first elt designates type of list |
566 | (cdr diff-list)) | |
567 | ))) | |
568 | (message "Processing difference regions ... done")) | |
569 | ||
71296446 | 570 | |
475f9031 KH |
571 | (defun ediff-set-diff-overlays-in-one-buffer (buf-type diff-list) |
572 | (let* ((current-diff -1) | |
573 | (buff (ediff-get-buffer buf-type)) | |
17561e4f | 574 | (ctl-buf ediff-control-buffer) |
475f9031 KH |
575 | ;; ediff-extract-diffs puts the type of diff-list as the first elt |
576 | ;; of this list. The type is either 'points or 'words | |
577 | (diff-list-type (car diff-list)) | |
578 | (shift (ediff-overlay-start | |
579 | (ediff-get-value-according-to-buffer-type | |
580 | buf-type ediff-narrow-bounds))) | |
581 | (limit (ediff-overlay-end | |
50a07e18 | 582 | (ediff-get-value-according-to-buffer-type |
475f9031 KH |
583 | buf-type ediff-narrow-bounds))) |
584 | diff-overlay-list list-element total-diffs | |
4ad42cb5 | 585 | begin end pt-saved overlay state-of-diff) |
475f9031 KH |
586 | |
587 | (setq diff-list (cdr diff-list)) ; discard diff list type | |
588 | (setq total-diffs (length diff-list)) | |
71296446 | 589 | |
475f9031 | 590 | ;; shift, if necessary |
e756eb9f | 591 | (ediff-with-current-buffer buff (setq pt-saved shift)) |
71296446 | 592 | |
475f9031 KH |
593 | (while diff-list |
594 | (setq current-diff (1+ current-diff) | |
595 | list-element (car diff-list) | |
596 | begin (aref list-element (cond ((eq buf-type 'A) 0) | |
597 | ((eq buf-type 'B) 2) | |
4ad42cb5 MK |
598 | ((eq buf-type 'C) 4) |
599 | (t 6))) ; Ancestor | |
475f9031 KH |
600 | end (aref list-element (cond ((eq buf-type 'A) 1) |
601 | ((eq buf-type 'B) 3) | |
4ad42cb5 MK |
602 | ((eq buf-type 'C) 5) |
603 | (t 7))) ; Ancestor | |
604 | state-of-diff (aref list-element 8) | |
605 | ) | |
71296446 | 606 | |
475f9031 | 607 | (cond ((and (not (eq buf-type state-of-diff)) |
4ad42cb5 | 608 | (not (eq buf-type 'Ancestor)) |
475f9031 KH |
609 | (memq state-of-diff '(A B C))) |
610 | (setq state-of-diff | |
611 | (car (delq buf-type (delq state-of-diff (list 'A 'B 'C))))) | |
612 | (setq state-of-diff (format "=diff(%S)" state-of-diff)) | |
475f9031 | 613 | ) |
4ad42cb5 | 614 | (t (setq state-of-diff nil))) |
71296446 | 615 | |
475f9031 KH |
616 | ;; Put overlays at appropriate places in buffer |
617 | ;; convert word numbers to points, if necessary | |
618 | (if (eq diff-list-type 'words) | |
619 | (progn | |
e756eb9f | 620 | (ediff-with-current-buffer buff (goto-char pt-saved)) |
17561e4f MK |
621 | (ediff-with-current-buffer ctl-buf |
622 | (setq begin (ediff-goto-word (1+ begin) buff) | |
623 | end (ediff-goto-word end buff 'end))) | |
475f9031 KH |
624 | (if (> end limit) (setq end limit)) |
625 | (if (> begin end) (setq begin end)) | |
e756eb9f | 626 | (setq pt-saved (ediff-with-current-buffer buff (point))))) |
475f9031 | 627 | (setq overlay (ediff-make-bullet-proof-overlay begin end buff)) |
71296446 | 628 | |
475f9031 KH |
629 | (ediff-overlay-put overlay 'priority ediff-shadow-overlay-priority) |
630 | (ediff-overlay-put overlay 'ediff-diff-num current-diff) | |
4ae69eac | 631 | (if (and (ediff-has-face-support-p) |
4ad42cb5 MK |
632 | ediff-use-faces ediff-highlight-all-diffs) |
633 | (ediff-set-overlay-face | |
634 | overlay (ediff-background-face buf-type current-diff))) | |
475f9031 KH |
635 | |
636 | (if (= 0 (mod current-diff 10)) | |
637 | (message "Buffer %S: Processing difference region %d of %d" | |
638 | buf-type current-diff total-diffs)) | |
3af0304a MK |
639 | ;; Record all overlays for this difference. |
640 | ;; The 2-d elt, nil, is a place holder for the fine diff vector. | |
641 | ;; The 3-d elt, nil, is a place holder for no-fine-diffs flag. | |
642 | ;; The 4-th elt says which diff region is different from the other two | |
643 | ;; (3-way jobs only). | |
475f9031 KH |
644 | (setq diff-overlay-list |
645 | (nconc | |
646 | diff-overlay-list | |
4ad42cb5 | 647 | (list (vector overlay nil nil state-of-diff))) |
475f9031 KH |
648 | diff-list |
649 | (cdr diff-list)) | |
650 | ) ; while | |
71296446 | 651 | |
e756eb9f | 652 | (set (ediff-get-symbol-from-alist buf-type ediff-difference-vector-alist) |
4ad42cb5 | 653 | (vconcat diff-overlay-list)) |
475f9031 | 654 | )) |
4ad42cb5 | 655 | |
475f9031 KH |
656 | ;; `n' is the diff region to work on. Default is ediff-current-difference. |
657 | ;; if `flag' is 'noforce then make fine-diffs only if this region's fine | |
658 | ;; diffs have not been computed before. | |
659 | ;; if `flag' is 'skip then don't compute fine diffs for this region. | |
50a07e18 | 660 | (defun ediff-make-fine-diffs (&optional n flag) |
475f9031 | 661 | (or n (setq n ediff-current-difference)) |
71296446 | 662 | |
475f9031 | 663 | (if (< ediff-number-of-differences 1) |
bbe6126c | 664 | (error ediff-NO-DIFFERENCES)) |
71296446 | 665 | |
475f9031 KH |
666 | (if ediff-word-mode |
667 | (setq flag 'skip | |
668 | ediff-auto-refine 'nix)) | |
71296446 | 669 | |
475f9031 KH |
670 | (or (< n 0) |
671 | (>= n ediff-number-of-differences) | |
672 | ;; n is within the range | |
673 | (let ((tmp-buffer (get-buffer-create ediff-tmp-buffer)) | |
674 | (file-A ediff-temp-file-A) | |
675 | (file-B ediff-temp-file-B) | |
676 | (file-C ediff-temp-file-C) | |
677 | (empty-A (ediff-empty-diff-region-p n 'A)) | |
678 | (empty-B (ediff-empty-diff-region-p n 'B)) | |
679 | (empty-C (ediff-empty-diff-region-p n 'C)) | |
680 | (whitespace-A (ediff-whitespace-diff-region-p n 'A)) | |
681 | (whitespace-B (ediff-whitespace-diff-region-p n 'B)) | |
682 | (whitespace-C (ediff-whitespace-diff-region-p n 'C)) | |
683 | cumulative-fine-diff-length) | |
71296446 | 684 | |
ddc90f39 | 685 | (cond ;; If one of the regions is empty (or 2 in 3way comparison) |
4ad42cb5 MK |
686 | ;; then don't refine. |
687 | ;; If the region happens to be entirely whitespace or empty then | |
688 | ;; mark as such. | |
475f9031 KH |
689 | ((> (length (delq nil (list empty-A empty-B empty-C))) 1) |
690 | (if (and (ediff-looks-like-combined-merge n) | |
691 | ediff-merge-job) | |
692 | (ediff-set-fine-overlays-in-one-buffer 'C nil n)) | |
4ad42cb5 MK |
693 | (if ediff-3way-comparison-job |
694 | (ediff-message-if-verbose | |
695 | "Region %d is empty in all buffers but %S" | |
50a07e18 | 696 | (1+ n) |
4ad42cb5 MK |
697 | (cond ((not empty-A) 'A) |
698 | ((not empty-B) 'B) | |
699 | ((not empty-C) 'C))) | |
700 | (ediff-message-if-verbose | |
701 | "Region %d in buffer %S is empty" | |
50a07e18 | 702 | (1+ n) |
4ad42cb5 MK |
703 | (cond (empty-A 'A) |
704 | (empty-B 'B) | |
705 | (empty-C 'C))) | |
706 | ) | |
bbe6126c | 707 | ;; if all regions happen to be whitespace |
4ad42cb5 | 708 | (if (and whitespace-A whitespace-B whitespace-C) |
bbe6126c | 709 | ;; mark as space only |
475f9031 | 710 | (ediff-mark-diff-as-space-only n t) |
bbe6126c MK |
711 | ;; if some regions are white and others don't, then mark as |
712 | ;; non-white-space-only | |
475f9031 | 713 | (ediff-mark-diff-as-space-only n nil))) |
ddc90f39 MK |
714 | |
715 | ;; don't compute fine diffs if diff vector exists | |
716 | ((and (eq flag 'noforce) (ediff-get-fine-diff-vector n 'A)) | |
717 | (if (ediff-no-fine-diffs-p n) | |
718 | (message | |
719 | "Only white-space differences in region %d %s" | |
720 | (1+ n) | |
721 | (cond ((eq (ediff-no-fine-diffs-p n) 'A) | |
722 | "in buffers B & C") | |
723 | ((eq (ediff-no-fine-diffs-p n) 'B) | |
724 | "in buffers A & C") | |
725 | ((eq (ediff-no-fine-diffs-p n) 'C) | |
726 | "in buffers A & B") | |
727 | (t ""))))) | |
475f9031 KH |
728 | ;; don't compute fine diffs for this region |
729 | ((eq flag 'skip) | |
730 | (or (ediff-get-fine-diff-vector n 'A) | |
731 | (memq ediff-auto-refine '(off nix)) | |
4ad42cb5 | 732 | (ediff-message-if-verbose |
3af0304a | 733 | "Region %d exceeds the auto-refinement limit. Type `%s' to refine" |
475f9031 | 734 | (1+ n) |
4ad42cb5 MK |
735 | (substitute-command-keys |
736 | "\\[ediff-make-or-kill-fine-diffs]") | |
475f9031 KH |
737 | ))) |
738 | (t | |
475f9031 KH |
739 | ;; recompute fine diffs |
740 | (ediff-wordify | |
741 | (ediff-get-diff-posn 'A 'beg n) | |
742 | (ediff-get-diff-posn 'A 'end n) | |
743 | ediff-buffer-A | |
744 | tmp-buffer | |
745 | ediff-control-buffer) | |
4ad42cb5 MK |
746 | (setq file-A |
747 | (ediff-make-temp-file tmp-buffer "fineDiffA" file-A)) | |
71296446 | 748 | |
475f9031 KH |
749 | (ediff-wordify |
750 | (ediff-get-diff-posn 'B 'beg n) | |
751 | (ediff-get-diff-posn 'B 'end n) | |
752 | ediff-buffer-B | |
753 | tmp-buffer | |
754 | ediff-control-buffer) | |
4ad42cb5 MK |
755 | (setq file-B |
756 | (ediff-make-temp-file tmp-buffer "fineDiffB" file-B)) | |
71296446 | 757 | |
475f9031 KH |
758 | (if ediff-3way-job |
759 | (progn | |
760 | (ediff-wordify | |
761 | (ediff-get-diff-posn 'C 'beg n) | |
762 | (ediff-get-diff-posn 'C 'end n) | |
763 | ediff-buffer-C | |
764 | tmp-buffer | |
765 | ediff-control-buffer) | |
4ad42cb5 MK |
766 | (setq file-C |
767 | (ediff-make-temp-file | |
768 | tmp-buffer "fineDiffC" file-C)))) | |
71296446 | 769 | |
475f9031 KH |
770 | ;; save temp file names. |
771 | (setq ediff-temp-file-A file-A | |
772 | ediff-temp-file-B file-B | |
773 | ediff-temp-file-C file-C) | |
71296446 | 774 | |
475f9031 KH |
775 | ;; set the new vector of fine diffs, if none exists |
776 | (cond ((and ediff-3way-job whitespace-A) | |
777 | (ediff-setup-fine-diff-regions nil file-B file-C n)) | |
778 | ((and ediff-3way-job whitespace-B) | |
779 | (ediff-setup-fine-diff-regions file-A nil file-C n)) | |
780 | ((and ediff-3way-job | |
bbe6126c MK |
781 | ;; In merge-jobs, whitespace-C is t, since |
782 | ;; ediff-empty-diff-region-p returns t in this case | |
783 | whitespace-C) | |
475f9031 KH |
784 | (ediff-setup-fine-diff-regions file-A file-B nil n)) |
785 | (t | |
786 | (ediff-setup-fine-diff-regions file-A file-B file-C n))) | |
71296446 | 787 | |
475f9031 KH |
788 | (setq cumulative-fine-diff-length |
789 | (+ (length (ediff-get-fine-diff-vector n 'A)) | |
bbe6126c MK |
790 | (length (ediff-get-fine-diff-vector n 'B)) |
791 | ;; in merge jobs, the merge buffer is never refined | |
792 | (if (and file-C (not ediff-merge-job)) | |
793 | (length (ediff-get-fine-diff-vector n 'C)) | |
794 | 0))) | |
71296446 | 795 | |
475f9031 KH |
796 | (cond ((or |
797 | ;; all regions are white space | |
798 | (and whitespace-A whitespace-B whitespace-C) | |
799 | ;; none is white space and no fine diffs detected | |
800 | (and (not whitespace-A) | |
801 | (not whitespace-B) | |
802 | (not (and ediff-3way-job whitespace-C)) | |
803 | (eq cumulative-fine-diff-length 0))) | |
804 | (ediff-mark-diff-as-space-only n t) | |
4ad42cb5 | 805 | (ediff-message-if-verbose |
475f9031 KH |
806 | "Only white-space differences in region %d" (1+ n))) |
807 | ((eq cumulative-fine-diff-length 0) | |
4ad42cb5 | 808 | (ediff-message-if-verbose |
475f9031 KH |
809 | "Only white-space differences in region %d %s" |
810 | (1+ n) | |
ddc90f39 MK |
811 | (cond (whitespace-A (ediff-mark-diff-as-space-only n 'A) |
812 | "in buffers B & C") | |
813 | (whitespace-B (ediff-mark-diff-as-space-only n 'B) | |
814 | "in buffers A & C") | |
815 | (whitespace-C (ediff-mark-diff-as-space-only n 'C) | |
816 | "in buffers A & B")))) | |
50a07e18 | 817 | (t |
475f9031 KH |
818 | (ediff-mark-diff-as-space-only n nil))) |
819 | ) | |
820 | ) ; end cond | |
821 | (ediff-set-fine-diff-properties n) | |
822 | ))) | |
71296446 | 823 | |
475f9031 KH |
824 | ;; Interface to ediff-make-fine-diffs. Checks for auto-refine limit, etc. |
825 | (defun ediff-install-fine-diff-if-necessary (n) | |
743a79af MK |
826 | (cond ((and (eq ediff-auto-refine 'on) |
827 | ediff-use-faces | |
828 | (not (eq ediff-highlighting-style 'off)) | |
829 | (not (eq ediff-highlighting-style 'ascii))) | |
475f9031 KH |
830 | (if (and |
831 | (> ediff-auto-refine-limit | |
832 | (- (ediff-get-diff-posn 'A 'end n) | |
833 | (ediff-get-diff-posn 'A 'beg n))) | |
834 | (> ediff-auto-refine-limit | |
835 | (- (ediff-get-diff-posn 'B 'end n) | |
836 | (ediff-get-diff-posn 'B 'beg n)))) | |
837 | (ediff-make-fine-diffs n 'noforce) | |
838 | (ediff-make-fine-diffs n 'skip))) | |
71296446 | 839 | |
4837b516 | 840 | ;; highlight if fine diffs already exist |
475f9031 KH |
841 | ((eq ediff-auto-refine 'off) |
842 | (ediff-make-fine-diffs n 'skip)))) | |
71296446 JB |
843 | |
844 | ||
475f9031 KH |
845 | ;; if fine diff vector is not set for diff N, then do nothing |
846 | (defun ediff-set-fine-diff-properties (n &optional default) | |
4ae69eac | 847 | (or (not (ediff-has-face-support-p)) |
475f9031 KH |
848 | (< n 0) |
849 | (>= n ediff-number-of-differences) | |
4ae69eac | 850 | ;; when faces are supported, set faces and priorities of fine overlays |
475f9031 KH |
851 | (progn |
852 | (ediff-set-fine-diff-properties-in-one-buffer 'A n default) | |
853 | (ediff-set-fine-diff-properties-in-one-buffer 'B n default) | |
854 | (if ediff-3way-job | |
855 | (ediff-set-fine-diff-properties-in-one-buffer 'C n default))))) | |
71296446 | 856 | |
475f9031 KH |
857 | (defun ediff-set-fine-diff-properties-in-one-buffer (buf-type |
858 | n &optional default) | |
859 | (let ((fine-diff-vector (ediff-get-fine-diff-vector n buf-type)) | |
50a07e18 | 860 | (face (if default |
475f9031 | 861 | 'default |
33468a59 MK |
862 | (ediff-get-symbol-from-alist |
863 | buf-type ediff-fine-diff-face-alist) | |
864 | )) | |
475f9031 KH |
865 | (priority (if default |
866 | 0 | |
867 | (1+ (or (ediff-overlay-get | |
868 | (symbol-value | |
e756eb9f MK |
869 | (ediff-get-symbol-from-alist |
870 | buf-type | |
871 | ediff-current-diff-overlay-alist)) | |
475f9031 KH |
872 | 'priority) |
873 | 0))))) | |
3af0304a MK |
874 | (mapcar (lambda (overl) |
875 | (ediff-set-overlay-face overl face) | |
876 | (ediff-overlay-put overl 'priority priority)) | |
877 | fine-diff-vector))) | |
71296446 | 878 | |
086171bf | 879 | ;; Set overlays over the regions that denote delimiters |
475f9031 | 880 | (defun ediff-set-fine-overlays-for-combined-merge (diff-list reg-num) |
086171bf MK |
881 | (let (overlay overlay-list) |
882 | (while diff-list | |
883 | (condition-case nil | |
884 | (setq overlay | |
885 | (ediff-make-bullet-proof-overlay | |
886 | (nth 0 diff-list) (nth 1 diff-list) ediff-buffer-C)) | |
887 | (error "")) | |
888 | (setq overlay-list (cons overlay overlay-list)) | |
889 | (if (> (length diff-list) 1) | |
890 | (setq diff-list (cdr (cdr diff-list))) | |
891 | (error "ediff-set-fine-overlays-for-combined-merge: corrupt list of | |
892 | delimiter regions")) | |
893 | ) | |
894 | (setq overlay-list (reverse overlay-list)) | |
895 | (ediff-set-fine-diff-vector | |
896 | reg-num 'C (apply 'vector overlay-list)) | |
475f9031 | 897 | )) |
71296446 JB |
898 | |
899 | ||
475f9031 KH |
900 | ;; Convert diff list to overlays for a given DIFF-REGION |
901 | ;; in buffer of type BUF-TYPE | |
902 | (defun ediff-set-fine-overlays-in-one-buffer (buf-type diff-list region-num) | |
903 | (let* ((current-diff -1) | |
904 | (reg-start (ediff-get-diff-posn buf-type 'beg region-num)) | |
905 | (buff (ediff-get-buffer buf-type)) | |
17561e4f | 906 | (ctl-buf ediff-control-buffer) |
475f9031 KH |
907 | combined-merge-diff-list |
908 | diff-overlay-list list-element | |
909 | begin end overlay) | |
910 | ||
911 | (ediff-clear-fine-differences-in-one-buffer region-num buf-type) | |
912 | (setq diff-list (cdr diff-list)) ; discard list type (words or points) | |
e756eb9f | 913 | (ediff-with-current-buffer buff (goto-char reg-start)) |
71296446 | 914 | |
475f9031 KH |
915 | ;; if it is a combined merge then set overlays in buff C specially |
916 | (if (and ediff-merge-job (eq buf-type 'C) | |
917 | (setq combined-merge-diff-list | |
918 | (ediff-looks-like-combined-merge region-num))) | |
919 | (ediff-set-fine-overlays-for-combined-merge | |
920 | combined-merge-diff-list region-num) | |
921 | ;; regular fine diff | |
922 | (while diff-list | |
923 | (setq current-diff (1+ current-diff) | |
924 | list-element (car diff-list) | |
925 | begin (aref list-element (cond ((eq buf-type 'A) 0) | |
926 | ((eq buf-type 'B) 2) | |
927 | (t 4))) ; buf C | |
928 | end (aref list-element (cond ((eq buf-type 'A) 1) | |
929 | ((eq buf-type 'B) 3) | |
930 | (t 5)))) ; buf C | |
931 | (if (not (or begin end)) | |
932 | () ; skip this diff | |
933 | ;; Put overlays at appropriate places in buffers | |
934 | ;; convert lines to points, if necessary | |
17561e4f MK |
935 | (ediff-with-current-buffer ctl-buf |
936 | (setq begin (ediff-goto-word (1+ begin) buff) | |
937 | end (ediff-goto-word end buff 'end))) | |
475f9031 KH |
938 | (setq overlay (ediff-make-bullet-proof-overlay begin end buff)) |
939 | ;; record all overlays for this difference region | |
940 | (setq diff-overlay-list (nconc diff-overlay-list (list overlay)))) | |
71296446 | 941 | |
475f9031 KH |
942 | (setq diff-list (cdr diff-list)) |
943 | ) ; while | |
944 | ;; convert the list of difference information into a vector | |
945 | ;; for fast access | |
50a07e18 | 946 | (ediff-set-fine-diff-vector |
4ad42cb5 | 947 | region-num buf-type (vconcat diff-overlay-list)) |
475f9031 KH |
948 | ))) |
949 | ||
950 | ||
65efc538 | 951 | (defun ediff-convert-fine-diffs-to-overlays (diff-list region-num) |
50a07e18 MK |
952 | (ediff-set-fine-overlays-in-one-buffer 'A diff-list region-num) |
953 | (ediff-set-fine-overlays-in-one-buffer 'B diff-list region-num) | |
954 | (if ediff-3way-job | |
955 | (ediff-set-fine-overlays-in-one-buffer 'C diff-list region-num) | |
956 | )) | |
957 | ||
958 | ||
475f9031 KH |
959 | ;; Stolen from emerge.el |
960 | (defun ediff-get-diff3-group (file) | |
961 | ;; This save-excursion allows ediff-get-diff3-group to be called for the | |
962 | ;; various groups of lines (1, 2, 3) in any order, and for the lines to | |
963 | ;; appear in any order. The reason this is necessary is that Gnu diff3 | |
964 | ;; can produce the groups in the order 1, 2, 3 or 1, 3, 2. | |
965 | (save-excursion | |
966 | (re-search-forward | |
4960e757 | 967 | (concat "^" file ":\\([0-9]+\\)\\(,\\([0-9]+\\)\\)?\\([ac]\\)\C-m?$")) |
475f9031 KH |
968 | (beginning-of-line 2) |
969 | ;; treatment depends on whether it is an "a" group or a "c" group | |
970 | (if (string-equal (buffer-substring (match-beginning 4) (match-end 4)) "c") | |
971 | ;; it is a "c" group | |
972 | (if (match-beginning 2) | |
973 | ;; it has two numbers | |
027a4b6b | 974 | (list (string-to-number |
475f9031 | 975 | (buffer-substring (match-beginning 1) (match-end 1))) |
027a4b6b | 976 | (1+ (string-to-number |
475f9031 KH |
977 | (buffer-substring (match-beginning 3) (match-end 3))))) |
978 | ;; it has one number | |
027a4b6b | 979 | (let ((x (string-to-number |
475f9031 KH |
980 | (buffer-substring (match-beginning 1) (match-end 1))))) |
981 | (list x (1+ x)))) | |
982 | ;; it is an "a" group | |
027a4b6b | 983 | (let ((x (1+ (string-to-number |
475f9031 KH |
984 | (buffer-substring (match-beginning 1) (match-end 1)))))) |
985 | (list x x))))) | |
986 | ||
987 | ||
988 | ;; If WORD-MODE, construct vector of diffs using word numbers. | |
989 | ;; Else, use point values. | |
990 | ;; WORD-MODE also tells if we are in the word-mode or not. | |
991 | ;; If THREE-WAY-COMP, then it is a 3-way comparison. Else, it is merging | |
4ad42cb5 MK |
992 | ;; with ancestor, in which case buffer-C contents is identical to buffer-A/B, |
993 | ;; contents (unless buffer-A is narrowed) depending on ediff-default-variant's | |
994 | ;; value. | |
475f9031 KH |
995 | ;; BOUNDS specifies visibility bounds to use. |
996 | (defun ediff-extract-diffs3 (diff-buffer word-mode three-way-comp | |
997 | &optional bounds) | |
998 | (let ((A-buffer ediff-buffer-A) | |
999 | (B-buffer ediff-buffer-B) | |
1000 | (C-buffer ediff-buffer-C) | |
4ad42cb5 | 1001 | (anc-buffer ediff-ancestor-buffer) |
475f9031 | 1002 | (a-prev 1) ; needed to set the first diff line correctly |
b6178721 | 1003 | (a-prev-pt nil) |
475f9031 | 1004 | (b-prev 1) |
b6178721 | 1005 | (b-prev-pt nil) |
475f9031 | 1006 | (c-prev 1) |
b6178721 | 1007 | (c-prev-pt nil) |
4ad42cb5 | 1008 | (anc-prev 1) |
475f9031 KH |
1009 | diff-list shift-A shift-B shift-C |
1010 | ) | |
71296446 | 1011 | |
475f9031 KH |
1012 | ;; diff list contains word numbers or points, depending on word-mode |
1013 | (setq diff-list (cons (if word-mode 'words 'points) | |
1014 | diff-list)) | |
1015 | (if bounds | |
1016 | (setq shift-A | |
1017 | (ediff-overlay-start | |
1018 | (ediff-get-value-according-to-buffer-type 'A bounds)) | |
50a07e18 | 1019 | shift-B |
475f9031 KH |
1020 | (ediff-overlay-start |
1021 | (ediff-get-value-according-to-buffer-type 'B bounds)) | |
50a07e18 | 1022 | shift-C |
475f9031 KH |
1023 | (if three-way-comp |
1024 | (ediff-overlay-start | |
1025 | (ediff-get-value-according-to-buffer-type 'C bounds))))) | |
71296446 | 1026 | |
475f9031 | 1027 | ;; reset point in buffers A, B, C |
e756eb9f | 1028 | (ediff-with-current-buffer A-buffer |
475f9031 | 1029 | (goto-char (if shift-A shift-A (point-min)))) |
e756eb9f | 1030 | (ediff-with-current-buffer B-buffer |
475f9031 | 1031 | (goto-char (if shift-B shift-B (point-min)))) |
4ad42cb5 | 1032 | (if three-way-comp |
e756eb9f | 1033 | (ediff-with-current-buffer C-buffer |
4ad42cb5 MK |
1034 | (goto-char (if shift-C shift-C (point-min))))) |
1035 | (if (ediff-buffer-live-p anc-buffer) | |
e756eb9f | 1036 | (ediff-with-current-buffer anc-buffer |
4ad42cb5 | 1037 | (goto-char (point-min)))) |
71296446 | 1038 | |
e756eb9f | 1039 | (ediff-with-current-buffer diff-buffer |
475f9031 KH |
1040 | (goto-char (point-min)) |
1041 | (while (re-search-forward ediff-match-diff3-line nil t) | |
1042 | ;; leave point after matched line | |
1043 | (beginning-of-line 2) | |
1044 | (let ((agreement (buffer-substring (match-beginning 1) (match-end 1)))) | |
bbe6126c | 1045 | ;; if the files A and B are the same and not 3way-comparison, |
475f9031 KH |
1046 | ;; ignore the difference |
1047 | (if (or three-way-comp (not (string-equal agreement "3"))) | |
1048 | (let* ((a-begin (car (ediff-get-diff3-group "1"))) | |
1049 | (a-end (nth 1 (ediff-get-diff3-group "1"))) | |
1050 | (b-begin (car (ediff-get-diff3-group "2"))) | |
1051 | (b-end (nth 1 (ediff-get-diff3-group "2"))) | |
4ad42cb5 MK |
1052 | (c-or-anc-begin (car (ediff-get-diff3-group "3"))) |
1053 | (c-or-anc-end (nth 1 (ediff-get-diff3-group "3"))) | |
475f9031 KH |
1054 | (state-of-merge |
1055 | (cond ((string-equal agreement "1") 'prefer-A) | |
1056 | ((string-equal agreement "2") 'prefer-B) | |
1057 | (t ediff-default-variant))) | |
1058 | (state-of-diff-merge | |
1059 | (if (memq state-of-merge '(default-A prefer-A)) 'B 'A)) | |
1060 | (state-of-diff-comparison | |
1061 | (cond ((string-equal agreement "1") 'A) | |
1062 | ((string-equal agreement "2") 'B) | |
1063 | ((string-equal agreement "3") 'C))) | |
4ad42cb5 | 1064 | state-of-ancestor |
475f9031 KH |
1065 | c-begin c-end |
1066 | a-begin-pt a-end-pt | |
4ad42cb5 MK |
1067 | b-begin-pt b-end-pt |
1068 | c-begin-pt c-end-pt | |
1069 | anc-begin-pt anc-end-pt) | |
71296446 | 1070 | |
4ad42cb5 MK |
1071 | (setq state-of-ancestor |
1072 | (= c-or-anc-begin c-or-anc-end)) | |
1073 | ||
1074 | (cond (three-way-comp | |
1075 | (setq c-begin c-or-anc-begin | |
1076 | c-end c-or-anc-end)) | |
1077 | ((eq ediff-default-variant 'default-B) | |
1078 | (setq c-begin b-begin | |
1079 | c-end b-end)) | |
1080 | (t | |
1081 | (setq c-begin a-begin | |
1082 | c-end a-end))) | |
71296446 | 1083 | |
475f9031 KH |
1084 | ;; compute main diff vector |
1085 | (if word-mode | |
1086 | ;; make diff-list contain word numbers | |
50a07e18 | 1087 | (setq diff-list |
475f9031 KH |
1088 | (nconc diff-list |
1089 | (list (vector | |
1090 | (- a-begin a-prev) (- a-end a-begin) | |
1091 | (- b-begin b-prev) (- b-end b-begin) | |
1092 | (- c-begin c-prev) (- c-end c-begin) | |
4ad42cb5 MK |
1093 | nil nil ; dummy ancestor |
1094 | nil ; state of diff | |
1095 | nil ; state of merge | |
1096 | nil ; state of ancestor | |
1097 | ))) | |
475f9031 KH |
1098 | a-prev a-end |
1099 | b-prev b-end | |
1100 | c-prev c-end) | |
1101 | ;; else convert lines to points | |
e756eb9f | 1102 | (ediff-with-current-buffer A-buffer |
8ea74b0e MK |
1103 | (let ((longlines-mode-val |
1104 | (if (and (boundp 'longlines-mode) longlines-mode) 1 0))) | |
1105 | ;; we must disable and then restore longlines-mode | |
1106 | (if (eq longlines-mode-val 1) | |
1107 | (longlines-mode 0)) | |
b6178721 | 1108 | (goto-char (or a-prev-pt shift-A (point-min))) |
8ea74b0e MK |
1109 | (forward-line (- a-begin a-prev)) |
1110 | (setq a-begin-pt (point)) | |
1111 | (forward-line (- a-end a-begin)) | |
1112 | (setq a-end-pt (point) | |
b6178721 MK |
1113 | a-prev a-end |
1114 | a-prev-pt a-end-pt) | |
8ea74b0e MK |
1115 | (if (eq longlines-mode-val 1) |
1116 | (longlines-mode longlines-mode-val)) | |
1117 | )) | |
e756eb9f | 1118 | (ediff-with-current-buffer B-buffer |
8ea74b0e MK |
1119 | (let ((longlines-mode-val |
1120 | (if (and (boundp 'longlines-mode) longlines-mode) 1 0))) | |
1121 | (if (eq longlines-mode-val 1) | |
1122 | (longlines-mode 0)) | |
b6178721 | 1123 | (goto-char (or b-prev-pt shift-B (point-min))) |
8ea74b0e MK |
1124 | (forward-line (- b-begin b-prev)) |
1125 | (setq b-begin-pt (point)) | |
1126 | (forward-line (- b-end b-begin)) | |
1127 | (setq b-end-pt (point) | |
b6178721 MK |
1128 | b-prev b-end |
1129 | b-prev-pt b-end-pt) | |
8ea74b0e MK |
1130 | (if (eq longlines-mode-val 1) |
1131 | (longlines-mode longlines-mode-val)) | |
1132 | )) | |
e756eb9f | 1133 | (ediff-with-current-buffer C-buffer |
8ea74b0e MK |
1134 | (let ((longlines-mode-val |
1135 | (if (and (boundp 'longlines-mode) longlines-mode) 1 0))) | |
1136 | (if (eq longlines-mode-val 1) | |
1137 | (longlines-mode 0)) | |
b6178721 | 1138 | (goto-char (or c-prev-pt shift-C (point-min))) |
8ea74b0e MK |
1139 | (forward-line (- c-begin c-prev)) |
1140 | (setq c-begin-pt (point)) | |
1141 | (forward-line (- c-end c-begin)) | |
1142 | (setq c-end-pt (point) | |
b6178721 MK |
1143 | c-prev c-end |
1144 | c-prev-pt c-end-pt) | |
8ea74b0e MK |
1145 | (if (eq longlines-mode-val 1) |
1146 | (longlines-mode longlines-mode-val)) | |
1147 | )) | |
4ad42cb5 | 1148 | (if (ediff-buffer-live-p anc-buffer) |
e756eb9f | 1149 | (ediff-with-current-buffer anc-buffer |
8ea74b0e MK |
1150 | (let ((longlines-mode-val |
1151 | (if (and (boundp 'longlines-mode) longlines-mode) 1 0))) | |
1152 | (if (eq longlines-mode-val 1) | |
1153 | (longlines-mode 0)) | |
1154 | (forward-line (- c-or-anc-begin anc-prev)) | |
1155 | (setq anc-begin-pt (point)) | |
1156 | (forward-line (- c-or-anc-end c-or-anc-begin)) | |
1157 | (setq anc-end-pt (point) | |
1158 | anc-prev c-or-anc-end) | |
1159 | (if (eq longlines-mode-val 1) | |
1160 | (longlines-mode longlines-mode-val)) | |
1161 | ))) | |
50a07e18 | 1162 | (setq diff-list |
475f9031 KH |
1163 | (nconc |
1164 | diff-list | |
1165 | ;; if comparing with ancestor, then there also is a | |
1166 | ;; state-of-difference marker | |
1167 | (if three-way-comp | |
1168 | (list (vector | |
1169 | a-begin-pt a-end-pt | |
1170 | b-begin-pt b-end-pt | |
1171 | c-begin-pt c-end-pt | |
4ad42cb5 | 1172 | nil nil ; ancestor begin/end |
475f9031 | 1173 | state-of-diff-comparison |
4ad42cb5 MK |
1174 | nil ; state of merge |
1175 | nil ; state of ancestor | |
475f9031 KH |
1176 | )) |
1177 | (list (vector a-begin-pt a-end-pt | |
1178 | b-begin-pt b-end-pt | |
1179 | c-begin-pt c-end-pt | |
4ad42cb5 | 1180 | anc-begin-pt anc-end-pt |
475f9031 KH |
1181 | state-of-diff-merge |
1182 | state-of-merge | |
4ad42cb5 | 1183 | state-of-ancestor |
475f9031 KH |
1184 | ))) |
1185 | ))) | |
1186 | )) | |
71296446 | 1187 | |
e756eb9f | 1188 | ))) ; end ediff-with-current-buffer |
475f9031 KH |
1189 | diff-list |
1190 | )) | |
71296446 | 1191 | |
475f9031 KH |
1192 | ;; Generate the difference vector and overlays for three files |
1193 | ;; File-C is either the third file to compare (in case of 3-way comparison) | |
1194 | ;; or it is the ancestor file. | |
1195 | (defun ediff-setup-diff-regions3 (file-A file-B file-C) | |
b6178721 | 1196 | ;; looking for '-i' or a 'i' among clustered non-long options |
608c89a9 | 1197 | (if (string-match "^-i\\| -i\\|\\(^\\| \\)-[^- ]+i" ediff-diff-options) |
b6178721 MK |
1198 | (error "Option `-i' is not allowed in `ediff-diff3-options'")) |
1199 | ||
475f9031 KH |
1200 | (or (ediff-buffer-live-p ediff-diff-buffer) |
1201 | (setq ediff-diff-buffer | |
1202 | (get-buffer-create (ediff-unique-buffer-name "*ediff-diff" "*")))) | |
71296446 | 1203 | |
4ad42cb5 MK |
1204 | (message "Computing differences ...") |
1205 | (ediff-exec-process ediff-diff3-program ediff-diff-buffer 'synchronize | |
b6178721 | 1206 | ediff-actual-diff3-options file-A file-B file-C) |
71296446 | 1207 | |
475f9031 | 1208 | (ediff-prepare-error-list ediff-diff3-ok-lines-regexp ediff-diff-buffer) |
4ad42cb5 | 1209 | ;;(message "Computing differences ... done") |
475f9031 KH |
1210 | (ediff-convert-diffs-to-overlays |
1211 | (ediff-extract-diffs3 | |
1212 | ediff-diff-buffer | |
1213 | ediff-word-mode ediff-3way-comparison-job ediff-narrow-bounds) | |
1214 | )) | |
71296446 | 1215 | |
475f9031 | 1216 | |
4ae69eac | 1217 | ;; Execute PROGRAM asynchronously, unless OS/2, Windows-*, or DOS, or unless |
e756eb9f MK |
1218 | ;; SYNCH is non-nil. BUFFER must be a buffer object, and must be alive. The |
1219 | ;; OPTIONS arg is a list of options to pass to PROGRAM. It may be a blank | |
1220 | ;; string. All elements in FILES must be strings. We also delete nil from | |
1221 | ;; args. | |
1222 | (defun ediff-exec-process (program buffer synch options &rest files) | |
1223 | (let ((data (match-data)) | |
513bea45 | 1224 | (coding-system-for-read ediff-coding-system-for-read) |
e756eb9f MK |
1225 | args) |
1226 | (setq args (append (split-string options) files)) | |
1227 | (setq args (delete "" (delq nil args))) ; delete nil and "" from arguments | |
7997f1ca | 1228 | ;; the --binary option, if present, should be used only for buffer jobs |
560ef11a | 1229 | ;; or for refining the differences |
7997f1ca | 1230 | (or (string-match "buffer" (symbol-name ediff-job-name)) |
560ef11a | 1231 | (eq buffer ediff-fine-diff-buffer) |
7997f1ca | 1232 | (setq args (delete "--binary" args))) |
475f9031 KH |
1233 | (unwind-protect |
1234 | (let ((directory default-directory) | |
1235 | proc) | |
475f9031 KH |
1236 | (save-excursion |
1237 | (set-buffer buffer) | |
1238 | (erase-buffer) | |
1239 | (setq default-directory directory) | |
4ae69eac MK |
1240 | (if (or (memq system-type '(emx ms-dos windows-nt windows-95)) |
1241 | synch) | |
1242 | ;; In OS/2 (emx) do it synchronously, since OS/2 doesn't let us | |
4ad42cb5 MK |
1243 | ;; delete files used by other processes. Thus, in ediff-buffers |
1244 | ;; and similar functions, we can't delete temp files because | |
4ae69eac | 1245 | ;; they might be used by the asynch process that computes |
4ad42cb5 MK |
1246 | ;; custom diffs. So, we have to wait till custom diff |
1247 | ;; subprocess is done. | |
4ae69eac MK |
1248 | ;; Similarly for Windows-* |
1249 | ;; In DOS, must synchronize because DOS doesn't have | |
1250 | ;; asynchronous processes. | |
31e71026 | 1251 | (apply 'call-process program nil buffer nil args) |
4ad42cb5 MK |
1252 | ;; On other systems, do it asynchronously. |
1253 | (setq proc (get-buffer-process buffer)) | |
1254 | (if proc (kill-process proc)) | |
1255 | (setq proc | |
1256 | (apply 'start-process "Custom Diff" buffer program args)) | |
1257 | (setq mode-line-process '(":%s")) | |
1258 | (set-process-sentinel proc 'ediff-process-sentinel) | |
1259 | (set-process-filter proc 'ediff-process-filter) | |
1260 | ))) | |
2eb4bdca | 1261 | (store-match-data data)))) |
71296446 | 1262 | |
863312cd | 1263 | ;; This is shell-command-filter from simple.el in Emacs. |
475f9031 | 1264 | ;; Copied here because XEmacs doesn't have it. |
4ad42cb5 | 1265 | (defun ediff-process-filter (proc string) |
475f9031 KH |
1266 | ;; Do save-excursion by hand so that we can leave point numerically unchanged |
1267 | ;; despite an insertion immediately after it. | |
1268 | (let* ((obuf (current-buffer)) | |
1269 | (buffer (process-buffer proc)) | |
1270 | opoint | |
1271 | (window (get-buffer-window buffer)) | |
1272 | (pos (window-start window))) | |
1273 | (unwind-protect | |
1274 | (progn | |
1275 | (set-buffer buffer) | |
1276 | (or (= (point) (point-max)) | |
1277 | (setq opoint (point))) | |
1278 | (goto-char (point-max)) | |
1279 | (insert-before-markers string)) | |
1280 | ;; insert-before-markers moved this marker: set it back. | |
1281 | (set-window-start window pos) | |
1282 | ;; Finish our save-excursion. | |
1283 | (if opoint | |
1284 | (goto-char opoint)) | |
1285 | (set-buffer obuf)))) | |
71296446 | 1286 | |
475f9031 KH |
1287 | ;; like shell-command-sentinel but doesn't print an exit status message |
1288 | ;; we do this because diff always exits with status 1, if diffs are found | |
1289 | ;; so shell-command-sentinel displays a confusing message to the user | |
4ad42cb5 | 1290 | (defun ediff-process-sentinel (process signal) |
475f9031 KH |
1291 | (if (and (memq (process-status process) '(exit signal)) |
1292 | (buffer-name (process-buffer process))) | |
1293 | (progn | |
1294 | (save-excursion | |
1295 | (set-buffer (process-buffer process)) | |
1296 | (setq mode-line-process nil)) | |
1297 | (delete-process process)))) | |
71296446 | 1298 | |
475f9031 | 1299 | |
50a07e18 | 1300 | ;;; Word functions used to refine the current diff |
475f9031 KH |
1301 | |
1302 | (defvar ediff-forward-word-function 'ediff-forward-word | |
1303 | "*Function to call to move to the next word. | |
1304 | Used for splitting difference regions into individual words.") | |
743a79af | 1305 | (make-variable-buffer-local 'ediff-forward-word-function) |
475f9031 | 1306 | |
ec6aebe8 MK |
1307 | ;; \240 is unicode symbol for nonbreakable whitespace |
1308 | (defvar ediff-whitespace " \n\t\f\r\240" | |
475f9031 KH |
1309 | "*Characters constituting white space. |
1310 | These characters are ignored when differing regions are split into words.") | |
743a79af | 1311 | (make-variable-buffer-local 'ediff-whitespace) |
475f9031 | 1312 | |
50a07e18 | 1313 | (defvar ediff-word-1 |
dc3fbc6a | 1314 | (if (featurep 'xemacs) "a-zA-Z---_" "-[:word:]_") |
475f9031 KH |
1315 | "*Characters that constitute words of type 1. |
1316 | More precisely, [ediff-word-1] is a regexp that matches type 1 words. | |
50a07e18 | 1317 | See `ediff-forward-word' for more details.") |
743a79af | 1318 | (make-variable-buffer-local 'ediff-word-1) |
475f9031 KH |
1319 | |
1320 | (defvar ediff-word-2 "0-9.," | |
1321 | "*Characters that constitute words of type 2. | |
1322 | More precisely, [ediff-word-2] is a regexp that matches type 2 words. | |
1323 | See `ediff-forward-word' for more details.") | |
743a79af | 1324 | (make-variable-buffer-local 'ediff-word-2) |
475f9031 KH |
1325 | |
1326 | (defvar ediff-word-3 "`'?!:;\"{}[]()" | |
1327 | "*Characters that constitute words of type 3. | |
1328 | More precisely, [ediff-word-3] is a regexp that matches type 3 words. | |
1329 | See `ediff-forward-word' for more details.") | |
743a79af | 1330 | (make-variable-buffer-local 'ediff-word-3) |
475f9031 KH |
1331 | |
1332 | (defvar ediff-word-4 | |
1333 | (concat "^" ediff-word-1 ediff-word-2 ediff-word-3 ediff-whitespace) | |
1334 | "*Characters that constitute words of type 4. | |
1335 | More precisely, [ediff-word-4] is a regexp that matches type 4 words. | |
50a07e18 | 1336 | See `ediff-forward-word' for more details.") |
743a79af | 1337 | (make-variable-buffer-local 'ediff-word-4) |
475f9031 KH |
1338 | |
1339 | ;; Split region along word boundaries. Each word will be on its own line. | |
1340 | ;; Output to buffer out-buffer. | |
1341 | (defun ediff-forward-word () | |
1342 | "Move point one word forward. | |
1343 | There are four types of words, each of which consists entirely of | |
1344 | characters in `ediff-word-1', `ediff-word-2', `ediff-word-3', or | |
6de3983f MK |
1345 | `ediff-word-4'. Words are recognized by passing these one after another as |
1346 | arguments to `skip-chars-forward'." | |
1347 | (or (> (+ (skip-chars-forward ediff-word-1) | |
1348 | (skip-syntax-forward "w")) | |
1349 | 0) | |
475f9031 KH |
1350 | (> (skip-chars-forward ediff-word-2) 0) |
1351 | (> (skip-chars-forward ediff-word-3) 0) | |
1352 | (> (skip-chars-forward ediff-word-4) 0) | |
1353 | )) | |
1354 | ||
d396e521 | 1355 | |
475f9031 | 1356 | (defun ediff-wordify (beg end in-buffer out-buffer &optional control-buf) |
50a07e18 MK |
1357 | (let ((forward-word-function |
1358 | ;; eval in control buf to let user create local versions for | |
1359 | ;; different invocations | |
1360 | (if control-buf | |
1361 | (ediff-with-current-buffer control-buf | |
1362 | ediff-forward-word-function) | |
1363 | ediff-forward-word-function)) | |
1364 | inbuf-syntax-tbl sv-point diff-string) | |
475f9031 KH |
1365 | (save-excursion |
1366 | (set-buffer in-buffer) | |
4986c2c6 MK |
1367 | (setq inbuf-syntax-tbl |
1368 | (if control-buf | |
1369 | (ediff-with-current-buffer control-buf | |
1370 | ediff-syntax-table) | |
1371 | (syntax-table))) | |
1372 | (setq diff-string (buffer-substring-no-properties beg end)) | |
475f9031 KH |
1373 | |
1374 | (set-buffer out-buffer) | |
4696802b | 1375 | ;; Make sure that temp buff syntax table is the same as the original buf |
d396e521 MK |
1376 | ;; syntax tbl, because we use ediff-forward-word in both and |
1377 | ;; ediff-forward-word depends on the syntax classes of characters. | |
1378 | (set-syntax-table inbuf-syntax-tbl) | |
475f9031 | 1379 | (erase-buffer) |
4986c2c6 | 1380 | (insert diff-string) |
475f9031 KH |
1381 | (goto-char (point-min)) |
1382 | (skip-chars-forward ediff-whitespace) | |
1383 | (delete-region (point-min) (point)) | |
71296446 | 1384 | |
475f9031 | 1385 | (while (not (eobp)) |
50a07e18 | 1386 | (funcall forward-word-function) |
475f9031 KH |
1387 | (setq sv-point (point)) |
1388 | (skip-chars-forward ediff-whitespace) | |
1389 | (delete-region sv-point (point)) | |
1390 | (insert "\n"))))) | |
71296446 | 1391 | |
50a07e18 | 1392 | ;; copy string specified as BEG END from IN-BUF to OUT-BUF |
475f9031 | 1393 | (defun ediff-copy-to-buffer (beg end in-buffer out-buffer) |
50a07e18 MK |
1394 | (with-current-buffer out-buffer |
1395 | (erase-buffer) | |
1396 | (insert-buffer-substring in-buffer beg end) | |
1397 | (goto-char (point-min)))) | |
475f9031 KH |
1398 | |
1399 | ||
1400 | ;; goto word #n starting at current position in buffer `buf' | |
4986c2c6 | 1401 | ;; For ediff, a word is determined by ediff-forward-word-function |
475f9031 KH |
1402 | ;; If `flag' is non-nil, goto the end of the n-th word. |
1403 | (defun ediff-goto-word (n buf &optional flag) | |
1404 | ;; remember val ediff-forward-word-function has in ctl buf | |
4986c2c6 MK |
1405 | (let ((fwd-word-fun ediff-forward-word-function) |
1406 | (syntax-tbl ediff-syntax-table)) | |
e756eb9f | 1407 | (ediff-with-current-buffer buf |
475f9031 | 1408 | (skip-chars-forward ediff-whitespace) |
50a07e18 MK |
1409 | (ediff-with-syntax-table syntax-tbl |
1410 | (while (> n 1) | |
1411 | (funcall fwd-word-fun) | |
1412 | (skip-chars-forward ediff-whitespace) | |
17561e4f MK |
1413 | (setq n (1- n))) |
1414 | (if (and flag (> n 0)) | |
1415 | (funcall fwd-word-fun))) | |
475f9031 KH |
1416 | (point)))) |
1417 | ||
328b4b70 | 1418 | (defun ediff-same-file-contents (f1 f2) |
17561e4f MK |
1419 | "Return t if files F1 and F2 have identical contents." |
1420 | (if (and (not (file-directory-p f1)) | |
1421 | (not (file-directory-p f2))) | |
31e71026 MK |
1422 | (let ((res |
1423 | (apply 'call-process ediff-cmp-program nil nil nil | |
1424 | (append ediff-cmp-options (list (expand-file-name f1) | |
1425 | (expand-file-name f2)))) | |
1426 | )) | |
1427 | (and (numberp res) (eq res 0))) | |
ec6aebe8 | 1428 | )) |
17561e4f MK |
1429 | |
1430 | ||
1431 | (defun ediff-same-contents (d1 d2 &optional filter-re) | |
4837b516 | 1432 | "Return t if D1 and D2 have the same content. |
17561e4f MK |
1433 | D1 and D2 can either be both directories or both regular files. |
1434 | Symlinks and the likes are not handled. | |
1435 | If FILTER-RE is non-nil, recursive checking in directories | |
1436 | affects only files whose names match the expression." | |
1437 | ;; Normalize empty filter RE to nil. | |
899a431b | 1438 | (unless (> (length filter-re) 0) (setq filter-re nil)) |
17561e4f MK |
1439 | ;; Indicate progress |
1440 | (message "Comparing '%s' and '%s' modulo '%s'" d1 d2 filter-re) | |
1441 | (cond | |
1442 | ;; D1 & D2 directories => recurse | |
1443 | ((and (file-directory-p d1) | |
1444 | (file-directory-p d2)) | |
1445 | (if (null ediff-recurse-to-subdirectories) | |
1446 | (if (y-or-n-p "Compare subdirectories recursively? ") | |
1447 | (setq ediff-recurse-to-subdirectories 'yes) | |
1448 | (setq ediff-recurse-to-subdirectories 'no))) | |
1449 | (if (eq ediff-recurse-to-subdirectories 'yes) | |
1450 | (let* ((all-entries-1 (directory-files d1 t filter-re)) | |
1451 | (all-entries-2 (directory-files d2 t filter-re)) | |
899a431b MK |
1452 | (entries-1 (ediff-delete-all-matches "^\\.\\.?$" all-entries-1)) |
1453 | (entries-2 (ediff-delete-all-matches "^\\.\\.?$" all-entries-2)) | |
17561e4f | 1454 | ) |
899a431b MK |
1455 | |
1456 | (ediff-same-file-contents-lists entries-1 entries-2 filter-re) | |
17561e4f MK |
1457 | )) |
1458 | ) ; end of the directories case | |
1459 | ;; D1 & D2 are both files => compare directly | |
1460 | ((and (file-regular-p d1) | |
1461 | (file-regular-p d2)) | |
1462 | (ediff-same-file-contents d1 d2)) | |
1463 | ;; Otherwise => false: unequal contents | |
1464 | ) | |
1465 | ) | |
328b4b70 | 1466 | |
899a431b MK |
1467 | ;; If lists have the same length and names of files are pairwise equal |
1468 | ;; (removing the directories) then compare contents pairwise. | |
1469 | ;; True if all contents are the same; false otherwise | |
1470 | (defun ediff-same-file-contents-lists (entries-1 entries-2 filter-re) | |
1471 | ;; First, check only the names (works quickly and ensures a | |
1472 | ;; precondition for subsequent code) | |
1473 | (if (and (= (length entries-1) (length entries-2)) | |
1474 | (equal (mapcar 'file-name-nondirectory entries-1) | |
1475 | (mapcar 'file-name-nondirectory entries-2))) | |
1476 | ;; With name equality established, compare the entries | |
1477 | ;; through recursion. | |
1478 | (let ((continue t)) | |
1479 | (while (and entries-1 continue) | |
1480 | (if (ediff-same-contents | |
1481 | (car entries-1) (car entries-2) filter-re) | |
1482 | (setq entries-1 (cdr entries-1) | |
1483 | entries-2 (cdr entries-2)) | |
1484 | (setq continue nil)) | |
1485 | ) | |
1486 | ;; if reached the end then lists are equal | |
1487 | (null entries-1)) | |
1488 | ) | |
1489 | ) | |
1490 | ||
1491 | ||
1492 | ;; ARG1 is a regexp, ARG2 is a list of full-filenames | |
1493 | ;; Delete all entries that match the regexp | |
1494 | (defun ediff-delete-all-matches (regex file-list-list) | |
1495 | (let (result elt) | |
1496 | (while file-list-list | |
1497 | (setq elt (car file-list-list)) | |
1498 | (or (string-match regex (file-name-nondirectory elt)) | |
1499 | (setq result (cons elt result))) | |
1500 | (setq file-list-list (cdr file-list-list))) | |
1501 | (reverse result))) | |
1502 | ||
ec6aebe8 MK |
1503 | |
1504 | (defun ediff-set-actual-diff-options () | |
1505 | (if ediff-ignore-case | |
36ba07ae | 1506 | (setq ediff-actual-diff-options |
ec6aebe8 MK |
1507 | (concat ediff-diff-options " " ediff-ignore-case-option) |
1508 | ediff-actual-diff3-options | |
1509 | (concat ediff-diff3-options " " ediff-ignore-case-option3)) | |
1510 | (setq ediff-actual-diff-options ediff-diff-options | |
1511 | ediff-actual-diff3-options ediff-diff3-options) | |
1512 | ) | |
1513 | (setq-default ediff-actual-diff-options ediff-actual-diff-options | |
1514 | ediff-actual-diff3-options ediff-actual-diff3-options) | |
1515 | ) | |
1516 | ||
1517 | ||
b6178721 MK |
1518 | ;; Ignore case handling - some ideas from drew.adams@@oracle.com |
1519 | (defun ediff-toggle-ignore-case () | |
1520 | (interactive) | |
1521 | (ediff-barf-if-not-control-buffer) | |
1522 | (setq ediff-ignore-case (not ediff-ignore-case)) | |
ec6aebe8 MK |
1523 | (ediff-set-actual-diff-options) |
1524 | (if ediff-ignore-case | |
1525 | (message "Ignoring regions that differ only in case") | |
1526 | (message "Ignoring case differences turned OFF")) | |
b6178721 MK |
1527 | (cond (ediff-merge-job |
1528 | (message "Ignoring letter case is too dangerous in merge jobs")) | |
1529 | ((and ediff-diff3-job (string= ediff-ignore-case-option3 "")) | |
1530 | (message "Ignoring letter case is not supported by this diff3 program")) | |
1531 | ((and (not ediff-3way-job) (string= ediff-ignore-case-option "")) | |
1532 | (message "Ignoring letter case is not supported by this diff program")) | |
1533 | (t | |
1534 | (sit-for 1) | |
1535 | (ediff-update-diffs))) | |
1536 | ) | |
1537 | ||
1538 | ||
475f9031 | 1539 | |
bbe6126c MK |
1540 | ;;; Local Variables: |
1541 | ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) | |
e756eb9f MK |
1542 | ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) |
1543 | ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) | |
bbe6126c MK |
1544 | ;;; End: |
1545 | ||
cbee283d | 1546 | ;; arch-tag: a86d448e-58d7-4572-a1d9-fdedfa22f648 |
3afbc435 | 1547 | ;;; ediff-diff.el ends here |