annotate lisp/ediff-diff.el @ 30951:e6acd4b6a8d5

(encode_coding_string): Fix previous change.
author Kenichi Handa <handa@m17n.org>
date Fri, 18 Aug 2000 10:48:26 +0000
parents f7f64f1ccc38
children f6a67d77484a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1 ;;; ediff-diff.el --- diff-related utilities
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13953
diff changeset
2
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
3 ;; Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
4
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
6
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
7 ;; This file is part of GNU Emacs.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
8
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
9 ;; GNU Emacs is free software; you can redistribute it and/or modify
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
10 ;; it under the terms of the GNU General Public License as published by
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
11 ;; the Free Software Foundation; either version 2, or (at your option)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
12 ;; any later version.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
13
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
14 ;; GNU Emacs is distributed in the hope that it will be useful,
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
15 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
17 ;; GNU General Public License for more details.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
18
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
19 ;; You should have received a copy of the GNU General Public License
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13953
diff changeset
20 ;; along with GNU Emacs; see the file COPYING. If not, write to the
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13953
diff changeset
21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13953
diff changeset
22 ;; Boston, MA 02111-1307, USA.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13953
diff changeset
23
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13953
diff changeset
24 ;;; Code:
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
25
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
26 (provide 'ediff-diff)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
27
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
28 ;; compiler pacifier
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
29 (defvar ediff-default-variant)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
30
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
31 (eval-when-compile
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
32 (let ((load-path (cons (expand-file-name ".") load-path)))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
33 (or (featurep 'ediff-init)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
34 (load "ediff-init.el" nil nil 'nosuffix))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
35 (or (featurep 'ediff-util)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
36 (load "ediff-util.el" nil nil 'nosuffix))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
37 ))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
38 ;; end pacifier
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
39
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
40 (require 'ediff-init)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
41
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
42 (defgroup ediff-diff nil
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
43 "Diff related utilities"
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
44 :prefix "ediff-"
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
45 :group 'ediff)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
46
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
47
29165
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
48 ;; The following functions needed for setting diff/diff3 options
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
49 ;; test if diff supports the --binary option
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
50 (defsubst ediff-test-utility (diff-util option &optional files)
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
51 (zerop (apply 'call-process
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
52 (append (list diff-util nil nil nil option) files))))
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
53
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
54 (defun ediff-diff-mandatory-option (diff-util)
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
55 (let ((file (if (boundp 'null-device) null-device "/dev/null")))
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
56 (cond ((not (memq system-type '(ms-dos windows-nt windows-95)))
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
57 "")
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
58 ((and (string= diff-util ediff-diff-program)
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
59 (ediff-test-utility
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
60 ediff-diff-program "--binary" (list file file)))
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
61 "--binary")
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
62 ((and (string= diff-util ediff-diff3-program)
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
63 (ediff-test-utility
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
64 ediff-diff3-program "--binary" (list file file file)))
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
65 "--binary")
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
66 (t ""))))
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
67
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
68 ;; make sure that mandatory options are added even if the user changes
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
69 ;; ediff-diff-options or ediff-diff3-options in the customization widget
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
70 (defun ediff-reset-diff-options (symb val)
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
71 (let* ((diff-program
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
72 (if (eq symb 'ediff-diff-options)
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
73 ediff-diff-program
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
74 ediff-diff3-program))
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
75 (mandatory-option (ediff-diff-mandatory-option diff-program))
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
76 (spacer (if (string-equal mandatory-option "") "" " ")))
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
77 (set symb
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
78 (if (string-match mandatory-option val)
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
79 val
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
80 (concat mandatory-option spacer val)))
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
81 ))
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
82
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
83
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
84 (defcustom ediff-shell
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
85 (cond ((eq system-type 'emx) "cmd") ; OS/2
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15175
diff changeset
86 ((memq system-type '(ms-dos windows-nt windows-95))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15175
diff changeset
87 shell-file-name) ; no standard name on MS-DOS
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
88 ((memq system-type '(vax-vms axp-vms)) "*dcl*") ; VMS
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
89 (t "sh")) ; UNIX
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
90 "*The shell used to run diff and patch. If user's .profile or
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
91 .cshrc files are set up correctly, any shell will do. However, some people
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
92 set $prompt or other things incorrectly, which leads to undesirable output
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
93 messages. These may cause Ediff to fail. In such a case, set ediff-shell
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
94 to a shell that you are not using or, better, fix your shell's startup file."
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
95 :type 'string
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
96 :group 'ediff-diff)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
97
20206
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
98 (defcustom ediff-cmp-program "cmp"
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
99 "*Utility to use to determine if two files are identical.
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
100 It must return code 0, if its arguments are identical files."
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
101 :type 'string
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
102 :group 'ediff-diff)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
103
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
104 (defcustom ediff-cmp-options nil
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
105 "*Options to pass to `ediff-cmp-program'. If GNUS diff is used as
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
106 `ediff-cmp-program', then the most useful options are `-I' RE, to
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
107 ignore changes whose lines all match RE."
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
108 :type '(repeat string)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
109 :group 'ediff-diff)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
110
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
111 (defcustom ediff-diff-program "diff"
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
112 "*Program to use for generating the differential of the two files."
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
113 :type 'string
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
114 :group 'ediff-diff)
29165
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
115 (defcustom ediff-diff-options ""
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
116 "*Options to pass to `ediff-diff-program'.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
117 If diff\(1\) is used as `ediff-diff-program', then the most useful options are
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
118 `-w', to ignore space, and `-i', to ignore case of letters.
19774
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
119 At present, the option `-c' is not allowed."
29165
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
120 :set 'ediff-reset-diff-options
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
121 :type 'string
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
122 :group 'ediff-diff)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
123
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
124 (defcustom ediff-custom-diff-program ediff-diff-program
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
125 "*Program to use for generating custom diff output for saving it in a file.
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
126 This output is not used by Ediff internally."
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
127 :type 'string
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
128 :group 'ediff-diff)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
129 (defcustom ediff-custom-diff-options "-c"
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
130 "*Options to pass to `ediff-custom-diff-program'."
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
131 :type 'string
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
132 :group 'ediff-diff)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
133
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
134 ;;; Support for diff3
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
135
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
136 (defvar ediff-match-diff3-line "^====\\(.?\\)$"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
137 "Pattern to match lines produced by diff3 that describe differences.")
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
138 (defcustom ediff-diff3-program "diff3"
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
139 "*Program to be used for three-way comparison.
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
140 Must produce output compatible with Unix's diff3 program."
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
141 :type 'string
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
142 :group 'ediff-diff)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
143 (defcustom ediff-diff3-options ""
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
144 "*Options to pass to `ediff-diff3-program'."
29165
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
145 :set 'ediff-reset-diff-options
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
146 :type 'string
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
147 :group 'ediff-diff)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
148 (defcustom ediff-diff3-ok-lines-regexp
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15175
diff changeset
149 "^\\([1-3]:\\|====\\| \\|.*Warning *:\\|.*No newline\\|.*missing newline\\|^\C-m$\\)"
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
150 "*Regexp that matches normal output lines from `ediff-diff3-program'.
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
151 Lines that do not match are assumed to be error messages."
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
152 :type 'regexp
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
153 :group 'ediff-diff)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
154
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
155 ;; keeps the status of the current diff in 3-way jobs.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
156 ;; the status can be =diff(A), =diff(B), or =diff(A+B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
157 (ediff-defvar-local ediff-diff-status "" "")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
158
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
159
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
160 ;;; Fine differences
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
161
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
162 (ediff-defvar-local ediff-auto-refine (if (ediff-has-face-support-p) 'on 'nix)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
163 "If `on', Ediff auto-highlights fine diffs for the current diff region.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
164 If `off', auto-highlighting is not used. If `nix', no fine diffs are shown
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
165 at all, unless the user force-refines the region by hitting `*'.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
166
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
167 This variable can be set either in .emacs or toggled interactively.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
168 Use `setq-default' if setting it in .emacs")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
169
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
170 (ediff-defvar-local ediff-ignore-similar-regions nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
171 "*If t, skip over difference regions that differ only in the white space and line breaks.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
172 This variable can be set either in .emacs or toggled interactively.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
173 Use `setq-default' if setting it in .emacs")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
174
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15175
diff changeset
175 (ediff-defvar-local ediff-auto-refine-limit 1400
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15175
diff changeset
176 "*Auto-refine only the regions of this size \(in bytes\) or less.")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
177
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
178 ;;; General
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
179
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
180 (defvar ediff-diff-ok-lines-regexp
20343
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
181 (concat
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
182 "^\\("
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
183 "[0-9,]+[acd][0-9,]+\C-m?$"
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
184 "\\|[<>] "
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
185 "\\|---"
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
186 "\\|.*Warning *:"
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
187 "\\|.*No +newline"
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
188 "\\|.*missing +newline"
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
189 "\\|^\C-m?$"
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
190 "\\)")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
191 "Regexp that matches normal output lines from `ediff-diff-program'.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
192 This is mostly lifted from Emerge, except that Ediff also considers
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
193 warnings and `Missing newline'-type messages to be normal output.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
194 Lines that do not match are assumed to be error messages.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
195
20343
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
196 (defvar ediff-match-diff-line
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
197 (let ((x "\\([0-9]+\\)\\(\\|,\\([0-9]+\\)\\)"))
4327dd36b71b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 20206
diff changeset
198 (concat "^" x "\\([acd]\\)" x "\C-m?$"))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
199 "Pattern to match lines produced by diff that describe differences.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
200
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
201 (ediff-defvar-local ediff-setup-diff-regions-function nil
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
202 "value is a function symbol depending on the kind of job is to be done.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
203 For 2-way jobs and for ediff-merge, it should be `ediff-setup-diff-regions'.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
204 For jobs requiring diff3, it should be `ediff-setup-diff-regions3'.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
205
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
206 The function should take three mandatory arguments, file-A, file-B, and
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
207 file-C. It may ignore file C for diff2 jobs. It should also take
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
208 one optional arguments, diff-number to refine.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
209
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
210
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
211 ;;; Functions
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
212
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
213 ;; Generate the difference vector and overlays for the two files
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
214 ;; With optional arg REG-TO-REFINE, refine this region.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
215 ;; File-C argument is not used here. It is there just because
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
216 ;; ediff-setup-diff-regions is called via a funcall to
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
217 ;; ediff-setup-diff-regions-function, which can also have the value
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
218 ;; ediff-setup-diff-regions3, which takes 4 arguments.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
219 (defun ediff-setup-diff-regions (file-A file-B file-C)
19774
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
220 (if (string-match "c" ediff-diff-options)
1ecc4a79d048 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19047
diff changeset
221 (error "Option `-c' is not allowed in `ediff-diff-options'"))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
222
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15175
diff changeset
223 ;; create, if it doesn't exist
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
224 (or (ediff-buffer-live-p ediff-diff-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
225 (setq ediff-diff-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
226 (get-buffer-create (ediff-unique-buffer-name "*ediff-diff" "*"))))
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15175
diff changeset
227 (ediff-make-diff2-buffer ediff-diff-buffer file-A file-B)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
228 (ediff-prepare-error-list ediff-diff-ok-lines-regexp ediff-diff-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
229 (ediff-convert-diffs-to-overlays
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
230 (ediff-extract-diffs
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
231 ediff-diff-buffer ediff-word-mode ediff-narrow-bounds)))
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15175
diff changeset
232
15482
b394c4c8b299 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15480
diff changeset
233 ;; 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
234 ;; Return the size of DIFF-BUFFER
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15175
diff changeset
235 (defun ediff-make-diff2-buffer (diff-buffer file1 file2)
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
236 (let ((file1-size (ediff-file-size file1))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
237 (file2-size (ediff-file-size file2)))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
238 (cond ((not (numberp file1-size))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
239 (message "Can't find file: %s"
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
240 (ediff-abbreviate-file-name file1))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
241 (sit-for 2)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
242 ;; 1 is an error exit code
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
243 1)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
244 ((not (numberp file2-size))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
245 (message "Can't find file: %s"
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
246 (ediff-abbreviate-file-name file2))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
247 (sit-for 2)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
248 ;; 1 is an error exit code
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
249 1)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
250 ((< file1-size 0)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
251 (message "Can't diff remote files: %s"
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
252 (ediff-abbreviate-file-name file1))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
253 (sit-for 2)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
254 ;; 1 is an error exit code
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
255 1)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
256 ((< file2-size 0)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
257 (message "Can't diff remote file: %s"
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
258 (ediff-abbreviate-file-name file2))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
259 (sit-for 2)
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15175
diff changeset
260 (message "")
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
261 ;; 1 is an error exit code
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
262 1)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
263 (t (message "Computing differences between %s and %s ..."
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
264 (file-name-nondirectory file1)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
265 (file-name-nondirectory file2))
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
266 ;; this erases the diff buffer automatically
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
267 (ediff-exec-process ediff-diff-program
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
268 diff-buffer
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
269 'synchronize
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
270 ediff-diff-options file1 file2)
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
271 (message "")
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
272 (ediff-with-current-buffer diff-buffer
16248
b2fae8abc5b0 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15482
diff changeset
273 (buffer-size))))))
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15175
diff changeset
274
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15175
diff changeset
275
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
276
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
277 ;; If file-A/B/C is nil, do 2-way comparison with the non-nil buffers
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
278 ;; This function works for diff3 and diff2 jobs
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
279 (defun ediff-setup-fine-diff-regions (file-A file-B file-C reg-num)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
280 (or (ediff-buffer-live-p ediff-fine-diff-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
281 (setq ediff-fine-diff-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
282 (get-buffer-create
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
283 (ediff-unique-buffer-name "*ediff-fine-diff" "*"))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
284
15175
bd6c4ed55f9c (ediff-setup-fine-diff-regions):
Richard M. Stallman <rms@gnu.org>
parents: 14582
diff changeset
285 (let (diff3-job diff-program diff-options ok-regexp diff-list)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
286 (setq diff3-job ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
287 diff-program (if diff3-job ediff-diff3-program ediff-diff-program)
15175
bd6c4ed55f9c (ediff-setup-fine-diff-regions):
Richard M. Stallman <rms@gnu.org>
parents: 14582
diff changeset
288 diff-options (if diff3-job ediff-diff3-options ediff-diff-options)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
289 ok-regexp (if diff3-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
290 ediff-diff3-ok-lines-regexp
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
291 ediff-diff-ok-lines-regexp))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
292
13127
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
293 (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
294 (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
295 diff-options
13127
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
296 ;; 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
297 ;; 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
298 ;; or fB fC.
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
299 (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
300 (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
301 (if diff3-job
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
302 (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
303 ) ; exec process
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
304
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
305 (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
306 (ediff-message-if-verbose
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
307 "")
13127
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
308 ;; "Refining difference region %d ... done" (1+ reg-num))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
309
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
310 (setq diff-list
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
311 (if diff3-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
312 (ediff-extract-diffs3
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
313 ediff-fine-diff-buffer '3way-comparison 'word-mode)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
314 (ediff-extract-diffs ediff-fine-diff-buffer 'word-mode)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
315 ;; fixup diff-list
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
316 (if diff3-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
317 (cond ((not file-A)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
318 (mapcar (lambda (elt)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
319 (aset elt 0 nil)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
320 (aset elt 1 nil))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
321 (cdr diff-list)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
322 ((not file-B)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
323 (mapcar (lambda (elt)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
324 (aset elt 2 nil)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
325 (aset elt 3 nil))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
326 (cdr diff-list)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
327 ((not file-C)
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
328 (mapcar (lambda (elt)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
329 (aset elt 4 nil)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
330 (aset elt 5 nil))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
331 (cdr diff-list)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
332 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
333
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
334 (ediff-convert-fine-diffs-to-overlays diff-list reg-num)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
335 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
336
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
337
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
338 (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
339 (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
340 (setq ediff-error-buffer
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
341 (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
342 "*ediff-errors" "*"))))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
343 (ediff-with-current-buffer ediff-error-buffer
13127
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
344 (erase-buffer)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
345 (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
346 (goto-char (point-min))
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
347 (delete-matching-lines ok-regexp)
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
348 (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
349 (delete-matching-lines "^$")))
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
350 ;; If diff reports errors, show them then quit.
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
351 (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
352 (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
353 (error-buf ediff-error-buffer))
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
354 (ediff-skip-unsuitable-frames)
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
355 (switch-to-buffer error-buf)
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
356 (ediff-kill-buffer-carefully ctl-buf)
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
357 (error "Errors in diff output. Diff output is in %S" diff-buff))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
358
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
359 ;; BOUNDS specifies visibility bounds to use.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
360 ;; WORD-MODE tells whether we are in the word-mode or not.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
361 ;; If WORD-MODE, also construct vector of diffs using word numbers.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
362 ;; Else, use point values.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
363 ;; This function handles diff-2 jobs including the case of
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
364 ;; merging buffers and files without ancestor.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
365 (defun ediff-extract-diffs (diff-buffer word-mode &optional bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
366 (let ((A-buffer ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
367 (B-buffer ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
368 (C-buffer ediff-buffer-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
369 (a-prev 1) ; this is needed to set the first diff line correctly
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
370 (b-prev 1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
371 (c-prev 1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
372 diff-list shift-A shift-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
373 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
374
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
375 ;; diff list contains word numbers, unless changed later
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
376 (setq diff-list (cons (if word-mode 'words 'points)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
377 diff-list))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
378 ;; we don't use visibility bounds for buffer C when merging
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
379 (if bounds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
380 (setq shift-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
381 (ediff-overlay-start
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
382 (ediff-get-value-according-to-buffer-type 'A bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
383 shift-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
384 (ediff-overlay-start
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
385 (ediff-get-value-according-to-buffer-type 'B bounds))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
386
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
387 ;; reset point in buffers A/B/C
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
388 (ediff-with-current-buffer A-buffer
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
389 (goto-char (if shift-A shift-A (point-min))))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
390 (ediff-with-current-buffer B-buffer
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
391 (goto-char (if shift-B shift-B (point-min))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
392 (if (ediff-buffer-live-p C-buffer)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
393 (ediff-with-current-buffer C-buffer
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
394 (goto-char (point-min))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
395
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
396 (ediff-with-current-buffer diff-buffer
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
397 (goto-char (point-min))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
398 (while (re-search-forward ediff-match-diff-line nil t)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
399 (let* ((a-begin (string-to-int (buffer-substring (match-beginning 1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
400 (match-end 1))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
401 (a-end (let ((b (match-beginning 3))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
402 (e (match-end 3)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
403 (if b
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
404 (string-to-int (buffer-substring b e))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
405 a-begin)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
406 (diff-type (buffer-substring (match-beginning 4) (match-end 4)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
407 (b-begin (string-to-int (buffer-substring (match-beginning 5)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
408 (match-end 5))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
409 (b-end (let ((b (match-beginning 7))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
410 (e (match-end 7)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
411 (if b
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
412 (string-to-int (buffer-substring b e))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
413 b-begin)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
414 a-begin-pt a-end-pt b-begin-pt b-end-pt
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
415 c-begin c-end c-begin-pt c-end-pt)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
416 ;; fix the beginning and end numbers, because diff is somewhat
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
417 ;; strange about how it numbers lines
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
418 (if (string-equal diff-type "a")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
419 (setq b-end (1+ b-end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
420 a-begin (1+ a-begin)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
421 a-end a-begin)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
422 (if (string-equal diff-type "d")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
423 (setq a-end (1+ a-end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
424 b-begin (1+ b-begin)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
425 b-end b-begin)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
426 ;; (string-equal diff-type "c")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
427 (setq a-end (1+ a-end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
428 b-end (1+ b-end))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
429
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
430 (if (eq ediff-default-variant 'default-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
431 (setq c-begin b-begin
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
432 c-end b-end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
433 (setq c-begin a-begin
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
434 c-end a-end))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
435
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
436 ;; compute main diff vector
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
437 (if word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
438 ;; make diff-list contain word numbers
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
439 (setq diff-list
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
440 (nconc diff-list
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
441 (list
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
442 (if (ediff-buffer-live-p C-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
443 (vector (- a-begin a-prev) (- a-end a-begin)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
444 (- b-begin b-prev) (- b-end b-begin)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
445 (- 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
446 nil nil ; dummy ancestor
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
447 nil ; state of diff
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
448 nil ; state of merge
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
449 nil ; state of ancestor
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
450 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
451 (vector (- a-begin a-prev) (- a-end a-begin)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
452 (- b-begin b-prev) (- b-end b-begin)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
453 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
454 nil nil ; dummy ancestor
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
455 nil ; state of diff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
456 nil ; state of merge
13127
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
457 nil ; state of ancestor
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
458 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
459 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
460 a-prev a-end
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
461 b-prev b-end
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
462 c-prev c-end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
463 ;; else convert lines to points
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
464 (ediff-with-current-buffer A-buffer
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
465 (forward-line (- a-begin a-prev))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
466 (setq a-begin-pt (point))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
467 (forward-line (- a-end a-begin))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
468 (setq a-end-pt (point)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
469 a-prev a-end))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
470 (ediff-with-current-buffer B-buffer
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
471 (forward-line (- b-begin b-prev))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
472 (setq b-begin-pt (point))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
473 (forward-line (- b-end b-begin))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
474 (setq b-end-pt (point)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
475 b-prev b-end))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
476 (if (ediff-buffer-live-p C-buffer)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
477 (ediff-with-current-buffer C-buffer
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
478 (forward-line (- c-begin c-prev))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
479 (setq c-begin-pt (point))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
480 (forward-line (- c-end c-begin))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
481 (setq c-end-pt (point)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
482 c-prev c-end)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
483 (setq diff-list
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
484 (nconc
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
485 diff-list
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
486 (list
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
487 (if (ediff-buffer-live-p C-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
488 (vector
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
489 a-begin-pt a-end-pt b-begin-pt b-end-pt
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
490 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
491 nil nil ; dummy ancestor
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
492 ;; state of diff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
493 ;; shows which buff is different from the other two
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
494 (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
495 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
496 nil ; state of ancestor
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
497 )
13127
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
498 (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
499 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
500 nil nil ; dummy buf C
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
501 nil nil ; dummy ancestor
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
502 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
503 nil ; dummy state of ancestor
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
504 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
505 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
506
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
507 ))) ; end ediff-with-current-buffer
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
508 diff-list
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
509 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
510
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
511
13127
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
512 (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
513 (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
514 (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
515 (if ediff-3way-job
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
516 (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
517 (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
518 (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
519 ;; 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
520 (if ediff-merge-job
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
521 (setq ediff-state-of-merge
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
522 (vconcat
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
523 (mapcar (lambda (elt)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
524 (let ((state-of-merge (aref elt 9))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
525 (state-of-ancestor (aref elt 10)))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
526 (vector
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
527 ;; state of merge: prefers/default-A/B or combined
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
528 (if state-of-merge (format "%S" state-of-merge))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
529 ;; whether the ancestor region is empty
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
530 state-of-ancestor)))
13127
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
531 ;; 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
532 (cdr diff-list))
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
533 )))
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
534 (message "Processing difference regions ... done"))
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
535
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
536
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
537 (defun ediff-set-diff-overlays-in-one-buffer (buf-type diff-list)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
538 (let* ((current-diff -1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
539 (buff (ediff-get-buffer buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
540 ;; ediff-extract-diffs puts the type of diff-list as the first elt
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
541 ;; of this list. The type is either 'points or 'words
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
542 (diff-list-type (car diff-list))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
543 (shift (ediff-overlay-start
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
544 (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
545 buf-type ediff-narrow-bounds)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
546 (limit (ediff-overlay-end
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
547 (ediff-get-value-according-to-buffer-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
548 buf-type ediff-narrow-bounds)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
549 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
550 begin end pt-saved overlay state-of-diff)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
551
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
552 (setq diff-list (cdr diff-list)) ; discard diff list type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
553 (setq total-diffs (length diff-list))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
554
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
555 ;; shift, if necessary
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
556 (ediff-with-current-buffer buff (setq pt-saved shift))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
557
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
558 (while diff-list
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
559 (setq current-diff (1+ current-diff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
560 list-element (car diff-list)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
561 begin (aref list-element (cond ((eq buf-type 'A) 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
562 ((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
563 ((eq buf-type 'C) 4)
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
564 (t 6))) ; Ancestor
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
565 end (aref list-element (cond ((eq buf-type 'A) 1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
566 ((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
567 ((eq buf-type 'C) 5)
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
568 (t 7))) ; Ancestor
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
569 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
570 )
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
571
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
572 (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
573 (not (eq buf-type 'Ancestor))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
574 (memq state-of-diff '(A B C)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
575 (setq state-of-diff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
576 (car (delq buf-type (delq state-of-diff (list 'A 'B 'C)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
577 (setq state-of-diff (format "=diff(%S)" state-of-diff))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
578 )
13127
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
579 (t (setq state-of-diff nil)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
580
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
581 ;; Put overlays at appropriate places in buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
582 ;; convert word numbers to points, if necessary
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
583 (if (eq diff-list-type 'words)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
584 (progn
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
585 (ediff-with-current-buffer buff (goto-char pt-saved))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
586 (setq begin (ediff-goto-word (1+ begin) buff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
587 end (ediff-goto-word end buff 'end))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
588 (if (> end limit) (setq end limit))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
589 (if (> begin end) (setq begin end))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
590 (setq pt-saved (ediff-with-current-buffer buff (point)))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
591 (setq overlay (ediff-make-bullet-proof-overlay begin end buff))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
592
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
593 (ediff-overlay-put overlay 'priority ediff-shadow-overlay-priority)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
594 (ediff-overlay-put overlay 'ediff-diff-num current-diff)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
595 (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
596 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
597 (ediff-set-overlay-face
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
598 overlay (ediff-background-face buf-type current-diff)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
599
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
600 (if (= 0 (mod current-diff 10))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
601 (message "Buffer %S: Processing difference region %d of %d"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
602 buf-type current-diff total-diffs))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
603 ;; Record all overlays for this difference.
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
604 ;; 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
605 ;; 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
606 ;; 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
607 ;; (3-way jobs only).
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
608 (setq diff-overlay-list
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
609 (nconc
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
610 diff-overlay-list
13127
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
611 (list (vector overlay nil nil state-of-diff)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
612 diff-list
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
613 (cdr diff-list))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
614 ) ; while
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
615
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
616 (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
617 (vconcat diff-overlay-list))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
618 ))
13127
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
619
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
620 ;; `n' is the diff region to work on. Default is ediff-current-difference.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
621 ;; if `flag' is 'noforce then make fine-diffs only if this region's fine
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
622 ;; diffs have not been computed before.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
623 ;; if `flag' is 'skip then don't compute fine diffs for this region.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
624 (defun ediff-make-fine-diffs (&optional n flag)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
625 (or n (setq n ediff-current-difference))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
626
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
627 (if (< ediff-number-of-differences 1)
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15175
diff changeset
628 (error ediff-NO-DIFFERENCES))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
629
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
630 (if ediff-word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
631 (setq flag 'skip
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
632 ediff-auto-refine 'nix))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
633
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
634 (or (< n 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
635 (>= n ediff-number-of-differences)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
636 ;; n is within the range
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
637 (let ((tmp-buffer (get-buffer-create ediff-tmp-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
638 (file-A ediff-temp-file-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
639 (file-B ediff-temp-file-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
640 (file-C ediff-temp-file-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
641 (empty-A (ediff-empty-diff-region-p n 'A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
642 (empty-B (ediff-empty-diff-region-p n 'B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
643 (empty-C (ediff-empty-diff-region-p n 'C))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
644 (whitespace-A (ediff-whitespace-diff-region-p n 'A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
645 (whitespace-B (ediff-whitespace-diff-region-p n 'B))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
646 (whitespace-C (ediff-whitespace-diff-region-p n 'C))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
647 cumulative-fine-diff-length)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
648
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
649 (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
650 ;; then don't refine.
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
651 ;; 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
652 ;; mark as such.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
653 ((> (length (delq nil (list empty-A empty-B empty-C))) 1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
654 (if (and (ediff-looks-like-combined-merge n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
655 ediff-merge-job)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
656 (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
657 (if ediff-3way-comparison-job
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
658 (ediff-message-if-verbose
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
659 "Region %d is empty in all buffers but %S"
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
660 (1+ n)
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
661 (cond ((not empty-A) 'A)
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
662 ((not empty-B) 'B)
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
663 ((not empty-C) 'C)))
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
664 (ediff-message-if-verbose
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
665 "Region %d in buffer %S is empty"
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
666 (1+ n)
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
667 (cond (empty-A 'A)
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
668 (empty-B 'B)
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
669 (empty-C 'C)))
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
670 )
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15175
diff changeset
671 ;; 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
672 (if (and whitespace-A whitespace-B whitespace-C)
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15175
diff changeset
673 ;; mark as space only
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
674 (ediff-mark-diff-as-space-only n t)
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15175
diff changeset
675 ;; 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
676 ;; non-white-space-only
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
677 (ediff-mark-diff-as-space-only n nil)))
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
678
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
679 ;; don't compute fine diffs if diff vector exists
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
680 ((and (eq flag 'noforce) (ediff-get-fine-diff-vector n 'A))
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
681 (if (ediff-no-fine-diffs-p n)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
682 (message
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
683 "Only white-space differences in region %d %s"
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
684 (1+ n)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
685 (cond ((eq (ediff-no-fine-diffs-p n) 'A)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
686 "in buffers B & C")
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
687 ((eq (ediff-no-fine-diffs-p n) 'B)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
688 "in buffers A & C")
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
689 ((eq (ediff-no-fine-diffs-p n) 'C)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
690 "in buffers A & B")
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
691 (t "")))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
692 ;; don't compute fine diffs for this region
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
693 ((eq flag 'skip)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
694 (or (ediff-get-fine-diff-vector n 'A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
695 (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
696 (ediff-message-if-verbose
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
697 "Region %d exceeds the auto-refinement limit. Type `%s' to refine"
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
698 (1+ n)
13127
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
699 (substitute-command-keys
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
700 "\\[ediff-make-or-kill-fine-diffs]")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
701 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
702 (t
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
703 ;; recompute fine diffs
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
704 (ediff-wordify
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
705 (ediff-get-diff-posn 'A 'beg n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
706 (ediff-get-diff-posn 'A 'end n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
707 ediff-buffer-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
708 tmp-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
709 ediff-control-buffer)
13127
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
710 (setq file-A
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
711 (ediff-make-temp-file tmp-buffer "fineDiffA" file-A))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
712
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
713 (ediff-wordify
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
714 (ediff-get-diff-posn 'B 'beg n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
715 (ediff-get-diff-posn 'B 'end n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
716 ediff-buffer-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
717 tmp-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
718 ediff-control-buffer)
13127
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
719 (setq file-B
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
720 (ediff-make-temp-file tmp-buffer "fineDiffB" file-B))
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
721
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
722 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
723 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
724 (ediff-wordify
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
725 (ediff-get-diff-posn 'C 'beg n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
726 (ediff-get-diff-posn 'C 'end n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
727 ediff-buffer-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
728 tmp-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
729 ediff-control-buffer)
13127
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
730 (setq file-C
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
731 (ediff-make-temp-file
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
732 tmp-buffer "fineDiffC" file-C))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
733
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
734 ;; save temp file names.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
735 (setq ediff-temp-file-A file-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
736 ediff-temp-file-B file-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
737 ediff-temp-file-C file-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
738
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
739 ;; set the new vector of fine diffs, if none exists
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
740 (cond ((and ediff-3way-job whitespace-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
741 (ediff-setup-fine-diff-regions nil file-B file-C n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
742 ((and ediff-3way-job whitespace-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
743 (ediff-setup-fine-diff-regions file-A nil file-C n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
744 ((and ediff-3way-job
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15175
diff changeset
745 ;; In merge-jobs, whitespace-C is t, since
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15175
diff changeset
746 ;; ediff-empty-diff-region-p returns t in this case
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15175
diff changeset
747 whitespace-C)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
748 (ediff-setup-fine-diff-regions file-A file-B nil n))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
749 (t
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
750 (ediff-setup-fine-diff-regions file-A file-B file-C n)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
751
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
752 (setq cumulative-fine-diff-length
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
753 (+ (length (ediff-get-fine-diff-vector n 'A))
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15175
diff changeset
754 (length (ediff-get-fine-diff-vector n 'B))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15175
diff changeset
755 ;; in merge jobs, the merge buffer is never refined
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15175
diff changeset
756 (if (and file-C (not ediff-merge-job))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15175
diff changeset
757 (length (ediff-get-fine-diff-vector n 'C))
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15175
diff changeset
758 0)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
759
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
760 (cond ((or
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
761 ;; all regions are white space
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
762 (and whitespace-A whitespace-B whitespace-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
763 ;; none is white space and no fine diffs detected
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
764 (and (not whitespace-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
765 (not whitespace-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
766 (not (and ediff-3way-job whitespace-C))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
767 (eq cumulative-fine-diff-length 0)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
768 (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
769 (ediff-message-if-verbose
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
770 "Only white-space differences in region %d" (1+ n)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
771 ((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
772 (ediff-message-if-verbose
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
773 "Only white-space differences in region %d %s"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
774 (1+ n)
18054
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
775 (cond (whitespace-A (ediff-mark-diff-as-space-only n 'A)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
776 "in buffers B & C")
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
777 (whitespace-B (ediff-mark-diff-as-space-only n 'B)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
778 "in buffers A & C")
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
779 (whitespace-C (ediff-mark-diff-as-space-only n 'C)
0b9d9cbf3cd4 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 16248
diff changeset
780 "in buffers A & B"))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
781 (t
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
782 (ediff-mark-diff-as-space-only n nil)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
783 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
784 ) ; end cond
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
785 (ediff-set-fine-diff-properties n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
786 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
787
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
788 ;; Interface to ediff-make-fine-diffs. Checks for auto-refine limit, etc.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
789 (defun ediff-install-fine-diff-if-necessary (n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
790 (cond ((eq ediff-auto-refine 'on)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
791 (if (and
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
792 (> ediff-auto-refine-limit
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
793 (- (ediff-get-diff-posn 'A 'end n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
794 (ediff-get-diff-posn 'A 'beg n)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
795 (> ediff-auto-refine-limit
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
796 (- (ediff-get-diff-posn 'B 'end n)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
797 (ediff-get-diff-posn 'B 'beg n))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
798 (ediff-make-fine-diffs n 'noforce)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
799 (ediff-make-fine-diffs n 'skip)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
800
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
801 ;; highlight iff fine diffs already exist
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
802 ((eq ediff-auto-refine 'off)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
803 (ediff-make-fine-diffs n 'skip))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
804
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
805
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
806 ;; if fine diff vector is not set for diff N, then do nothing
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
807 (defun ediff-set-fine-diff-properties (n &optional default)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
808 (or (not (ediff-has-face-support-p))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
809 (< n 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
810 (>= n ediff-number-of-differences)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
811 ;; when faces are supported, set faces and priorities of fine overlays
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
812 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
813 (ediff-set-fine-diff-properties-in-one-buffer 'A n default)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
814 (ediff-set-fine-diff-properties-in-one-buffer 'B n default)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
815 (if ediff-3way-job
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
816 (ediff-set-fine-diff-properties-in-one-buffer 'C n default)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
817
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
818 (defun ediff-set-fine-diff-properties-in-one-buffer (buf-type
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
819 n &optional default)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
820 (let ((fine-diff-vector (ediff-get-fine-diff-vector n buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
821 (face (if default
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
822 'default
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
823 (face-name
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
824 (ediff-get-symbol-from-alist
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
825 buf-type ediff-fine-diff-face-alist))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
826 (priority (if default
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
827 0
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
828 (1+ (or (ediff-overlay-get
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
829 (symbol-value
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
830 (ediff-get-symbol-from-alist
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
831 buf-type
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
832 ediff-current-diff-overlay-alist))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
833 'priority)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
834 0)))))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
835 (mapcar (lambda (overl)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
836 (ediff-set-overlay-face overl face)
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
837 (ediff-overlay-put overl 'priority priority))
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
838 fine-diff-vector)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
839
26585
3ec5a485d0ab *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
840 ;; Set overlays over the regions that denote delimiters
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
841 (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
842 (let (overlay overlay-list)
3ec5a485d0ab *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
843 (while diff-list
3ec5a485d0ab *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
844 (condition-case nil
3ec5a485d0ab *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
845 (setq overlay
3ec5a485d0ab *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
846 (ediff-make-bullet-proof-overlay
3ec5a485d0ab *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
847 (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
848 (error ""))
3ec5a485d0ab *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
849 (setq overlay-list (cons overlay overlay-list))
3ec5a485d0ab *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
850 (if (> (length diff-list) 1)
3ec5a485d0ab *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
851 (setq diff-list (cdr (cdr diff-list)))
3ec5a485d0ab *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
852 (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
853 delimiter regions"))
3ec5a485d0ab *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
854 )
3ec5a485d0ab *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
855 (setq overlay-list (reverse overlay-list))
3ec5a485d0ab *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
856 (ediff-set-fine-diff-vector
3ec5a485d0ab *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26263
diff changeset
857 reg-num 'C (apply 'vector overlay-list))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
858 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
859
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
860
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
861 ;; Convert diff list to overlays for a given DIFF-REGION
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
862 ;; in buffer of type BUF-TYPE
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
863 (defun ediff-set-fine-overlays-in-one-buffer (buf-type diff-list region-num)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
864 (let* ((current-diff -1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
865 (reg-start (ediff-get-diff-posn buf-type 'beg region-num))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
866 (buff (ediff-get-buffer buf-type))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
867 combined-merge-diff-list
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
868 diff-overlay-list list-element
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
869 begin end overlay)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
870
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
871 (ediff-clear-fine-differences-in-one-buffer region-num buf-type)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
872 (setq diff-list (cdr diff-list)) ; discard list type (words or points)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
873 (ediff-with-current-buffer buff (goto-char reg-start))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
874
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
875 ;; if it is a combined merge then set overlays in buff C specially
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
876 (if (and ediff-merge-job (eq buf-type 'C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
877 (setq combined-merge-diff-list
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
878 (ediff-looks-like-combined-merge region-num)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
879 (ediff-set-fine-overlays-for-combined-merge
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
880 combined-merge-diff-list region-num)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
881 ;; regular fine diff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
882 (while diff-list
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
883 (setq current-diff (1+ current-diff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
884 list-element (car diff-list)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
885 begin (aref list-element (cond ((eq buf-type 'A) 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
886 ((eq buf-type 'B) 2)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
887 (t 4))) ; buf C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
888 end (aref list-element (cond ((eq buf-type 'A) 1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
889 ((eq buf-type 'B) 3)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
890 (t 5)))) ; buf C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
891 (if (not (or begin end))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
892 () ; skip this diff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
893 ;; Put overlays at appropriate places in buffers
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
894 ;; convert lines to points, if necessary
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
895 (setq begin (ediff-goto-word (1+ begin) buff)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
896 end (ediff-goto-word end buff 'end))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
897 (setq overlay (ediff-make-bullet-proof-overlay begin end buff))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
898 ;; record all overlays for this difference region
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
899 (setq diff-overlay-list (nconc diff-overlay-list (list overlay))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
900
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
901 (setq diff-list (cdr diff-list))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
902 ) ; while
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
903 ;; convert the list of difference information into a vector
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
904 ;; for fast access
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
905 (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
906 region-num buf-type (vconcat diff-overlay-list))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
907 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
908
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
909
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
910 ;; Stolen from emerge.el
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
911 (defun ediff-get-diff3-group (file)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
912 ;; This save-excursion allows ediff-get-diff3-group to be called for the
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
913 ;; various groups of lines (1, 2, 3) in any order, and for the lines to
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
914 ;; appear in any order. The reason this is necessary is that Gnu diff3
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
915 ;; can produce the groups in the order 1, 2, 3 or 1, 3, 2.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
916 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
917 (re-search-forward
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
918 (concat "^" file ":\\([0-9]+\\)\\(,\\([0-9]+\\)\\)?\\([ac]\\)$"))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
919 (beginning-of-line 2)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
920 ;; treatment depends on whether it is an "a" group or a "c" group
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
921 (if (string-equal (buffer-substring (match-beginning 4) (match-end 4)) "c")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
922 ;; it is a "c" group
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
923 (if (match-beginning 2)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
924 ;; it has two numbers
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
925 (list (string-to-int
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
926 (buffer-substring (match-beginning 1) (match-end 1)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
927 (1+ (string-to-int
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
928 (buffer-substring (match-beginning 3) (match-end 3)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
929 ;; it has one number
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
930 (let ((x (string-to-int
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
931 (buffer-substring (match-beginning 1) (match-end 1)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
932 (list x (1+ x))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
933 ;; it is an "a" group
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
934 (let ((x (1+ (string-to-int
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
935 (buffer-substring (match-beginning 1) (match-end 1))))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
936 (list x x)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
937
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
938
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
939 ;; If WORD-MODE, construct vector of diffs using word numbers.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
940 ;; Else, use point values.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
941 ;; WORD-MODE also tells if we are in the word-mode or not.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
942 ;; 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
943 ;; 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
944 ;; 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
945 ;; value.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
946 ;; BOUNDS specifies visibility bounds to use.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
947 (defun ediff-extract-diffs3 (diff-buffer word-mode three-way-comp
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
948 &optional bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
949 (let ((A-buffer ediff-buffer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
950 (B-buffer ediff-buffer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
951 (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
952 (anc-buffer ediff-ancestor-buffer)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
953 (a-prev 1) ; needed to set the first diff line correctly
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
954 (b-prev 1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
955 (c-prev 1)
13127
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
956 (anc-prev 1)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
957 diff-list shift-A shift-B shift-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
958 )
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
959
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
960 ;; diff list contains word numbers or points, depending on word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
961 (setq diff-list (cons (if word-mode 'words 'points)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
962 diff-list))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
963 (if bounds
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
964 (setq shift-A
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
965 (ediff-overlay-start
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
966 (ediff-get-value-according-to-buffer-type 'A bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
967 shift-B
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
968 (ediff-overlay-start
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
969 (ediff-get-value-according-to-buffer-type 'B bounds))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
970 shift-C
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
971 (if three-way-comp
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
972 (ediff-overlay-start
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
973 (ediff-get-value-according-to-buffer-type 'C bounds)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
974
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
975 ;; reset point in buffers A, B, C
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
976 (ediff-with-current-buffer A-buffer
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
977 (goto-char (if shift-A shift-A (point-min))))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
978 (ediff-with-current-buffer B-buffer
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
979 (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
980 (if three-way-comp
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
981 (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
982 (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
983 (if (ediff-buffer-live-p anc-buffer)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
984 (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
985 (goto-char (point-min))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
986
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
987 (ediff-with-current-buffer diff-buffer
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
988 (goto-char (point-min))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
989 (while (re-search-forward ediff-match-diff3-line nil t)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
990 ;; leave point after matched line
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
991 (beginning-of-line 2)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
992 (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
993 ;; if the files A and B are the same and not 3way-comparison,
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
994 ;; ignore the difference
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
995 (if (or three-way-comp (not (string-equal agreement "3")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
996 (let* ((a-begin (car (ediff-get-diff3-group "1")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
997 (a-end (nth 1 (ediff-get-diff3-group "1")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
998 (b-begin (car (ediff-get-diff3-group "2")))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
999 (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
1000 (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
1001 (c-or-anc-end (nth 1 (ediff-get-diff3-group "3")))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1002 (state-of-merge
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1003 (cond ((string-equal agreement "1") 'prefer-A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1004 ((string-equal agreement "2") 'prefer-B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1005 (t ediff-default-variant)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1006 (state-of-diff-merge
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1007 (if (memq state-of-merge '(default-A prefer-A)) 'B 'A))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1008 (state-of-diff-comparison
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1009 (cond ((string-equal agreement "1") 'A)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1010 ((string-equal agreement "2") 'B)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1011 ((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
1012 state-of-ancestor
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1013 c-begin c-end
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1014 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
1015 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
1016 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
1017 anc-begin-pt anc-end-pt)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1018
13127
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
1019 (setq state-of-ancestor
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
1020 (= 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
1021
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
1022 (cond (three-way-comp
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
1023 (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
1024 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
1025 ((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
1026 (setq c-begin b-begin
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
1027 c-end b-end))
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
1028 (t
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
1029 (setq c-begin a-begin
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
1030 c-end a-end)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1031
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1032 ;; compute main diff vector
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1033 (if word-mode
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1034 ;; make diff-list contain word numbers
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1035 (setq diff-list
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1036 (nconc diff-list
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1037 (list (vector
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1038 (- a-begin a-prev) (- a-end a-begin)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1039 (- b-begin b-prev) (- b-end b-begin)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1040 (- 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
1041 nil nil ; dummy ancestor
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
1042 nil ; state of diff
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
1043 nil ; state of merge
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
1044 nil ; state of ancestor
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
1045 )))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1046 a-prev a-end
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1047 b-prev b-end
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1048 c-prev c-end)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1049 ;; else convert lines to points
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
1050 (ediff-with-current-buffer A-buffer
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1051 (forward-line (- a-begin a-prev))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1052 (setq a-begin-pt (point))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1053 (forward-line (- a-end a-begin))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1054 (setq a-end-pt (point)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1055 a-prev a-end))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
1056 (ediff-with-current-buffer B-buffer
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1057 (forward-line (- b-begin b-prev))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1058 (setq b-begin-pt (point))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1059 (forward-line (- b-end b-begin))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1060 (setq b-end-pt (point)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1061 b-prev b-end))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
1062 (ediff-with-current-buffer C-buffer
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1063 (forward-line (- c-begin c-prev))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1064 (setq c-begin-pt (point))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1065 (forward-line (- c-end c-begin))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1066 (setq c-end-pt (point)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1067 c-prev c-end))
13127
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
1068 (if (ediff-buffer-live-p anc-buffer)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
1069 (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
1070 (forward-line (- c-or-anc-begin anc-prev))
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
1071 (setq anc-begin-pt (point))
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
1072 (forward-line (- c-or-anc-end c-or-anc-begin))
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
1073 (setq anc-end-pt (point)
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
1074 anc-prev c-or-anc-end)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1075 (setq diff-list
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1076 (nconc
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1077 diff-list
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1078 ;; if comparing with ancestor, then there also is a
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1079 ;; state-of-difference marker
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1080 (if three-way-comp
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1081 (list (vector
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1082 a-begin-pt a-end-pt
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1083 b-begin-pt b-end-pt
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1084 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
1085 nil nil ; ancestor begin/end
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1086 state-of-diff-comparison
13127
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
1087 nil ; state of merge
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
1088 nil ; state of ancestor
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1089 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1090 (list (vector a-begin-pt a-end-pt
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1091 b-begin-pt b-end-pt
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1092 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
1093 anc-begin-pt anc-end-pt
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1094 state-of-diff-merge
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1095 state-of-merge
13127
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
1096 state-of-ancestor
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1097 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1098 )))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1099 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1100
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
1101 ))) ; end ediff-with-current-buffer
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1102 diff-list
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1103 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1104
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1105 ;; Generate the difference vector and overlays for three files
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1106 ;; File-C is either the third file to compare (in case of 3-way comparison)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1107 ;; or it is the ancestor file.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1108 (defun ediff-setup-diff-regions3 (file-A file-B file-C)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1109 (or (ediff-buffer-live-p ediff-diff-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1110 (setq ediff-diff-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1111 (get-buffer-create (ediff-unique-buffer-name "*ediff-diff" "*"))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1112
13127
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
1113 (message "Computing differences ...")
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
1114 (ediff-exec-process ediff-diff3-program ediff-diff-buffer 'synchronize
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
1115 ediff-diff3-options file-A file-B file-C)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1116
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1117 (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
1118 ;;(message "Computing differences ... done")
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1119 (ediff-convert-diffs-to-overlays
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1120 (ediff-extract-diffs3
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1121 ediff-diff-buffer
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1122 ediff-word-mode ediff-3way-comparison-job ediff-narrow-bounds)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1123 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1124
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1125
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1126 ;; Execute PROGRAM asynchronously, unless OS/2, Windows-*, or DOS, or unless
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
1127 ;; SYNCH is non-nil. BUFFER must be a buffer object, and must be alive. The
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
1128 ;; OPTIONS arg is a list of options to pass to PROGRAM. It may be a blank
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
1129 ;; string. All elements in FILES must be strings. We also delete nil from
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
1130 ;; args.
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
1131 (defun ediff-exec-process (program buffer synch options &rest files)
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
1132 (let ((data (match-data))
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
1133 (coding-system-for-read 'no-conversion)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
1134 args)
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
1135 (setq args (append (split-string options) files))
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
1136 (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
1137 ;; 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
1138 ;; 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
1139 (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
1140 (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
1141 (setq args (delete "--binary" args)))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1142 (unwind-protect
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1143 (let ((directory default-directory)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1144 proc)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1145 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1146 (set-buffer buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1147 (erase-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1148 (setq default-directory directory)
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1149 (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
1150 synch)
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1151 ;; 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
1152 ;; 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
1153 ;; 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
1154 ;; 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
1155 ;; 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
1156 ;; subprocess is done.
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1157 ;; Similarly for Windows-*
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1158 ;; In DOS, must synchronize because DOS doesn't have
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1159 ;; asynchronous processes.
13127
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
1160 (apply 'call-process program nil buffer nil args)
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
1161 ;; 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
1162 (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
1163 (if proc (kill-process proc))
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
1164 (setq proc
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
1165 (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
1166 (setq mode-line-process '(":%s"))
4ca49c2e0c03 (ediff-setup-diff-regions,ediff-setup-diff-regions3,
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 12086
diff changeset
1167 (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
1168 (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
1169 )))
21940
f7e788ea680b new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 21154
diff changeset
1170 (store-match-data data))))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1171
24875
7177532e6e8b Comment fix.
Karl Heuer <kwzh@gnu.org>
parents: 21940
diff changeset
1172 ;; This is shell-command-filter from simple.el in Emacs.
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1173 ;; 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
1174 (defun ediff-process-filter (proc string)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1175 ;; Do save-excursion by hand so that we can leave point numerically unchanged
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1176 ;; despite an insertion immediately after it.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1177 (let* ((obuf (current-buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1178 (buffer (process-buffer proc))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1179 opoint
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1180 (window (get-buffer-window buffer))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1181 (pos (window-start window)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1182 (unwind-protect
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1183 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1184 (set-buffer buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1185 (or (= (point) (point-max))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1186 (setq opoint (point)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1187 (goto-char (point-max))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1188 (insert-before-markers string))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1189 ;; insert-before-markers moved this marker: set it back.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1190 (set-window-start window pos)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1191 ;; Finish our save-excursion.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1192 (if opoint
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1193 (goto-char opoint))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1194 (set-buffer obuf))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1195
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1196 ;; like shell-command-sentinel but doesn't print an exit status message
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1197 ;; we do this because diff always exits with status 1, if diffs are found
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1198 ;; 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
1199 (defun ediff-process-sentinel (process signal)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1200 (if (and (memq (process-status process) '(exit signal))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1201 (buffer-name (process-buffer process)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1202 (progn
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1203 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1204 (set-buffer (process-buffer process))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1205 (setq mode-line-process nil))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1206 (delete-process process))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1207
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1208
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1209 ;;; Word functions used to refine the current diff
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1210
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1211 (defvar ediff-forward-word-function 'ediff-forward-word
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1212 "*Function to call to move to the next word.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1213 Used for splitting difference regions into individual words.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1214
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1215 (defvar ediff-whitespace " \n\t\f"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1216 "*Characters constituting white space.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1217 These characters are ignored when differing regions are split into words.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1218
30089
f7f64f1ccc38 2000-07-05 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1219 (defvar ediff-word-1 "a-zA-Z---_"
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1220 "*Characters that constitute words of type 1.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1221 More precisely, [ediff-word-1] is a regexp that matches type 1 words.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1222 See `ediff-forward-word' for more details.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1223
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1224 (defvar ediff-word-2 "0-9.,"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1225 "*Characters that constitute words of type 2.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1226 More precisely, [ediff-word-2] is a regexp that matches type 2 words.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1227 See `ediff-forward-word' for more details.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1228
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1229 (defvar ediff-word-3 "`'?!:;\"{}[]()"
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1230 "*Characters that constitute words of type 3.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1231 More precisely, [ediff-word-3] is a regexp that matches type 3 words.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1232 See `ediff-forward-word' for more details.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1233
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1234 (defvar ediff-word-4
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1235 (concat "^" ediff-word-1 ediff-word-2 ediff-word-3 ediff-whitespace)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1236 "*Characters that constitute words of type 4.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1237 More precisely, [ediff-word-4] is a regexp that matches type 4 words.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1238 See `ediff-forward-word' for more details.")
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1239
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1240 ;; Split region along word boundaries. Each word will be on its own line.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1241 ;; Output to buffer out-buffer.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1242 (defun ediff-forward-word ()
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1243 "Move point one word forward.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1244 There are four types of words, each of which consists entirely of
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1245 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
1246 `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
1247 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
1248 (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
1249 (skip-syntax-forward "w"))
641e43bad886 2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 26585
diff changeset
1250 0)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1251 (> (skip-chars-forward ediff-word-2) 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1252 (> (skip-chars-forward ediff-word-3) 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1253 (> (skip-chars-forward ediff-word-4) 0)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1254 ))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1255
30089
f7f64f1ccc38 2000-07-05 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1256
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1257 (defun ediff-wordify (beg end in-buffer out-buffer &optional control-buf)
30089
f7f64f1ccc38 2000-07-05 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1258 (let (inbuf-syntax-tbl sv-point string)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1259 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1260 (set-buffer in-buffer)
30089
f7f64f1ccc38 2000-07-05 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1261 (setq inbuf-syntax-tbl (syntax-table))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
1262 (setq string (buffer-substring-no-properties beg end))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1263
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1264 (set-buffer out-buffer)
30089
f7f64f1ccc38 2000-07-05 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1265 ;; Make sure that temp buff syntax table is the same a the original buf
f7f64f1ccc38 2000-07-05 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1266 ;; 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
1267 ;; 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
1268 (set-syntax-table inbuf-syntax-tbl)
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1269 (erase-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1270 (insert string)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1271 (goto-char (point-min))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1272 (skip-chars-forward ediff-whitespace)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1273 (delete-region (point-min) (point))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1274
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1275 (while (not (eobp))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1276 ;; eval incontrol buf to let user create local versions for
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1277 ;; different invocations
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1278 (if control-buf
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1279 (funcall
30089
f7f64f1ccc38 2000-07-05 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1280 (ediff-with-current-buffer
f7f64f1ccc38 2000-07-05 Michael Kifer <kifer@cs.sunysb.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 29412
diff changeset
1281 control-buf ediff-forward-word-function))
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1282 (funcall ediff-forward-word-function))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1283 (setq sv-point (point))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1284 (skip-chars-forward ediff-whitespace)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1285 (delete-region sv-point (point))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1286 (insert "\n")))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1287
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1288 ;; copy string from BEG END from IN-BUF to OUT-BUF
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1289 (defun ediff-copy-to-buffer (beg end in-buffer out-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1290 (let (string)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1291 (save-excursion
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1292 (set-buffer in-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1293 (setq string (buffer-substring beg end))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1294
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1295 (set-buffer out-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1296 (erase-buffer)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1297 (insert string)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1298 (goto-char (point-min)))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1299
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1300
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1301 ;; goto word #n starting at current position in buffer `buf'
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1302 ;; For ediff, a word is either a string of a-z,A-Z, incl `-' and `_';
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1303 ;; or a string of other non-blanks. A blank is a \n\t\f
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1304 ;; If `flag' is non-nil, goto the end of the n-th word.
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1305 (defun ediff-goto-word (n buf &optional flag)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1306 ;; remember val ediff-forward-word-function has in ctl buf
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1307 (let ((fwd-word-fun ediff-forward-word-function))
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
1308 (ediff-with-current-buffer buf
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1309 (skip-chars-forward ediff-whitespace)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1310 (while (> n 1)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1311 (funcall fwd-word-fun)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1312 (skip-chars-forward ediff-whitespace)
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1313 (setq n (1- n)))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1314 (if (and flag (> n 0))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1315 (funcall fwd-word-fun))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1316 (point))))
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1317
20206
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
1318 (defun ediff-same-file-contents (f1 f2)
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
1319 "T if F1 and F2 have identical contents."
26263
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
1320 (let ((res
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
1321 (apply 'call-process ediff-cmp-program nil nil nil
4f315ca65976 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 24875
diff changeset
1322 (append ediff-cmp-options (list f1 f2)))))
20206
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
1323 (and (numberp res) (eq res 0))))
f44ff2c52fac new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 19774
diff changeset
1324
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1325
15480
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15175
diff changeset
1326 ;;; Local Variables:
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15175
diff changeset
1327 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
19047
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
1328 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
f90d40b0bff5 new version
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 18054
diff changeset
1329 ;;; 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
1330 ;;; End:
43a3308fcf61 *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 15175
diff changeset
1331
14582
c768f6d7daaa *** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents: 14169
diff changeset
1332
11042
57316020d271 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1333 ;; ediff-diff.el ends here