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