1 |
;;; ediff-merg.el --- merging utilities |
;;; ediff-merg.el --- merging utilities |
2 |
|
|
3 |
;; Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. |
;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02 Free Software Foundation, Inc. |
4 |
|
|
5 |
;; Author: Michael Kifer <kifer@cs.sunysb.edu> |
;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
6 |
|
|
7 |
;; This file is part of GNU Emacs. |
;; This file is part of GNU Emacs. |
8 |
|
|
122 |
(combo-region "") |
(combo-region "") |
123 |
(err-msg |
(err-msg |
124 |
"ediff-combination-pattern: Invalid format. Please consult the documentation") |
"ediff-combination-pattern: Invalid format. Please consult the documentation") |
125 |
diff-region region-delim region-spec) |
region-delim region-spec) |
126 |
|
|
127 |
(if (< (length pattern-list) 5) |
(if (< (length pattern-list) 5) |
128 |
(error err-msg)) |
(error err-msg)) |
133 |
(or (and (stringp region-delim) (memq region-spec '(A B Ancestor))) |
(or (and (stringp region-delim) (memq region-spec '(A B Ancestor))) |
134 |
(error err-msg)) |
(error err-msg)) |
135 |
|
|
136 |
(condition-case err |
(condition-case nil |
137 |
(setq combo-region |
(setq combo-region |
138 |
(concat combo-region |
(concat combo-region |
139 |
region-delim "\n" |
region-delim "\n" |
221 |
(setq state-of-merge (ediff-get-state-of-merge n)) |
(setq state-of-merge (ediff-get-state-of-merge n)) |
222 |
|
|
223 |
(if remerging |
(if remerging |
224 |
(let ((reg-A (ediff-get-region-contents n 'A ediff-control-buffer)) |
;;(let ((reg-A (ediff-get-region-contents n 'A ediff-control-buffer)) |
225 |
(reg-B (ediff-get-region-contents n 'B ediff-control-buffer)) |
;; (reg-B (ediff-get-region-contents n 'B ediff-control-buffer)) |
226 |
(reg-C (ediff-get-region-contents n 'C ediff-control-buffer))) |
;; (reg-C (ediff-get-region-contents n 'C ediff-control-buffer))) |
227 |
|
(let () |
228 |
|
|
229 |
;; if region was edited since it was first set by default |
;; if region was edited since it was first set by default |
230 |
(if (or (ediff-merge-changed-from-default-p n) |
(if (or (ediff-merge-changed-from-default-p n) |
308 |
(interactive "P") |
(interactive "P") |
309 |
(setq n (if (numberp n) (1- n) ediff-current-difference)) |
(setq n (if (numberp n) (1- n) ediff-current-difference)) |
310 |
|
|
311 |
(let (regA regB reg-combined) |
(let (reg-combined) |
312 |
;;(setq regA (ediff-get-region-contents n 'A ediff-control-buffer) |
;;(setq regA (ediff-get-region-contents n 'A ediff-control-buffer) |
313 |
;; regB (ediff-get-region-contents n 'B ediff-control-buffer)) |
;; regB (ediff-get-region-contents n 'B ediff-control-buffer)) |
314 |
;;(setq reg-combined (ediff-make-combined-diff regA regB)) |
;;(setq reg-combined (ediff-make-combined-diff regA regB)) |