Commit | Line | Data |
---|---|---|
475f9031 | 1 | ;;; ediff-diff.el --- diff-related utilities |
b578f267 | 2 | |
acaf905b | 3 | ;; Copyright (C) 1994-2012 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 |
8ea74b0e MK |
456 | (let ((longlines-mode-val |
457 | (if (and (boundp 'longlines-mode) longlines-mode) 1 0))) | |
458 | ;; we must disable and then restore longlines-mode | |
459 | (if (eq longlines-mode-val 1) | |
460 | (longlines-mode 0)) | |
b6178721 | 461 | (goto-char (or a-prev-pt shift-A (point-min))) |
8ea74b0e MK |
462 | (forward-line (- a-begin a-prev)) |
463 | (setq a-begin-pt (point)) | |
464 | (forward-line (- a-end a-begin)) | |
465 | (setq a-end-pt (point) | |
b6178721 MK |
466 | a-prev a-end |
467 | a-prev-pt a-end-pt) | |
8ea74b0e MK |
468 | (if (eq longlines-mode-val 1) |
469 | (longlines-mode longlines-mode-val)) | |
470 | )) | |
e756eb9f | 471 | (ediff-with-current-buffer B-buffer |
8ea74b0e MK |
472 | (let ((longlines-mode-val |
473 | (if (and (boundp 'longlines-mode) longlines-mode) 1 0))) | |
474 | (if (eq longlines-mode-val 1) | |
475 | (longlines-mode 0)) | |
b6178721 | 476 | (goto-char (or b-prev-pt shift-B (point-min))) |
8ea74b0e MK |
477 | (forward-line (- b-begin b-prev)) |
478 | (setq b-begin-pt (point)) | |
479 | (forward-line (- b-end b-begin)) | |
480 | (setq b-end-pt (point) | |
b6178721 MK |
481 | b-prev b-end |
482 | b-prev-pt b-end-pt) | |
8ea74b0e MK |
483 | (if (eq longlines-mode-val 1) |
484 | (longlines-mode longlines-mode-val)) | |
485 | )) | |
475f9031 | 486 | (if (ediff-buffer-live-p C-buffer) |
e756eb9f | 487 | (ediff-with-current-buffer C-buffer |
8ea74b0e MK |
488 | (let ((longlines-mode-val |
489 | (if (and (boundp 'longlines-mode) longlines-mode) 1 0))) | |
490 | (if (eq longlines-mode-val 1) | |
491 | (longlines-mode 0)) | |
b6178721 | 492 | (goto-char (or c-prev-pt (point-min))) |
8ea74b0e MK |
493 | (forward-line (- c-begin c-prev)) |
494 | (setq c-begin-pt (point)) | |
495 | (forward-line (- c-end c-begin)) | |
496 | (setq c-end-pt (point) | |
b6178721 MK |
497 | c-prev c-end |
498 | c-prev-pt c-end-pt) | |
8ea74b0e MK |
499 | (if (eq longlines-mode-val 1) |
500 | (longlines-mode longlines-mode-val)) | |
501 | ))) | |
50a07e18 | 502 | (setq diff-list |
475f9031 KH |
503 | (nconc |
504 | diff-list | |
505 | (list | |
506 | (if (ediff-buffer-live-p C-buffer) | |
507 | (vector | |
508 | a-begin-pt a-end-pt b-begin-pt b-end-pt | |
509 | c-begin-pt c-end-pt | |
4ad42cb5 | 510 | nil nil ; dummy ancestor |
475f9031 KH |
511 | ;; state of diff |
512 | ;; shows which buff is different from the other two | |
513 | (if (eq ediff-default-variant 'default-B) 'A 'B) | |
4ad42cb5 MK |
514 | ediff-default-variant ; state of merge |
515 | nil ; state of ancestor | |
475f9031 | 516 | ) |
4ad42cb5 MK |
517 | (vector a-begin-pt a-end-pt |
518 | b-begin-pt b-end-pt | |
519 | nil nil ; dummy buf C | |
520 | nil nil ; dummy ancestor | |
521 | nil nil ; dummy state of diff & merge | |
522 | nil ; dummy state of ancestor | |
50a07e18 | 523 | ))) |
475f9031 | 524 | ))) |
71296446 | 525 | |
e756eb9f | 526 | ))) ; end ediff-with-current-buffer |
475f9031 KH |
527 | diff-list |
528 | )) | |
71296446 | 529 | |
475f9031 | 530 | |
4ad42cb5 MK |
531 | (defun ediff-convert-diffs-to-overlays (diff-list) |
532 | (ediff-set-diff-overlays-in-one-buffer 'A diff-list) | |
533 | (ediff-set-diff-overlays-in-one-buffer 'B diff-list) | |
534 | (if ediff-3way-job | |
535 | (ediff-set-diff-overlays-in-one-buffer 'C diff-list)) | |
536 | (if ediff-merge-with-ancestor-job | |
537 | (ediff-set-diff-overlays-in-one-buffer 'Ancestor diff-list)) | |
538 | ;; set up vector showing the status of merge regions | |
539 | (if ediff-merge-job | |
540 | (setq ediff-state-of-merge | |
541 | (vconcat | |
3af0304a MK |
542 | (mapcar (lambda (elt) |
543 | (let ((state-of-merge (aref elt 9)) | |
544 | (state-of-ancestor (aref elt 10))) | |
545 | (vector | |
546 | ;; state of merge: prefers/default-A/B or combined | |
547 | (if state-of-merge (format "%S" state-of-merge)) | |
548 | ;; whether the ancestor region is empty | |
549 | state-of-ancestor))) | |
4ad42cb5 MK |
550 | ;; the first elt designates type of list |
551 | (cdr diff-list)) | |
552 | ))) | |
553 | (message "Processing difference regions ... done")) | |
554 | ||
71296446 | 555 | |
475f9031 KH |
556 | (defun ediff-set-diff-overlays-in-one-buffer (buf-type diff-list) |
557 | (let* ((current-diff -1) | |
558 | (buff (ediff-get-buffer buf-type)) | |
17561e4f | 559 | (ctl-buf ediff-control-buffer) |
475f9031 KH |
560 | ;; ediff-extract-diffs puts the type of diff-list as the first elt |
561 | ;; of this list. The type is either 'points or 'words | |
562 | (diff-list-type (car diff-list)) | |
563 | (shift (ediff-overlay-start | |
564 | (ediff-get-value-according-to-buffer-type | |
565 | buf-type ediff-narrow-bounds))) | |
566 | (limit (ediff-overlay-end | |
50a07e18 | 567 | (ediff-get-value-according-to-buffer-type |
475f9031 KH |
568 | buf-type ediff-narrow-bounds))) |
569 | diff-overlay-list list-element total-diffs | |
4ad42cb5 | 570 | begin end pt-saved overlay state-of-diff) |
475f9031 KH |
571 | |
572 | (setq diff-list (cdr diff-list)) ; discard diff list type | |
573 | (setq total-diffs (length diff-list)) | |
71296446 | 574 | |
475f9031 | 575 | ;; shift, if necessary |
e756eb9f | 576 | (ediff-with-current-buffer buff (setq pt-saved shift)) |
71296446 | 577 | |
475f9031 KH |
578 | (while diff-list |
579 | (setq current-diff (1+ current-diff) | |
580 | list-element (car diff-list) | |
581 | begin (aref list-element (cond ((eq buf-type 'A) 0) | |
582 | ((eq buf-type 'B) 2) | |
4ad42cb5 MK |
583 | ((eq buf-type 'C) 4) |
584 | (t 6))) ; Ancestor | |
475f9031 KH |
585 | end (aref list-element (cond ((eq buf-type 'A) 1) |
586 | ((eq buf-type 'B) 3) | |
4ad42cb5 MK |
587 | ((eq buf-type 'C) 5) |
588 | (t 7))) ; Ancestor | |
589 | state-of-diff (aref list-element 8) | |
590 | ) | |
71296446 | 591 | |
475f9031 | 592 | (cond ((and (not (eq buf-type state-of-diff)) |
4ad42cb5 | 593 | (not (eq buf-type 'Ancestor)) |
475f9031 KH |
594 | (memq state-of-diff '(A B C))) |
595 | (setq state-of-diff | |
596 | (car (delq buf-type (delq state-of-diff (list 'A 'B 'C))))) | |
597 | (setq state-of-diff (format "=diff(%S)" state-of-diff)) | |
475f9031 | 598 | ) |
4ad42cb5 | 599 | (t (setq state-of-diff nil))) |
71296446 | 600 | |
475f9031 KH |
601 | ;; Put overlays at appropriate places in buffer |
602 | ;; convert word numbers to points, if necessary | |
603 | (if (eq diff-list-type 'words) | |
604 | (progn | |
e756eb9f | 605 | (ediff-with-current-buffer buff (goto-char pt-saved)) |
17561e4f MK |
606 | (ediff-with-current-buffer ctl-buf |
607 | (setq begin (ediff-goto-word (1+ begin) buff) | |
608 | end (ediff-goto-word end buff 'end))) | |
475f9031 KH |
609 | (if (> end limit) (setq end limit)) |
610 | (if (> begin end) (setq begin end)) | |
e756eb9f | 611 | (setq pt-saved (ediff-with-current-buffer buff (point))))) |
475f9031 | 612 | (setq overlay (ediff-make-bullet-proof-overlay begin end buff)) |
71296446 | 613 | |
475f9031 KH |
614 | (ediff-overlay-put overlay 'priority ediff-shadow-overlay-priority) |
615 | (ediff-overlay-put overlay 'ediff-diff-num current-diff) | |
4ae69eac | 616 | (if (and (ediff-has-face-support-p) |
4ad42cb5 MK |
617 | ediff-use-faces ediff-highlight-all-diffs) |
618 | (ediff-set-overlay-face | |
619 | overlay (ediff-background-face buf-type current-diff))) | |
475f9031 KH |
620 | |
621 | (if (= 0 (mod current-diff 10)) | |
622 | (message "Buffer %S: Processing difference region %d of %d" | |
623 | buf-type current-diff total-diffs)) | |
3af0304a MK |
624 | ;; Record all overlays for this difference. |
625 | ;; The 2-d elt, nil, is a place holder for the fine diff vector. | |
626 | ;; The 3-d elt, nil, is a place holder for no-fine-diffs flag. | |
627 | ;; The 4-th elt says which diff region is different from the other two | |
628 | ;; (3-way jobs only). | |
475f9031 KH |
629 | (setq diff-overlay-list |
630 | (nconc | |
631 | diff-overlay-list | |
4ad42cb5 | 632 | (list (vector overlay nil nil state-of-diff))) |
475f9031 KH |
633 | diff-list |
634 | (cdr diff-list)) | |
635 | ) ; while | |
71296446 | 636 | |
e756eb9f | 637 | (set (ediff-get-symbol-from-alist buf-type ediff-difference-vector-alist) |
4ad42cb5 | 638 | (vconcat diff-overlay-list)) |
475f9031 | 639 | )) |
4ad42cb5 | 640 | |
475f9031 KH |
641 | ;; `n' is the diff region to work on. Default is ediff-current-difference. |
642 | ;; if `flag' is 'noforce then make fine-diffs only if this region's fine | |
643 | ;; diffs have not been computed before. | |
644 | ;; if `flag' is 'skip then don't compute fine diffs for this region. | |
50a07e18 | 645 | (defun ediff-make-fine-diffs (&optional n flag) |
475f9031 | 646 | (or n (setq n ediff-current-difference)) |
71296446 | 647 | |
475f9031 | 648 | (if (< ediff-number-of-differences 1) |
bbe6126c | 649 | (error ediff-NO-DIFFERENCES)) |
71296446 | 650 | |
475f9031 KH |
651 | (if ediff-word-mode |
652 | (setq flag 'skip | |
653 | ediff-auto-refine 'nix)) | |
71296446 | 654 | |
475f9031 KH |
655 | (or (< n 0) |
656 | (>= n ediff-number-of-differences) | |
657 | ;; n is within the range | |
658 | (let ((tmp-buffer (get-buffer-create ediff-tmp-buffer)) | |
659 | (file-A ediff-temp-file-A) | |
660 | (file-B ediff-temp-file-B) | |
661 | (file-C ediff-temp-file-C) | |
662 | (empty-A (ediff-empty-diff-region-p n 'A)) | |
663 | (empty-B (ediff-empty-diff-region-p n 'B)) | |
664 | (empty-C (ediff-empty-diff-region-p n 'C)) | |
665 | (whitespace-A (ediff-whitespace-diff-region-p n 'A)) | |
666 | (whitespace-B (ediff-whitespace-diff-region-p n 'B)) | |
667 | (whitespace-C (ediff-whitespace-diff-region-p n 'C)) | |
668 | cumulative-fine-diff-length) | |
71296446 | 669 | |
ddc90f39 | 670 | (cond ;; If one of the regions is empty (or 2 in 3way comparison) |
4ad42cb5 MK |
671 | ;; then don't refine. |
672 | ;; If the region happens to be entirely whitespace or empty then | |
673 | ;; mark as such. | |
475f9031 KH |
674 | ((> (length (delq nil (list empty-A empty-B empty-C))) 1) |
675 | (if (and (ediff-looks-like-combined-merge n) | |
676 | ediff-merge-job) | |
677 | (ediff-set-fine-overlays-in-one-buffer 'C nil n)) | |
4ad42cb5 MK |
678 | (if ediff-3way-comparison-job |
679 | (ediff-message-if-verbose | |
680 | "Region %d is empty in all buffers but %S" | |
50a07e18 | 681 | (1+ n) |
4ad42cb5 MK |
682 | (cond ((not empty-A) 'A) |
683 | ((not empty-B) 'B) | |
684 | ((not empty-C) 'C))) | |
685 | (ediff-message-if-verbose | |
686 | "Region %d in buffer %S is empty" | |
50a07e18 | 687 | (1+ n) |
4ad42cb5 MK |
688 | (cond (empty-A 'A) |
689 | (empty-B 'B) | |
690 | (empty-C 'C))) | |
691 | ) | |
bbe6126c | 692 | ;; if all regions happen to be whitespace |
4ad42cb5 | 693 | (if (and whitespace-A whitespace-B whitespace-C) |
bbe6126c | 694 | ;; mark as space only |
475f9031 | 695 | (ediff-mark-diff-as-space-only n t) |
bbe6126c MK |
696 | ;; if some regions are white and others don't, then mark as |
697 | ;; non-white-space-only | |
475f9031 | 698 | (ediff-mark-diff-as-space-only n nil))) |
ddc90f39 MK |
699 | |
700 | ;; don't compute fine diffs if diff vector exists | |
701 | ((and (eq flag 'noforce) (ediff-get-fine-diff-vector n 'A)) | |
702 | (if (ediff-no-fine-diffs-p n) | |
703 | (message | |
704 | "Only white-space differences in region %d %s" | |
705 | (1+ n) | |
706 | (cond ((eq (ediff-no-fine-diffs-p n) 'A) | |
707 | "in buffers B & C") | |
708 | ((eq (ediff-no-fine-diffs-p n) 'B) | |
709 | "in buffers A & C") | |
710 | ((eq (ediff-no-fine-diffs-p n) 'C) | |
711 | "in buffers A & B") | |
712 | (t ""))))) | |
475f9031 KH |
713 | ;; don't compute fine diffs for this region |
714 | ((eq flag 'skip) | |
715 | (or (ediff-get-fine-diff-vector n 'A) | |
716 | (memq ediff-auto-refine '(off nix)) | |
4ad42cb5 | 717 | (ediff-message-if-verbose |
3af0304a | 718 | "Region %d exceeds the auto-refinement limit. Type `%s' to refine" |
475f9031 | 719 | (1+ n) |
4ad42cb5 MK |
720 | (substitute-command-keys |
721 | "\\[ediff-make-or-kill-fine-diffs]") | |
475f9031 KH |
722 | ))) |
723 | (t | |
475f9031 KH |
724 | ;; recompute fine diffs |
725 | (ediff-wordify | |
726 | (ediff-get-diff-posn 'A 'beg n) | |
727 | (ediff-get-diff-posn 'A 'end n) | |
728 | ediff-buffer-A | |
729 | tmp-buffer | |
730 | ediff-control-buffer) | |
4ad42cb5 MK |
731 | (setq file-A |
732 | (ediff-make-temp-file tmp-buffer "fineDiffA" file-A)) | |
71296446 | 733 | |
475f9031 KH |
734 | (ediff-wordify |
735 | (ediff-get-diff-posn 'B 'beg n) | |
736 | (ediff-get-diff-posn 'B 'end n) | |
737 | ediff-buffer-B | |
738 | tmp-buffer | |
739 | ediff-control-buffer) | |
4ad42cb5 MK |
740 | (setq file-B |
741 | (ediff-make-temp-file tmp-buffer "fineDiffB" file-B)) | |
71296446 | 742 | |
475f9031 KH |
743 | (if ediff-3way-job |
744 | (progn | |
745 | (ediff-wordify | |
746 | (ediff-get-diff-posn 'C 'beg n) | |
747 | (ediff-get-diff-posn 'C 'end n) | |
748 | ediff-buffer-C | |
749 | tmp-buffer | |
750 | ediff-control-buffer) | |
4ad42cb5 MK |
751 | (setq file-C |
752 | (ediff-make-temp-file | |
753 | tmp-buffer "fineDiffC" file-C)))) | |
71296446 | 754 | |
475f9031 KH |
755 | ;; save temp file names. |
756 | (setq ediff-temp-file-A file-A | |
757 | ediff-temp-file-B file-B | |
758 | ediff-temp-file-C file-C) | |
71296446 | 759 | |
475f9031 KH |
760 | ;; set the new vector of fine diffs, if none exists |
761 | (cond ((and ediff-3way-job whitespace-A) | |
762 | (ediff-setup-fine-diff-regions nil file-B file-C n)) | |
763 | ((and ediff-3way-job whitespace-B) | |
764 | (ediff-setup-fine-diff-regions file-A nil file-C n)) | |
765 | ((and ediff-3way-job | |
bbe6126c MK |
766 | ;; In merge-jobs, whitespace-C is t, since |
767 | ;; ediff-empty-diff-region-p returns t in this case | |
768 | whitespace-C) | |
475f9031 KH |
769 | (ediff-setup-fine-diff-regions file-A file-B nil n)) |
770 | (t | |
771 | (ediff-setup-fine-diff-regions file-A file-B file-C n))) | |
71296446 | 772 | |
475f9031 KH |
773 | (setq cumulative-fine-diff-length |
774 | (+ (length (ediff-get-fine-diff-vector n 'A)) | |
bbe6126c MK |
775 | (length (ediff-get-fine-diff-vector n 'B)) |
776 | ;; in merge jobs, the merge buffer is never refined | |
777 | (if (and file-C (not ediff-merge-job)) | |
778 | (length (ediff-get-fine-diff-vector n 'C)) | |
779 | 0))) | |
71296446 | 780 | |
475f9031 KH |
781 | (cond ((or |
782 | ;; all regions are white space | |
783 | (and whitespace-A whitespace-B whitespace-C) | |
784 | ;; none is white space and no fine diffs detected | |
785 | (and (not whitespace-A) | |
786 | (not whitespace-B) | |
787 | (not (and ediff-3way-job whitespace-C)) | |
788 | (eq cumulative-fine-diff-length 0))) | |
789 | (ediff-mark-diff-as-space-only n t) | |
4ad42cb5 | 790 | (ediff-message-if-verbose |
475f9031 KH |
791 | "Only white-space differences in region %d" (1+ n))) |
792 | ((eq cumulative-fine-diff-length 0) | |
4ad42cb5 | 793 | (ediff-message-if-verbose |
475f9031 KH |
794 | "Only white-space differences in region %d %s" |
795 | (1+ n) | |
ddc90f39 MK |
796 | (cond (whitespace-A (ediff-mark-diff-as-space-only n 'A) |
797 | "in buffers B & C") | |
798 | (whitespace-B (ediff-mark-diff-as-space-only n 'B) | |
799 | "in buffers A & C") | |
800 | (whitespace-C (ediff-mark-diff-as-space-only n 'C) | |
801 | "in buffers A & B")))) | |
50a07e18 | 802 | (t |
475f9031 KH |
803 | (ediff-mark-diff-as-space-only n nil))) |
804 | ) | |
805 | ) ; end cond | |
806 | (ediff-set-fine-diff-properties n) | |
807 | ))) | |
71296446 | 808 | |
475f9031 KH |
809 | ;; Interface to ediff-make-fine-diffs. Checks for auto-refine limit, etc. |
810 | (defun ediff-install-fine-diff-if-necessary (n) | |
743a79af MK |
811 | (cond ((and (eq ediff-auto-refine 'on) |
812 | ediff-use-faces | |
813 | (not (eq ediff-highlighting-style 'off)) | |
814 | (not (eq ediff-highlighting-style 'ascii))) | |
475f9031 KH |
815 | (if (and |
816 | (> ediff-auto-refine-limit | |
817 | (- (ediff-get-diff-posn 'A 'end n) | |
818 | (ediff-get-diff-posn 'A 'beg n))) | |
819 | (> ediff-auto-refine-limit | |
820 | (- (ediff-get-diff-posn 'B 'end n) | |
821 | (ediff-get-diff-posn 'B 'beg n)))) | |
822 | (ediff-make-fine-diffs n 'noforce) | |
823 | (ediff-make-fine-diffs n 'skip))) | |
71296446 | 824 | |
4837b516 | 825 | ;; highlight if fine diffs already exist |
475f9031 KH |
826 | ((eq ediff-auto-refine 'off) |
827 | (ediff-make-fine-diffs n 'skip)))) | |
71296446 JB |
828 | |
829 | ||
475f9031 KH |
830 | ;; if fine diff vector is not set for diff N, then do nothing |
831 | (defun ediff-set-fine-diff-properties (n &optional default) | |
4ae69eac | 832 | (or (not (ediff-has-face-support-p)) |
475f9031 KH |
833 | (< n 0) |
834 | (>= n ediff-number-of-differences) | |
4ae69eac | 835 | ;; when faces are supported, set faces and priorities of fine overlays |
475f9031 KH |
836 | (progn |
837 | (ediff-set-fine-diff-properties-in-one-buffer 'A n default) | |
838 | (ediff-set-fine-diff-properties-in-one-buffer 'B n default) | |
839 | (if ediff-3way-job | |
840 | (ediff-set-fine-diff-properties-in-one-buffer 'C n default))))) | |
71296446 | 841 | |
475f9031 KH |
842 | (defun ediff-set-fine-diff-properties-in-one-buffer (buf-type |
843 | n &optional default) | |
844 | (let ((fine-diff-vector (ediff-get-fine-diff-vector n buf-type)) | |
50a07e18 | 845 | (face (if default |
475f9031 | 846 | 'default |
33468a59 MK |
847 | (ediff-get-symbol-from-alist |
848 | buf-type ediff-fine-diff-face-alist) | |
849 | )) | |
475f9031 KH |
850 | (priority (if default |
851 | 0 | |
852 | (1+ (or (ediff-overlay-get | |
853 | (symbol-value | |
e756eb9f MK |
854 | (ediff-get-symbol-from-alist |
855 | buf-type | |
856 | ediff-current-diff-overlay-alist)) | |
475f9031 KH |
857 | 'priority) |
858 | 0))))) | |
3af0304a MK |
859 | (mapcar (lambda (overl) |
860 | (ediff-set-overlay-face overl face) | |
861 | (ediff-overlay-put overl 'priority priority)) | |
862 | fine-diff-vector))) | |
71296446 | 863 | |
086171bf | 864 | ;; Set overlays over the regions that denote delimiters |
475f9031 | 865 | (defun ediff-set-fine-overlays-for-combined-merge (diff-list reg-num) |
086171bf MK |
866 | (let (overlay overlay-list) |
867 | (while diff-list | |
868 | (condition-case nil | |
869 | (setq overlay | |
870 | (ediff-make-bullet-proof-overlay | |
871 | (nth 0 diff-list) (nth 1 diff-list) ediff-buffer-C)) | |
872 | (error "")) | |
873 | (setq overlay-list (cons overlay overlay-list)) | |
874 | (if (> (length diff-list) 1) | |
875 | (setq diff-list (cdr (cdr diff-list))) | |
876 | (error "ediff-set-fine-overlays-for-combined-merge: corrupt list of | |
877 | delimiter regions")) | |
878 | ) | |
879 | (setq overlay-list (reverse overlay-list)) | |
880 | (ediff-set-fine-diff-vector | |
881 | reg-num 'C (apply 'vector overlay-list)) | |
475f9031 | 882 | )) |
71296446 JB |
883 | |
884 | ||
475f9031 KH |
885 | ;; Convert diff list to overlays for a given DIFF-REGION |
886 | ;; in buffer of type BUF-TYPE | |
887 | (defun ediff-set-fine-overlays-in-one-buffer (buf-type diff-list region-num) | |
888 | (let* ((current-diff -1) | |
889 | (reg-start (ediff-get-diff-posn buf-type 'beg region-num)) | |
890 | (buff (ediff-get-buffer buf-type)) | |
17561e4f | 891 | (ctl-buf ediff-control-buffer) |
475f9031 KH |
892 | combined-merge-diff-list |
893 | diff-overlay-list list-element | |
894 | begin end overlay) | |
895 | ||
896 | (ediff-clear-fine-differences-in-one-buffer region-num buf-type) | |
897 | (setq diff-list (cdr diff-list)) ; discard list type (words or points) | |
e756eb9f | 898 | (ediff-with-current-buffer buff (goto-char reg-start)) |
71296446 | 899 | |
475f9031 KH |
900 | ;; if it is a combined merge then set overlays in buff C specially |
901 | (if (and ediff-merge-job (eq buf-type 'C) | |
902 | (setq combined-merge-diff-list | |
903 | (ediff-looks-like-combined-merge region-num))) | |
904 | (ediff-set-fine-overlays-for-combined-merge | |
905 | combined-merge-diff-list region-num) | |
906 | ;; regular fine diff | |
907 | (while diff-list | |
908 | (setq current-diff (1+ current-diff) | |
909 | list-element (car diff-list) | |
910 | begin (aref list-element (cond ((eq buf-type 'A) 0) | |
911 | ((eq buf-type 'B) 2) | |
912 | (t 4))) ; buf C | |
913 | end (aref list-element (cond ((eq buf-type 'A) 1) | |
914 | ((eq buf-type 'B) 3) | |
915 | (t 5)))) ; buf C | |
916 | (if (not (or begin end)) | |
917 | () ; skip this diff | |
918 | ;; Put overlays at appropriate places in buffers | |
919 | ;; convert lines to points, if necessary | |
17561e4f MK |
920 | (ediff-with-current-buffer ctl-buf |
921 | (setq begin (ediff-goto-word (1+ begin) buff) | |
922 | end (ediff-goto-word end buff 'end))) | |
475f9031 KH |
923 | (setq overlay (ediff-make-bullet-proof-overlay begin end buff)) |
924 | ;; record all overlays for this difference region | |
925 | (setq diff-overlay-list (nconc diff-overlay-list (list overlay)))) | |
71296446 | 926 | |
475f9031 KH |
927 | (setq diff-list (cdr diff-list)) |
928 | ) ; while | |
929 | ;; convert the list of difference information into a vector | |
930 | ;; for fast access | |
50a07e18 | 931 | (ediff-set-fine-diff-vector |
4ad42cb5 | 932 | region-num buf-type (vconcat diff-overlay-list)) |
475f9031 KH |
933 | ))) |
934 | ||
935 | ||
65efc538 | 936 | (defun ediff-convert-fine-diffs-to-overlays (diff-list region-num) |
50a07e18 MK |
937 | (ediff-set-fine-overlays-in-one-buffer 'A diff-list region-num) |
938 | (ediff-set-fine-overlays-in-one-buffer 'B diff-list region-num) | |
939 | (if ediff-3way-job | |
940 | (ediff-set-fine-overlays-in-one-buffer 'C diff-list region-num) | |
941 | )) | |
942 | ||
943 | ||
475f9031 KH |
944 | ;; Stolen from emerge.el |
945 | (defun ediff-get-diff3-group (file) | |
946 | ;; This save-excursion allows ediff-get-diff3-group to be called for the | |
947 | ;; various groups of lines (1, 2, 3) in any order, and for the lines to | |
948 | ;; appear in any order. The reason this is necessary is that Gnu diff3 | |
949 | ;; can produce the groups in the order 1, 2, 3 or 1, 3, 2. | |
950 | (save-excursion | |
951 | (re-search-forward | |
4960e757 | 952 | (concat "^" file ":\\([0-9]+\\)\\(,\\([0-9]+\\)\\)?\\([ac]\\)\C-m?$")) |
475f9031 KH |
953 | (beginning-of-line 2) |
954 | ;; treatment depends on whether it is an "a" group or a "c" group | |
955 | (if (string-equal (buffer-substring (match-beginning 4) (match-end 4)) "c") | |
956 | ;; it is a "c" group | |
957 | (if (match-beginning 2) | |
958 | ;; it has two numbers | |
027a4b6b | 959 | (list (string-to-number |
475f9031 | 960 | (buffer-substring (match-beginning 1) (match-end 1))) |
027a4b6b | 961 | (1+ (string-to-number |
475f9031 KH |
962 | (buffer-substring (match-beginning 3) (match-end 3))))) |
963 | ;; it has one number | |
027a4b6b | 964 | (let ((x (string-to-number |
475f9031 KH |
965 | (buffer-substring (match-beginning 1) (match-end 1))))) |
966 | (list x (1+ x)))) | |
967 | ;; it is an "a" group | |
027a4b6b | 968 | (let ((x (1+ (string-to-number |
475f9031 KH |
969 | (buffer-substring (match-beginning 1) (match-end 1)))))) |
970 | (list x x))))) | |
971 | ||
972 | ||
973 | ;; If WORD-MODE, construct vector of diffs using word numbers. | |
974 | ;; Else, use point values. | |
975 | ;; WORD-MODE also tells if we are in the word-mode or not. | |
976 | ;; If THREE-WAY-COMP, then it is a 3-way comparison. Else, it is merging | |
4ad42cb5 MK |
977 | ;; with ancestor, in which case buffer-C contents is identical to buffer-A/B, |
978 | ;; contents (unless buffer-A is narrowed) depending on ediff-default-variant's | |
979 | ;; value. | |
475f9031 KH |
980 | ;; BOUNDS specifies visibility bounds to use. |
981 | (defun ediff-extract-diffs3 (diff-buffer word-mode three-way-comp | |
982 | &optional bounds) | |
983 | (let ((A-buffer ediff-buffer-A) | |
984 | (B-buffer ediff-buffer-B) | |
985 | (C-buffer ediff-buffer-C) | |
4ad42cb5 | 986 | (anc-buffer ediff-ancestor-buffer) |
475f9031 | 987 | (a-prev 1) ; needed to set the first diff line correctly |
b6178721 | 988 | (a-prev-pt nil) |
475f9031 | 989 | (b-prev 1) |
b6178721 | 990 | (b-prev-pt nil) |
475f9031 | 991 | (c-prev 1) |
b6178721 | 992 | (c-prev-pt nil) |
4ad42cb5 | 993 | (anc-prev 1) |
475f9031 KH |
994 | diff-list shift-A shift-B shift-C |
995 | ) | |
71296446 | 996 | |
475f9031 KH |
997 | ;; diff list contains word numbers or points, depending on word-mode |
998 | (setq diff-list (cons (if word-mode 'words 'points) | |
999 | diff-list)) | |
1000 | (if bounds | |
1001 | (setq shift-A | |
1002 | (ediff-overlay-start | |
1003 | (ediff-get-value-according-to-buffer-type 'A bounds)) | |
50a07e18 | 1004 | shift-B |
475f9031 KH |
1005 | (ediff-overlay-start |
1006 | (ediff-get-value-according-to-buffer-type 'B bounds)) | |
50a07e18 | 1007 | shift-C |
475f9031 KH |
1008 | (if three-way-comp |
1009 | (ediff-overlay-start | |
1010 | (ediff-get-value-according-to-buffer-type 'C bounds))))) | |
71296446 | 1011 | |
475f9031 | 1012 | ;; reset point in buffers A, B, C |
e756eb9f | 1013 | (ediff-with-current-buffer A-buffer |
475f9031 | 1014 | (goto-char (if shift-A shift-A (point-min)))) |
e756eb9f | 1015 | (ediff-with-current-buffer B-buffer |
475f9031 | 1016 | (goto-char (if shift-B shift-B (point-min)))) |
4ad42cb5 | 1017 | (if three-way-comp |
e756eb9f | 1018 | (ediff-with-current-buffer C-buffer |
4ad42cb5 MK |
1019 | (goto-char (if shift-C shift-C (point-min))))) |
1020 | (if (ediff-buffer-live-p anc-buffer) | |
e756eb9f | 1021 | (ediff-with-current-buffer anc-buffer |
4ad42cb5 | 1022 | (goto-char (point-min)))) |
71296446 | 1023 | |
e756eb9f | 1024 | (ediff-with-current-buffer diff-buffer |
475f9031 KH |
1025 | (goto-char (point-min)) |
1026 | (while (re-search-forward ediff-match-diff3-line nil t) | |
1027 | ;; leave point after matched line | |
1028 | (beginning-of-line 2) | |
1029 | (let ((agreement (buffer-substring (match-beginning 1) (match-end 1)))) | |
bbe6126c | 1030 | ;; if the files A and B are the same and not 3way-comparison, |
475f9031 KH |
1031 | ;; ignore the difference |
1032 | (if (or three-way-comp (not (string-equal agreement "3"))) | |
1033 | (let* ((a-begin (car (ediff-get-diff3-group "1"))) | |
1034 | (a-end (nth 1 (ediff-get-diff3-group "1"))) | |
1035 | (b-begin (car (ediff-get-diff3-group "2"))) | |
1036 | (b-end (nth 1 (ediff-get-diff3-group "2"))) | |
4ad42cb5 MK |
1037 | (c-or-anc-begin (car (ediff-get-diff3-group "3"))) |
1038 | (c-or-anc-end (nth 1 (ediff-get-diff3-group "3"))) | |
475f9031 KH |
1039 | (state-of-merge |
1040 | (cond ((string-equal agreement "1") 'prefer-A) | |
1041 | ((string-equal agreement "2") 'prefer-B) | |
1042 | (t ediff-default-variant))) | |
1043 | (state-of-diff-merge | |
1044 | (if (memq state-of-merge '(default-A prefer-A)) 'B 'A)) | |
1045 | (state-of-diff-comparison | |
1046 | (cond ((string-equal agreement "1") 'A) | |
1047 | ((string-equal agreement "2") 'B) | |
1048 | ((string-equal agreement "3") 'C))) | |
4ad42cb5 | 1049 | state-of-ancestor |
475f9031 KH |
1050 | c-begin c-end |
1051 | a-begin-pt a-end-pt | |
4ad42cb5 MK |
1052 | b-begin-pt b-end-pt |
1053 | c-begin-pt c-end-pt | |
1054 | anc-begin-pt anc-end-pt) | |
71296446 | 1055 | |
4ad42cb5 MK |
1056 | (setq state-of-ancestor |
1057 | (= c-or-anc-begin c-or-anc-end)) | |
1058 | ||
1059 | (cond (three-way-comp | |
1060 | (setq c-begin c-or-anc-begin | |
1061 | c-end c-or-anc-end)) | |
1062 | ((eq ediff-default-variant 'default-B) | |
1063 | (setq c-begin b-begin | |
1064 | c-end b-end)) | |
1065 | (t | |
1066 | (setq c-begin a-begin | |
1067 | c-end a-end))) | |
71296446 | 1068 | |
475f9031 KH |
1069 | ;; compute main diff vector |
1070 | (if word-mode | |
1071 | ;; make diff-list contain word numbers | |
50a07e18 | 1072 | (setq diff-list |
475f9031 KH |
1073 | (nconc diff-list |
1074 | (list (vector | |
1075 | (- a-begin a-prev) (- a-end a-begin) | |
1076 | (- b-begin b-prev) (- b-end b-begin) | |
1077 | (- c-begin c-prev) (- c-end c-begin) | |
4ad42cb5 MK |
1078 | nil nil ; dummy ancestor |
1079 | nil ; state of diff | |
1080 | nil ; state of merge | |
1081 | nil ; state of ancestor | |
1082 | ))) | |
475f9031 KH |
1083 | a-prev a-end |
1084 | b-prev b-end | |
1085 | c-prev c-end) | |
1086 | ;; else convert lines to points | |
e756eb9f | 1087 | (ediff-with-current-buffer A-buffer |
8ea74b0e MK |
1088 | (let ((longlines-mode-val |
1089 | (if (and (boundp 'longlines-mode) longlines-mode) 1 0))) | |
1090 | ;; we must disable and then restore longlines-mode | |
1091 | (if (eq longlines-mode-val 1) | |
1092 | (longlines-mode 0)) | |
b6178721 | 1093 | (goto-char (or a-prev-pt shift-A (point-min))) |
8ea74b0e MK |
1094 | (forward-line (- a-begin a-prev)) |
1095 | (setq a-begin-pt (point)) | |
1096 | (forward-line (- a-end a-begin)) | |
1097 | (setq a-end-pt (point) | |
b6178721 MK |
1098 | a-prev a-end |
1099 | a-prev-pt a-end-pt) | |
8ea74b0e MK |
1100 | (if (eq longlines-mode-val 1) |
1101 | (longlines-mode longlines-mode-val)) | |
1102 | )) | |
e756eb9f | 1103 | (ediff-with-current-buffer B-buffer |
8ea74b0e MK |
1104 | (let ((longlines-mode-val |
1105 | (if (and (boundp 'longlines-mode) longlines-mode) 1 0))) | |
1106 | (if (eq longlines-mode-val 1) | |
1107 | (longlines-mode 0)) | |
b6178721 | 1108 | (goto-char (or b-prev-pt shift-B (point-min))) |
8ea74b0e MK |
1109 | (forward-line (- b-begin b-prev)) |
1110 | (setq b-begin-pt (point)) | |
1111 | (forward-line (- b-end b-begin)) | |
1112 | (setq b-end-pt (point) | |
b6178721 MK |
1113 | b-prev b-end |
1114 | b-prev-pt b-end-pt) | |
8ea74b0e MK |
1115 | (if (eq longlines-mode-val 1) |
1116 | (longlines-mode longlines-mode-val)) | |
1117 | )) | |
e756eb9f | 1118 | (ediff-with-current-buffer C-buffer |
8ea74b0e MK |
1119 | (let ((longlines-mode-val |
1120 | (if (and (boundp 'longlines-mode) longlines-mode) 1 0))) | |
1121 | (if (eq longlines-mode-val 1) | |
1122 | (longlines-mode 0)) | |
b6178721 | 1123 | (goto-char (or c-prev-pt shift-C (point-min))) |
8ea74b0e MK |
1124 | (forward-line (- c-begin c-prev)) |
1125 | (setq c-begin-pt (point)) | |
1126 | (forward-line (- c-end c-begin)) | |
1127 | (setq c-end-pt (point) | |
b6178721 MK |
1128 | c-prev c-end |
1129 | c-prev-pt c-end-pt) | |
8ea74b0e MK |
1130 | (if (eq longlines-mode-val 1) |
1131 | (longlines-mode longlines-mode-val)) | |
1132 | )) | |
4ad42cb5 | 1133 | (if (ediff-buffer-live-p anc-buffer) |
e756eb9f | 1134 | (ediff-with-current-buffer anc-buffer |
8ea74b0e MK |
1135 | (let ((longlines-mode-val |
1136 | (if (and (boundp 'longlines-mode) longlines-mode) 1 0))) | |
1137 | (if (eq longlines-mode-val 1) | |
1138 | (longlines-mode 0)) | |
1139 | (forward-line (- c-or-anc-begin anc-prev)) | |
1140 | (setq anc-begin-pt (point)) | |
1141 | (forward-line (- c-or-anc-end c-or-anc-begin)) | |
1142 | (setq anc-end-pt (point) | |
1143 | anc-prev c-or-anc-end) | |
1144 | (if (eq longlines-mode-val 1) | |
1145 | (longlines-mode longlines-mode-val)) | |
1146 | ))) | |
50a07e18 | 1147 | (setq diff-list |
475f9031 KH |
1148 | (nconc |
1149 | diff-list | |
1150 | ;; if comparing with ancestor, then there also is a | |
1151 | ;; state-of-difference marker | |
1152 | (if three-way-comp | |
1153 | (list (vector | |
1154 | a-begin-pt a-end-pt | |
1155 | b-begin-pt b-end-pt | |
1156 | c-begin-pt c-end-pt | |
4ad42cb5 | 1157 | nil nil ; ancestor begin/end |
475f9031 | 1158 | state-of-diff-comparison |
4ad42cb5 MK |
1159 | nil ; state of merge |
1160 | nil ; state of ancestor | |
475f9031 KH |
1161 | )) |
1162 | (list (vector a-begin-pt a-end-pt | |
1163 | b-begin-pt b-end-pt | |
1164 | c-begin-pt c-end-pt | |
4ad42cb5 | 1165 | anc-begin-pt anc-end-pt |
475f9031 KH |
1166 | state-of-diff-merge |
1167 | state-of-merge | |
4ad42cb5 | 1168 | state-of-ancestor |
475f9031 KH |
1169 | ))) |
1170 | ))) | |
1171 | )) | |
71296446 | 1172 | |
e756eb9f | 1173 | ))) ; end ediff-with-current-buffer |
475f9031 KH |
1174 | diff-list |
1175 | )) | |
71296446 | 1176 | |
475f9031 KH |
1177 | ;; Generate the difference vector and overlays for three files |
1178 | ;; File-C is either the third file to compare (in case of 3-way comparison) | |
1179 | ;; or it is the ancestor file. | |
1180 | (defun ediff-setup-diff-regions3 (file-A file-B file-C) | |
b6178721 | 1181 | ;; looking for '-i' or a 'i' among clustered non-long options |
608c89a9 | 1182 | (if (string-match "^-i\\| -i\\|\\(^\\| \\)-[^- ]+i" ediff-diff-options) |
b6178721 MK |
1183 | (error "Option `-i' is not allowed in `ediff-diff3-options'")) |
1184 | ||
475f9031 KH |
1185 | (or (ediff-buffer-live-p ediff-diff-buffer) |
1186 | (setq ediff-diff-buffer | |
1187 | (get-buffer-create (ediff-unique-buffer-name "*ediff-diff" "*")))) | |
71296446 | 1188 | |
4ad42cb5 MK |
1189 | (message "Computing differences ...") |
1190 | (ediff-exec-process ediff-diff3-program ediff-diff-buffer 'synchronize | |
b6178721 | 1191 | ediff-actual-diff3-options file-A file-B file-C) |
71296446 | 1192 | |
475f9031 | 1193 | (ediff-prepare-error-list ediff-diff3-ok-lines-regexp ediff-diff-buffer) |
4ad42cb5 | 1194 | ;;(message "Computing differences ... done") |
475f9031 KH |
1195 | (ediff-convert-diffs-to-overlays |
1196 | (ediff-extract-diffs3 | |
1197 | ediff-diff-buffer | |
1198 | ediff-word-mode ediff-3way-comparison-job ediff-narrow-bounds) | |
1199 | )) | |
71296446 | 1200 | |
475f9031 | 1201 | |
4ae69eac | 1202 | ;; Execute PROGRAM asynchronously, unless OS/2, Windows-*, or DOS, or unless |
e756eb9f MK |
1203 | ;; SYNCH is non-nil. BUFFER must be a buffer object, and must be alive. The |
1204 | ;; OPTIONS arg is a list of options to pass to PROGRAM. It may be a blank | |
1205 | ;; string. All elements in FILES must be strings. We also delete nil from | |
1206 | ;; args. | |
1207 | (defun ediff-exec-process (program buffer synch options &rest files) | |
1208 | (let ((data (match-data)) | |
95aac6d1 EZ |
1209 | ;; If this is a buffer job, we are diffing temporary files |
1210 | ;; produced by Emacs with ediff-coding-system-for-write, so | |
1211 | ;; use the same encoding to read the results. | |
1212 | (coding-system-for-read | |
1213 | (if (string-match "buffer" (symbol-name ediff-job-name)) | |
1214 | ediff-coding-system-for-write | |
1215 | ediff-coding-system-for-read)) | |
e756eb9f MK |
1216 | args) |
1217 | (setq args (append (split-string options) files)) | |
1218 | (setq args (delete "" (delq nil args))) ; delete nil and "" from arguments | |
7997f1ca | 1219 | ;; the --binary option, if present, should be used only for buffer jobs |
560ef11a | 1220 | ;; or for refining the differences |
7997f1ca | 1221 | (or (string-match "buffer" (symbol-name ediff-job-name)) |
560ef11a | 1222 | (eq buffer ediff-fine-diff-buffer) |
7997f1ca | 1223 | (setq args (delete "--binary" args))) |
475f9031 KH |
1224 | (unwind-protect |
1225 | (let ((directory default-directory) | |
1226 | proc) | |
7fdbcd83 | 1227 | (with-current-buffer buffer |
475f9031 KH |
1228 | (erase-buffer) |
1229 | (setq default-directory directory) | |
24ac444f | 1230 | (if (or (memq system-type '(ms-dos windows-nt)) |
4ae69eac | 1231 | synch) |
24ac444f | 1232 | ;; In Windows do it synchronously, since Windows doesn't let us |
4ad42cb5 MK |
1233 | ;; delete files used by other processes. Thus, in ediff-buffers |
1234 | ;; and similar functions, we can't delete temp files because | |
4ae69eac | 1235 | ;; they might be used by the asynch process that computes |
4ad42cb5 MK |
1236 | ;; custom diffs. So, we have to wait till custom diff |
1237 | ;; subprocess is done. | |
4ae69eac MK |
1238 | ;; In DOS, must synchronize because DOS doesn't have |
1239 | ;; asynchronous processes. | |
31e71026 | 1240 | (apply 'call-process program nil buffer nil args) |
4ad42cb5 MK |
1241 | ;; On other systems, do it asynchronously. |
1242 | (setq proc (get-buffer-process buffer)) | |
1243 | (if proc (kill-process proc)) | |
1244 | (setq proc | |
1245 | (apply 'start-process "Custom Diff" buffer program args)) | |
1246 | (setq mode-line-process '(":%s")) | |
1247 | (set-process-sentinel proc 'ediff-process-sentinel) | |
1248 | (set-process-filter proc 'ediff-process-filter) | |
1249 | ))) | |
2eb4bdca | 1250 | (store-match-data data)))) |
71296446 | 1251 | |
863312cd | 1252 | ;; This is shell-command-filter from simple.el in Emacs. |
475f9031 | 1253 | ;; Copied here because XEmacs doesn't have it. |
4ad42cb5 | 1254 | (defun ediff-process-filter (proc string) |
475f9031 KH |
1255 | ;; Do save-excursion by hand so that we can leave point numerically unchanged |
1256 | ;; despite an insertion immediately after it. | |
1257 | (let* ((obuf (current-buffer)) | |
1258 | (buffer (process-buffer proc)) | |
1259 | opoint | |
1260 | (window (get-buffer-window buffer)) | |
1261 | (pos (window-start window))) | |
1262 | (unwind-protect | |
1263 | (progn | |
1264 | (set-buffer buffer) | |
1265 | (or (= (point) (point-max)) | |
1266 | (setq opoint (point))) | |
1267 | (goto-char (point-max)) | |
1268 | (insert-before-markers string)) | |
1269 | ;; insert-before-markers moved this marker: set it back. | |
1270 | (set-window-start window pos) | |
1271 | ;; Finish our save-excursion. | |
1272 | (if opoint | |
1273 | (goto-char opoint)) | |
1274 | (set-buffer obuf)))) | |
71296446 | 1275 | |
475f9031 KH |
1276 | ;; like shell-command-sentinel but doesn't print an exit status message |
1277 | ;; we do this because diff always exits with status 1, if diffs are found | |
1278 | ;; so shell-command-sentinel displays a confusing message to the user | |
4ad42cb5 | 1279 | (defun ediff-process-sentinel (process signal) |
475f9031 KH |
1280 | (if (and (memq (process-status process) '(exit signal)) |
1281 | (buffer-name (process-buffer process))) | |
1282 | (progn | |
7fdbcd83 | 1283 | (with-current-buffer (process-buffer process) |
475f9031 KH |
1284 | (setq mode-line-process nil)) |
1285 | (delete-process process)))) | |
71296446 | 1286 | |
475f9031 | 1287 | |
50a07e18 | 1288 | ;;; Word functions used to refine the current diff |
475f9031 KH |
1289 | |
1290 | (defvar ediff-forward-word-function 'ediff-forward-word | |
fb7ada5f | 1291 | "Function to call to move to the next word. |
475f9031 | 1292 | Used for splitting difference regions into individual words.") |
743a79af | 1293 | (make-variable-buffer-local 'ediff-forward-word-function) |
475f9031 | 1294 | |
fe7a3057 | 1295 | ;; \240 is Unicode symbol for nonbreakable whitespace |
ec6aebe8 | 1296 | (defvar ediff-whitespace " \n\t\f\r\240" |
fb7ada5f | 1297 | "Characters constituting white space. |
475f9031 | 1298 | These characters are ignored when differing regions are split into words.") |
743a79af | 1299 | (make-variable-buffer-local 'ediff-whitespace) |
475f9031 | 1300 | |
50a07e18 | 1301 | (defvar ediff-word-1 |
dc3fbc6a | 1302 | (if (featurep 'xemacs) "a-zA-Z---_" "-[:word:]_") |
fb7ada5f | 1303 | "Characters that constitute words of type 1. |
475f9031 | 1304 | More precisely, [ediff-word-1] is a regexp that matches type 1 words. |
50a07e18 | 1305 | See `ediff-forward-word' for more details.") |
743a79af | 1306 | (make-variable-buffer-local 'ediff-word-1) |
475f9031 KH |
1307 | |
1308 | (defvar ediff-word-2 "0-9.," | |
fb7ada5f | 1309 | "Characters that constitute words of type 2. |
475f9031 KH |
1310 | More precisely, [ediff-word-2] is a regexp that matches type 2 words. |
1311 | See `ediff-forward-word' for more details.") | |
743a79af | 1312 | (make-variable-buffer-local 'ediff-word-2) |
475f9031 KH |
1313 | |
1314 | (defvar ediff-word-3 "`'?!:;\"{}[]()" | |
fb7ada5f | 1315 | "Characters that constitute words of type 3. |
475f9031 KH |
1316 | More precisely, [ediff-word-3] is a regexp that matches type 3 words. |
1317 | See `ediff-forward-word' for more details.") | |
743a79af | 1318 | (make-variable-buffer-local 'ediff-word-3) |
475f9031 KH |
1319 | |
1320 | (defvar ediff-word-4 | |
1321 | (concat "^" ediff-word-1 ediff-word-2 ediff-word-3 ediff-whitespace) | |
fb7ada5f | 1322 | "Characters that constitute words of type 4. |
475f9031 | 1323 | More precisely, [ediff-word-4] is a regexp that matches type 4 words. |
50a07e18 | 1324 | See `ediff-forward-word' for more details.") |
743a79af | 1325 | (make-variable-buffer-local 'ediff-word-4) |
475f9031 KH |
1326 | |
1327 | ;; Split region along word boundaries. Each word will be on its own line. | |
1328 | ;; Output to buffer out-buffer. | |
1329 | (defun ediff-forward-word () | |
1330 | "Move point one word forward. | |
1331 | There are four types of words, each of which consists entirely of | |
1332 | characters in `ediff-word-1', `ediff-word-2', `ediff-word-3', or | |
6de3983f MK |
1333 | `ediff-word-4'. Words are recognized by passing these one after another as |
1334 | arguments to `skip-chars-forward'." | |
1335 | (or (> (+ (skip-chars-forward ediff-word-1) | |
1336 | (skip-syntax-forward "w")) | |
1337 | 0) | |
475f9031 KH |
1338 | (> (skip-chars-forward ediff-word-2) 0) |
1339 | (> (skip-chars-forward ediff-word-3) 0) | |
1340 | (> (skip-chars-forward ediff-word-4) 0) | |
1341 | )) | |
1342 | ||
d396e521 | 1343 | |
475f9031 | 1344 | (defun ediff-wordify (beg end in-buffer out-buffer &optional control-buf) |
50a07e18 MK |
1345 | (let ((forward-word-function |
1346 | ;; eval in control buf to let user create local versions for | |
1347 | ;; different invocations | |
1348 | (if control-buf | |
1349 | (ediff-with-current-buffer control-buf | |
1350 | ediff-forward-word-function) | |
1351 | ediff-forward-word-function)) | |
1352 | inbuf-syntax-tbl sv-point diff-string) | |
7fdbcd83 | 1353 | (with-current-buffer in-buffer |
4986c2c6 MK |
1354 | (setq inbuf-syntax-tbl |
1355 | (if control-buf | |
1356 | (ediff-with-current-buffer control-buf | |
1357 | ediff-syntax-table) | |
1358 | (syntax-table))) | |
1359 | (setq diff-string (buffer-substring-no-properties beg end)) | |
475f9031 KH |
1360 | |
1361 | (set-buffer out-buffer) | |
4696802b | 1362 | ;; Make sure that temp buff syntax table is the same as the original buf |
d396e521 MK |
1363 | ;; syntax tbl, because we use ediff-forward-word in both and |
1364 | ;; ediff-forward-word depends on the syntax classes of characters. | |
1365 | (set-syntax-table inbuf-syntax-tbl) | |
475f9031 | 1366 | (erase-buffer) |
4986c2c6 | 1367 | (insert diff-string) |
475f9031 KH |
1368 | (goto-char (point-min)) |
1369 | (skip-chars-forward ediff-whitespace) | |
1370 | (delete-region (point-min) (point)) | |
71296446 | 1371 | |
475f9031 | 1372 | (while (not (eobp)) |
50a07e18 | 1373 | (funcall forward-word-function) |
475f9031 KH |
1374 | (setq sv-point (point)) |
1375 | (skip-chars-forward ediff-whitespace) | |
1376 | (delete-region sv-point (point)) | |
1377 | (insert "\n"))))) | |
71296446 | 1378 | |
50a07e18 | 1379 | ;; copy string specified as BEG END from IN-BUF to OUT-BUF |
475f9031 | 1380 | (defun ediff-copy-to-buffer (beg end in-buffer out-buffer) |
50a07e18 MK |
1381 | (with-current-buffer out-buffer |
1382 | (erase-buffer) | |
1383 | (insert-buffer-substring in-buffer beg end) | |
1384 | (goto-char (point-min)))) | |
475f9031 KH |
1385 | |
1386 | ||
1387 | ;; goto word #n starting at current position in buffer `buf' | |
4986c2c6 | 1388 | ;; For ediff, a word is determined by ediff-forward-word-function |
475f9031 KH |
1389 | ;; If `flag' is non-nil, goto the end of the n-th word. |
1390 | (defun ediff-goto-word (n buf &optional flag) | |
1391 | ;; remember val ediff-forward-word-function has in ctl buf | |
4986c2c6 MK |
1392 | (let ((fwd-word-fun ediff-forward-word-function) |
1393 | (syntax-tbl ediff-syntax-table)) | |
e756eb9f | 1394 | (ediff-with-current-buffer buf |
475f9031 | 1395 | (skip-chars-forward ediff-whitespace) |
50a07e18 MK |
1396 | (ediff-with-syntax-table syntax-tbl |
1397 | (while (> n 1) | |
1398 | (funcall fwd-word-fun) | |
1399 | (skip-chars-forward ediff-whitespace) | |
17561e4f MK |
1400 | (setq n (1- n))) |
1401 | (if (and flag (> n 0)) | |
1402 | (funcall fwd-word-fun))) | |
475f9031 KH |
1403 | (point)))) |
1404 | ||
328b4b70 | 1405 | (defun ediff-same-file-contents (f1 f2) |
17561e4f MK |
1406 | "Return t if files F1 and F2 have identical contents." |
1407 | (if (and (not (file-directory-p f1)) | |
1408 | (not (file-directory-p f2))) | |
01795a1b MA |
1409 | (if (equal (file-remote-p f1) (file-remote-p f2)) |
1410 | (let ((res | |
1411 | ;; In the remote case, this works only if F1 and F2 are | |
1412 | ;; located on the same remote host. | |
1413 | (apply 'process-file ediff-cmp-program nil nil nil | |
1414 | (append ediff-cmp-options | |
1415 | (list (or (file-remote-p f1 'localname) | |
1416 | (expand-file-name f1)) | |
1417 | (or (file-remote-p f2 'localname) | |
1418 | (expand-file-name f2))))) | |
1419 | )) | |
1420 | (and (numberp res) (eq res 0))) | |
1421 | ||
1422 | ;; F1 and F2 are not located on the same host. | |
1423 | (let ((t1 (file-local-copy f1)) | |
1424 | (t2 (file-local-copy f2))) | |
1425 | (unwind-protect | |
1426 | (ediff-same-file-contents (or t1 f1) (or t2 f2)) | |
1427 | (and t1 (delete-file t1)) | |
1428 | (and t2 (delete-file t2)))) | |
1429 | ))) | |
17561e4f MK |
1430 | |
1431 | ||
1432 | (defun ediff-same-contents (d1 d2 &optional filter-re) | |
4837b516 | 1433 | "Return t if D1 and D2 have the same content. |
17561e4f MK |
1434 | D1 and D2 can either be both directories or both regular files. |
1435 | Symlinks and the likes are not handled. | |
1436 | If FILTER-RE is non-nil, recursive checking in directories | |
1437 | affects only files whose names match the expression." | |
1438 | ;; Normalize empty filter RE to nil. | |
899a431b | 1439 | (unless (> (length filter-re) 0) (setq filter-re nil)) |
17561e4f MK |
1440 | ;; Indicate progress |
1441 | (message "Comparing '%s' and '%s' modulo '%s'" d1 d2 filter-re) | |
1442 | (cond | |
1443 | ;; D1 & D2 directories => recurse | |
1444 | ((and (file-directory-p d1) | |
1445 | (file-directory-p d2)) | |
1446 | (if (null ediff-recurse-to-subdirectories) | |
1447 | (if (y-or-n-p "Compare subdirectories recursively? ") | |
1448 | (setq ediff-recurse-to-subdirectories 'yes) | |
1449 | (setq ediff-recurse-to-subdirectories 'no))) | |
1450 | (if (eq ediff-recurse-to-subdirectories 'yes) | |
1451 | (let* ((all-entries-1 (directory-files d1 t filter-re)) | |
1452 | (all-entries-2 (directory-files d2 t filter-re)) | |
899a431b MK |
1453 | (entries-1 (ediff-delete-all-matches "^\\.\\.?$" all-entries-1)) |
1454 | (entries-2 (ediff-delete-all-matches "^\\.\\.?$" all-entries-2)) | |
17561e4f | 1455 | ) |
899a431b MK |
1456 | |
1457 | (ediff-same-file-contents-lists entries-1 entries-2 filter-re) | |
17561e4f MK |
1458 | )) |
1459 | ) ; end of the directories case | |
1460 | ;; D1 & D2 are both files => compare directly | |
1461 | ((and (file-regular-p d1) | |
1462 | (file-regular-p d2)) | |
1463 | (ediff-same-file-contents d1 d2)) | |
1464 | ;; Otherwise => false: unequal contents | |
1465 | ) | |
1466 | ) | |
328b4b70 | 1467 | |
899a431b MK |
1468 | ;; If lists have the same length and names of files are pairwise equal |
1469 | ;; (removing the directories) then compare contents pairwise. | |
1470 | ;; True if all contents are the same; false otherwise | |
1471 | (defun ediff-same-file-contents-lists (entries-1 entries-2 filter-re) | |
1472 | ;; First, check only the names (works quickly and ensures a | |
1473 | ;; precondition for subsequent code) | |
1474 | (if (and (= (length entries-1) (length entries-2)) | |
1475 | (equal (mapcar 'file-name-nondirectory entries-1) | |
1476 | (mapcar 'file-name-nondirectory entries-2))) | |
1477 | ;; With name equality established, compare the entries | |
1478 | ;; through recursion. | |
1479 | (let ((continue t)) | |
1480 | (while (and entries-1 continue) | |
1481 | (if (ediff-same-contents | |
1482 | (car entries-1) (car entries-2) filter-re) | |
1483 | (setq entries-1 (cdr entries-1) | |
1484 | entries-2 (cdr entries-2)) | |
1485 | (setq continue nil)) | |
1486 | ) | |
1487 | ;; if reached the end then lists are equal | |
1488 | (null entries-1)) | |
1489 | ) | |
1490 | ) | |
1491 | ||
1492 | ||
1493 | ;; ARG1 is a regexp, ARG2 is a list of full-filenames | |
1494 | ;; Delete all entries that match the regexp | |
1495 | (defun ediff-delete-all-matches (regex file-list-list) | |
1496 | (let (result elt) | |
1497 | (while file-list-list | |
1498 | (setq elt (car file-list-list)) | |
1499 | (or (string-match regex (file-name-nondirectory elt)) | |
1500 | (setq result (cons elt result))) | |
1501 | (setq file-list-list (cdr file-list-list))) | |
1502 | (reverse result))) | |
1503 | ||
ec6aebe8 MK |
1504 | |
1505 | (defun ediff-set-actual-diff-options () | |
1506 | (if ediff-ignore-case | |
36ba07ae | 1507 | (setq ediff-actual-diff-options |
ec6aebe8 MK |
1508 | (concat ediff-diff-options " " ediff-ignore-case-option) |
1509 | ediff-actual-diff3-options | |
1510 | (concat ediff-diff3-options " " ediff-ignore-case-option3)) | |
1511 | (setq ediff-actual-diff-options ediff-diff-options | |
1512 | ediff-actual-diff3-options ediff-diff3-options) | |
1513 | ) | |
1514 | (setq-default ediff-actual-diff-options ediff-actual-diff-options | |
1515 | ediff-actual-diff3-options ediff-actual-diff3-options) | |
1516 | ) | |
1517 | ||
1518 | ||
b6178721 MK |
1519 | ;; Ignore case handling - some ideas from drew.adams@@oracle.com |
1520 | (defun ediff-toggle-ignore-case () | |
1521 | (interactive) | |
1522 | (ediff-barf-if-not-control-buffer) | |
1523 | (setq ediff-ignore-case (not ediff-ignore-case)) | |
ec6aebe8 MK |
1524 | (ediff-set-actual-diff-options) |
1525 | (if ediff-ignore-case | |
1526 | (message "Ignoring regions that differ only in case") | |
1527 | (message "Ignoring case differences turned OFF")) | |
b6178721 MK |
1528 | (cond (ediff-merge-job |
1529 | (message "Ignoring letter case is too dangerous in merge jobs")) | |
1530 | ((and ediff-diff3-job (string= ediff-ignore-case-option3 "")) | |
1531 | (message "Ignoring letter case is not supported by this diff3 program")) | |
1532 | ((and (not ediff-3way-job) (string= ediff-ignore-case-option "")) | |
1533 | (message "Ignoring letter case is not supported by this diff program")) | |
1534 | (t | |
1535 | (sit-for 1) | |
1536 | (ediff-update-diffs))) | |
1537 | ) | |
1538 | ||
1539 | ||
475f9031 | 1540 | |
fa043571 SM |
1541 | ;; Local Variables: |
1542 | ;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) | |
1543 | ;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) | |
1544 | ;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) | |
1545 | ;; End: | |
bbe6126c | 1546 | |
3afbc435 | 1547 | ;;; ediff-diff.el ends here |