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