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