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