Mercurial > emacs
annotate lisp/ediff-merg.el @ 71597:2bcad0daa88f
(Remote Mailboxes): Add missing @code keyword.
author | Nick Roberts <nickrob@snap.net.nz> |
---|---|
date | Mon, 03 Jul 2006 23:14:06 +0000 |
parents | 6169b51037af |
children | 402a04b0362f d1c5430c5bff |
rev | line source |
---|---|
11042 | 1 ;;; ediff-merg.el --- merging utilities |
14169 | 2 |
64762
41bb365f41c4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64091
diff
changeset
|
3 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
68651
3bd95f4f2941
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
66687
diff
changeset
|
4 ;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. |
11042 | 5 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42206
diff
changeset
|
6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
11042 | 7 |
8 ;; This file is part of GNU Emacs. | |
9 | |
10 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
11 ;; it under the terms of the GNU General Public License as published by | |
12 ;; the Free Software Foundation; either version 2, or (at your option) | |
13 ;; any later version. | |
14 | |
15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 ;; GNU General Public License for more details. | |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
14169 | 21 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
64091 | 22 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
23 ;; Boston, MA 02110-1301, USA. | |
11042 | 24 |
38422
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
33394
diff
changeset
|
25 ;;; Commentary: |
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
33394
diff
changeset
|
26 |
14169 | 27 ;;; Code: |
11042 | 28 |
18054 | 29 |
30 ;; compiler pacifier | |
31 (defvar ediff-window-A) | |
32 (defvar ediff-window-B) | |
33 (defvar ediff-window-C) | |
34 (defvar ediff-merge-window-share) | |
35 (defvar ediff-window-config-saved) | |
36 | |
37 (eval-when-compile | |
38 (let ((load-path (cons (expand-file-name ".") load-path))) | |
39 (or (featurep 'ediff-init) | |
40 (load "ediff-init.el" nil nil 'nosuffix)) | |
41 (or (featurep 'ediff-util) | |
42 (load "ediff-util.el" nil nil 'nosuffix)) | |
43 )) | |
44 ;; end pacifier | |
45 | |
11042 | 46 (require 'ediff-init) |
47 | |
18839 | 48 (defcustom ediff-quit-merge-hook 'ediff-maybe-save-and-delete-merge |
49 "*Hooks to run before quitting a merge job. | |
50 The most common use is to save and delete the merge buffer." | |
51 :type 'hook | |
52 :group 'ediff-merge) | |
53 | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
54 |
18054 | 55 (defcustom ediff-default-variant 'combined |
11042 | 56 "*The variant to be used as a default for buffer C in merging. |
18054 | 57 Valid values are the symbols `default-A', `default-B', and `combined'." |
58 :type '(radio (const default-A) (const default-B) (const combined)) | |
59 :group 'ediff-merge) | |
11042 | 60 |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
61 (defcustom ediff-combination-pattern |
26585
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
62 '("<<<<<<< variant A" A ">>>>>>> variant B" B "####### Ancestor" Ancestor "======= end") |
11042 | 63 "*Pattern to be used for combining difference regions in buffers A and B. |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
64 The value must be a list of the form |
26585
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
65 (STRING1 bufspec1 STRING2 bufspec2 STRING3 bufspec3 STRING4) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
66 where bufspec is the symbol A, B, or Ancestor. For instance, if the value is |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
67 '(STRING1 A STRING2 Ancestor STRING3 B STRING4) then the |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
68 combined text will look like this: |
11042 | 69 |
70 STRING1 | |
71 diff region from variant A | |
72 STRING2 | |
26585
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
73 diff region from the ancestor |
11042 | 74 STRING3 |
26585
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
75 diff region from variant B |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
76 STRING4 |
18054 | 77 " |
26585
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
78 :type '(choice (list string symbol string symbol string) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
79 (list string symbol string symbol string symbol string)) |
18054 | 80 :group 'ediff-merge) |
11042 | 81 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
82 (defcustom ediff-show-clashes-only nil |
11042 | 83 "*If t, show only those diff regions where both buffers disagree with the ancestor. |
84 This means that regions that have status prefer-A or prefer-B will be | |
42206 | 85 skipped over. nil means show all regions." |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
86 :type 'boolean |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
87 :group 'ediff-merge |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
88 ) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
89 (make-variable-buffer-local 'ediff-show-clashes-only) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
90 |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
91 (defcustom ediff-skip-merge-regions-that-differ-from-default nil |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
92 "*If t, show only the regions that have not been changed by the user. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
93 A region is considered to have been changed if it is different from the current |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
94 default (`default-A', `default-B', `combined') and it hasn't been marked as |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
95 `prefer-A' or `prefer-B'. |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
96 A region is considered to have been changed also when it is marked as |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
97 as `prefer-A', but is different from the corresponding difference region in |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
98 Buffer A or if it is marked as `prefer-B' and is different from the region in |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
99 Buffer B." |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
100 :type 'boolean |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
101 :group 'ediff-merge |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
102 ) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
103 (make-variable-buffer-local 'ediff-skip-merge-regions-that-differ-from-default) |
11042 | 104 |
65856
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
105 ;; check if there is no clash between the ancestor and one of the variants. |
66687
26faad662ac6
2005-11-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65856
diff
changeset
|
106 ;; if it is not a merge job then return true |
65856
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
107 (defsubst ediff-merge-region-is-non-clash (n) |
66687
26faad662ac6
2005-11-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65856
diff
changeset
|
108 (if (ediff-merge-job) |
26faad662ac6
2005-11-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65856
diff
changeset
|
109 (string-match "prefer" (or (ediff-get-state-of-merge n) "")) |
26faad662ac6
2005-11-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
65856
diff
changeset
|
110 t)) |
65856
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
111 |
20003 | 112 ;; If ediff-show-clashes-only, check if there is no clash between the ancestor |
113 ;; and one of the variants. | |
65856
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
114 (defsubst ediff-merge-region-is-non-clash-to-skip (n) |
20003 | 115 (and ediff-show-clashes-only |
65856
d64aeb0dc54e
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
64762
diff
changeset
|
116 (ediff-merge-region-is-non-clash n))) |
20003 | 117 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
118 ;; If ediff-skip-changed-regions, check if the merge region differs from |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
119 ;; the current default. If a region is different from the default, it means |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
120 ;; that the user has made determination as to how to merge for this particular |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
121 ;; region. |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
122 (defsubst ediff-skip-merge-region-if-changed-from-default-p (n) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
123 (and ediff-skip-merge-regions-that-differ-from-default |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
124 (ediff-merge-changed-from-default-p n 'prefers-too))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
125 |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
126 |
26585
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
127 (defun ediff-get-combined-region (n) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
128 (let ((pattern-list ediff-combination-pattern) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
129 (combo-region "") |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
130 (err-msg |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
131 "ediff-combination-pattern: Invalid format. Please consult the documentation") |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42206
diff
changeset
|
132 region-delim region-spec) |
26585
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
133 |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
134 (if (< (length pattern-list) 5) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
135 (error err-msg)) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
136 |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
137 (while (> (length pattern-list) 2) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
138 (setq region-delim (nth 0 pattern-list) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
139 region-spec (nth 1 pattern-list)) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
140 (or (and (stringp region-delim) (memq region-spec '(A B Ancestor))) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
141 (error err-msg)) |
13216
b9dc8cc658d5
Moved defsubsts up.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13129
diff
changeset
|
142 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42206
diff
changeset
|
143 (condition-case nil |
26585
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
144 (setq combo-region |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
145 (concat combo-region |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
146 region-delim "\n" |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
147 (ediff-get-region-contents |
26585
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
148 n region-spec ediff-control-buffer))) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
149 (error "")) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
150 (setq pattern-list (cdr (cdr pattern-list))) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
151 ) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
152 |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
153 (setq region-delim (nth 0 pattern-list)) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
154 (or (stringp region-delim) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
155 (error err-msg)) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
156 (setq combo-region (concat combo-region region-delim "\n")) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
157 )) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
158 |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
159 ;;(defsubst ediff-make-combined-diff (regA regB) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
160 ;; (concat (nth 0 ediff-combination-pattern) "\n" |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
161 ;; regA |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
162 ;; (nth 1 ediff-combination-pattern) "\n" |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
163 ;; regB |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
164 ;; (nth 2 ediff-combination-pattern) "\n")) |
13216
b9dc8cc658d5
Moved defsubsts up.
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
13129
diff
changeset
|
165 |
11042 | 166 (defsubst ediff-set-state-of-all-diffs-in-all-buffers (ctl-buf) |
167 (let ((n 0)) | |
168 (while (< n ediff-number-of-differences) | |
169 (ediff-set-state-of-diff-in-all-buffers n ctl-buf) | |
170 (setq n (1+ n))))) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
171 |
11042 | 172 (defun ediff-set-state-of-diff-in-all-buffers (n ctl-buf) |
173 (let ((regA (ediff-get-region-contents n 'A ctl-buf)) | |
174 (regB (ediff-get-region-contents n 'B ctl-buf)) | |
175 (regC (ediff-get-region-contents n 'C ctl-buf))) | |
12167
87f8b79217b3
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11234
diff
changeset
|
176 (cond ((and (string= regA regB) (string= regA regC)) |
87f8b79217b3
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11234
diff
changeset
|
177 (ediff-set-state-of-diff n 'A "=diff(B)") |
87f8b79217b3
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11234
diff
changeset
|
178 (ediff-set-state-of-diff n 'B "=diff(C)") |
87f8b79217b3
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11234
diff
changeset
|
179 (ediff-set-state-of-diff n 'C "=diff(A)")) |
87f8b79217b3
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11234
diff
changeset
|
180 ((string= regA regB) |
11042 | 181 (ediff-set-state-of-diff n 'A "=diff(B)") |
182 (ediff-set-state-of-diff n 'B "=diff(A)") | |
183 (ediff-set-state-of-diff n 'C nil)) | |
184 ((string= regA regC) | |
185 (ediff-set-state-of-diff n 'A "=diff(C)") | |
186 (ediff-set-state-of-diff n 'C "=diff(A)") | |
187 (ediff-set-state-of-diff n 'B nil)) | |
188 ((string= regB regC) | |
189 (ediff-set-state-of-diff n 'C "=diff(B)") | |
190 (ediff-set-state-of-diff n 'B "=diff(C)") | |
191 (ediff-set-state-of-diff n 'A nil)) | |
192 ((string= regC (ediff-get-combined-region n)) | |
193 (ediff-set-state-of-diff n 'A nil) | |
194 (ediff-set-state-of-diff n 'B nil) | |
195 (ediff-set-state-of-diff n 'C "=diff(A+B)")) | |
196 (t (ediff-set-state-of-diff n 'A nil) | |
197 (ediff-set-state-of-diff n 'B nil) | |
198 (ediff-set-state-of-diff n 'C nil))) | |
199 )) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
200 |
12167
87f8b79217b3
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11234
diff
changeset
|
201 (defun ediff-set-merge-mode () |
87f8b79217b3
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11234
diff
changeset
|
202 (normal-mode t) |
87f8b79217b3
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11234
diff
changeset
|
203 (remove-hook 'local-write-file-hooks 'ediff-set-merge-mode)) |
13129
9d432c26c3a7
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
12167
diff
changeset
|
204 |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
205 |
11042 | 206 ;; Go over all diffs starting with DIFF-NUM and copy regions into buffer C |
207 ;; according to the state of the difference. | |
208 ;; Since ediff-copy-diff refuses to copy identical diff regions, there is | |
209 ;; no need to optimize ediff-do-merge any further. | |
210 ;; | |
211 ;; If re-merging, change state of merge in all diffs starting with | |
212 ;; DIFF-NUM, except those where the state is prefer-* or where it is | |
12167
87f8b79217b3
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11234
diff
changeset
|
213 ;; `default-*' or `combined' but the buf C region appears to be modified |
87f8b79217b3
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11234
diff
changeset
|
214 ;; since last set by default. |
11042 | 215 (defun ediff-do-merge (diff-num &optional remerging) |
216 (if (< diff-num 0) (setq diff-num 0)) | |
217 (let ((n diff-num) | |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
218 ;;(default-state-of-merge (format "%S" ediff-default-variant)) |
12167
87f8b79217b3
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11234
diff
changeset
|
219 do-not-copy state-of-merge) |
11042 | 220 (while (< n ediff-number-of-differences) |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
221 (setq do-not-copy nil) ; reset after each cycle |
11042 | 222 (if (= (mod n 10) 0) |
223 (message "%s buffers A & B into C ... region %d of %d" | |
224 (if remerging "Re-merging" "Merging") | |
225 n | |
226 ediff-number-of-differences)) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
227 |
11042 | 228 (setq state-of-merge (ediff-get-state-of-merge n)) |
229 | |
230 (if remerging | |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42206
diff
changeset
|
231 ;;(let ((reg-A (ediff-get-region-contents n 'A ediff-control-buffer)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42206
diff
changeset
|
232 ;; (reg-B (ediff-get-region-contents n 'B ediff-control-buffer)) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42206
diff
changeset
|
233 ;; (reg-C (ediff-get-region-contents n 'C ediff-control-buffer))) |
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42206
diff
changeset
|
234 (let () |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
235 |
15480
43a3308fcf61
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14582
diff
changeset
|
236 ;; if region was edited since it was first set by default |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
237 (if (or (ediff-merge-changed-from-default-p n) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
238 ;; was preferred |
12167
87f8b79217b3
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11234
diff
changeset
|
239 (string-match "prefer" state-of-merge)) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
240 ;; then ignore |
11042 | 241 (setq do-not-copy t)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
242 |
11042 | 243 ;; change state of merge for this diff, if necessary |
12167
87f8b79217b3
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11234
diff
changeset
|
244 (if (and (string-match "\\(default\\|combined\\)" state-of-merge) |
87f8b79217b3
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11234
diff
changeset
|
245 (not do-not-copy)) |
11042 | 246 (ediff-set-state-of-merge |
247 n (format "%S" ediff-default-variant))) | |
248 )) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
249 |
11042 | 250 ;; state-of-merge may have changed via ediff-set-state-of-merge, so |
12167
87f8b79217b3
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11234
diff
changeset
|
251 ;; check it once again |
11042 | 252 (setq state-of-merge (ediff-get-state-of-merge n)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
253 |
11042 | 254 (or do-not-copy |
255 (if (string= state-of-merge "combined") | |
256 ;; use n+1 because ediff-combine-diffs works via user numbering | |
257 ;; of diffs, which is 1+ to what ediff uses internally | |
258 (ediff-combine-diffs (1+ n) 'batch) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
259 (ediff-copy-diff |
12167
87f8b79217b3
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer <kwzh@gnu.org>
parents:
11234
diff
changeset
|
260 n (if (string-match "-A" state-of-merge) 'A 'B) 'C 'batch))) |
11042 | 261 (setq n (1+ n))) |
262 (message "Merging buffers A & B into C ... Done") | |
263 )) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
264 |
11042 | 265 |
266 (defun ediff-re-merge () | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
267 "Remerge unmodified diff regions using a new default. Start with the current region." |
11042 | 268 (interactive) |
269 (let* ((default-variant-alist | |
270 (list '("default-A") '("default-B") '("combined"))) | |
271 (actual-alist | |
272 (delete (list (symbol-name ediff-default-variant)) | |
273 default-variant-alist))) | |
274 (setq ediff-default-variant | |
275 (intern | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
276 (completing-read |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
277 (format "Current merge default is `%S'. New default: " |
11042 | 278 ediff-default-variant) |
279 actual-alist nil 'must-match))) | |
280 (ediff-do-merge ediff-current-difference 'remerge) | |
281 (ediff-recenter) | |
282 )) | |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
283 |
11042 | 284 (defun ediff-shrink-window-C (arg) |
285 "Shrink window C to just one line. | |
286 With a prefix argument, returns window C to its normal size. | |
287 Used only for merging jobs." | |
288 (interactive "P") | |
289 (if (not ediff-merge-job) | |
290 (error "ediff-shrink-window-C can be used only for merging jobs")) | |
291 (cond ((eq arg '-) (setq arg -1)) | |
292 ((not (numberp arg)) (setq arg nil))) | |
293 (cond ((null arg) | |
294 (let ((ediff-merge-window-share | |
295 (if (< (window-height ediff-window-C) 3) | |
296 ediff-merge-window-share 0))) | |
297 (setq ediff-window-config-saved "") ; force redisplay | |
298 (ediff-recenter 'no-rehighlight))) | |
299 ((and (< arg 0) (> (window-height ediff-window-C) 2)) | |
300 (setq ediff-merge-window-share (* ediff-merge-window-share 0.9)) | |
301 (setq ediff-window-config-saved "") ; force redisplay | |
302 (ediff-recenter 'no-rehighlight)) | |
303 ((and (> arg 0) (> (window-height ediff-window-A) 2)) | |
304 (setq ediff-merge-window-share (* ediff-merge-window-share 1.1)) | |
305 (setq ediff-window-config-saved "") ; force redisplay | |
306 (ediff-recenter 'no-rehighlight)))) | |
307 | |
308 | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
309 ;; N here is the user's region number. It is 1+ what Ediff uses internally. |
11042 | 310 (defun ediff-combine-diffs (n &optional batch-invocation) |
311 "Combine Nth diff regions of buffers A and B and place the combination in C. | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
312 N is a prefix argument. If nil, combine the current difference regions. |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
313 Combining is done according to the specifications in variable |
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
314 `ediff-combination-pattern'." |
11042 | 315 (interactive "P") |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
316 (setq n (if (numberp n) (1- n) ediff-current-difference)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
317 |
42602
633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
42206
diff
changeset
|
318 (let (reg-combined) |
26585
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
319 ;;(setq regA (ediff-get-region-contents n 'A ediff-control-buffer) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
320 ;; regB (ediff-get-region-contents n 'B ediff-control-buffer)) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
321 ;;(setq reg-combined (ediff-make-combined-diff regA regB)) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
322 (setq reg-combined (ediff-get-combined-region n)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
323 |
11042 | 324 (ediff-copy-diff n nil 'C batch-invocation reg-combined)) |
14582
c768f6d7daaa
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
14169
diff
changeset
|
325 (or batch-invocation (ediff-jump-to-difference (1+ n)))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
326 |
11042 | 327 |
328 ;; Checks if the region in buff C looks like a combination of the regions | |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
329 ;; in buffers A and B. Return a list (reg-a-beg reg-a-end reg-b-beg reg-b-end) |
26585
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
330 ;; These refer to where the delimiters for region A, B, Ancestor start and end |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
331 ;; in buffer C |
11042 | 332 (defun ediff-looks-like-combined-merge (region-num) |
333 (if ediff-merge-job | |
334 (let ((combined (string-match (regexp-quote "(A+B)") | |
335 (or (ediff-get-state-of-diff region-num 'C) | |
336 ""))) | |
26585
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
337 (mrgreg-beg (ediff-get-diff-posn 'C 'beg region-num)) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
338 (mrgreg-end (ediff-get-diff-posn 'C 'end region-num)) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
339 (pattern-list ediff-combination-pattern) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
340 delim reg-beg reg-end delim-regs-list) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
341 |
11042 | 342 (if combined |
19047 | 343 (ediff-with-current-buffer ediff-buffer-C |
26585
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
344 (while pattern-list |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
345 (goto-char mrgreg-beg) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
346 (setq delim (nth 0 pattern-list)) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
347 (search-forward delim mrgreg-end 'noerror) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
348 (setq reg-beg (match-beginning 0)) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
349 (setq reg-end (match-end 0)) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
350 (if (and reg-beg reg-end) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
351 (setq delim-regs-list |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
352 ;; in reverse |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
353 (cons reg-end (cons reg-beg delim-regs-list)))) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
354 (if (> (length pattern-list) 1) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
355 (setq pattern-list (cdr (cdr pattern-list))) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
356 (setq pattern-list nil)) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
357 ))) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
358 |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
359 (reverse delim-regs-list) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
360 ))) |
33394
237411236185
(state-or-merge): Defvar when compiling.
Dave Love <fx@gnu.org>
parents:
33019
diff
changeset
|
361 |
237411236185
(state-or-merge): Defvar when compiling.
Dave Love <fx@gnu.org>
parents:
33019
diff
changeset
|
362 (eval-when-compile (defvar state-of-merge)) ; dynamic var |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
363 |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
364 ;; Check if the non-preferred merge has been modified since originally set. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
365 ;; This affects only the regions that are marked as default-A/B or combined. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
366 ;; If PREFERS-TOO is non-nil, then look at the regions marked as prefers-A/B as |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
367 ;; well. |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
368 (defun ediff-merge-changed-from-default-p (diff-num &optional prefers-too) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
369 (let ((reg-A (ediff-get-region-contents diff-num 'A ediff-control-buffer)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
370 (reg-B (ediff-get-region-contents diff-num 'B ediff-control-buffer)) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
371 (reg-C (ediff-get-region-contents diff-num 'C ediff-control-buffer))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
372 |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
373 (setq state-of-merge (ediff-get-state-of-merge diff-num)) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
374 |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
375 ;; if region was edited since it was first set by default |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
376 (or (and (string= state-of-merge "default-A") |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
377 (not (string= reg-A reg-C))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
378 (and (string= state-of-merge "default-B") |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
379 (not (string= reg-B reg-C))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
380 (and (string= state-of-merge "combined") |
26585
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
381 ;;(not (string= (ediff-make-combined-diff reg-A reg-B) reg-C))) |
3ec5a485d0ab
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
26263
diff
changeset
|
382 (not (string= (ediff-get-combined-region diff-num) reg-C))) |
26263
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
383 (and prefers-too |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
384 (string= state-of-merge "prefer-A") |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
385 (not (string= reg-A reg-C))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
386 (and prefers-too |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
387 (string= state-of-merge "prefer-B") |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
388 (not (string= reg-B reg-C))) |
4f315ca65976
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
20206
diff
changeset
|
389 ))) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42602
diff
changeset
|
390 |
11042 | 391 |
68997
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68651
diff
changeset
|
392 (provide 'ediff-merg) |
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68651
diff
changeset
|
393 |
6169b51037af
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
68651
diff
changeset
|
394 |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
395 ;;; Local Variables: |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
396 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) |
19047 | 397 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) |
398 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) | |
16248
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
399 ;;; End: |
b2fae8abc5b0
*** empty log message ***
Michael Kifer <kifer@cs.stonybrook.edu>
parents:
15480
diff
changeset
|
400 |
52401 | 401 ;;; arch-tag: 9b798cf9-02ba-487f-a62e-b63aa823dbfb |
38422
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
33394
diff
changeset
|
402 ;;; ediff-merg.el ends here |