Mercurial > emacs

comparison lisp/ediff-merg.el @ 18054:0b9d9cbf3cd4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new version
author Michael Kifer <kifer@cs.stonybrook.edu>
date Sat, 31 May 1997 01:10:39 +0000
parents b2fae8abc5b0
children 1405083241e8
comparison
equal deleted inserted replaced
18053:941f5d1a241e 18054:0b9d9cbf3cd4
1 ;;; ediff-merg.el --- merging utilities 1 ;;; ediff-merg.el --- merging utilities
2 2
3 ;; Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. 3 ;; Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
4 4
5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu> 5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
6 6
7 ;; This file is part of GNU Emacs. 7 ;; This file is part of GNU Emacs.
8 8
21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, 21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
22 ;; Boston, MA 02111-1307, USA. 22 ;; Boston, MA 02111-1307, USA.
23 23
24 ;;; Code: 24 ;;; Code:
25 25
26 (provide 'ediff-merg)
27
28 (defgroup ediff-merge nil
29 "Merging utilities"
30 :prefix "ediff-"
31 :group 'ediff)
32
33
34 ;; compiler pacifier
35 (defvar ediff-window-A)
36 (defvar ediff-window-B)
37 (defvar ediff-window-C)
38 (defvar ediff-merge-window-share)
39 (defvar ediff-window-config-saved)
40
41 (eval-when-compile
42 (let ((load-path (cons (expand-file-name ".") load-path)))
43 (or (featurep 'ediff-init)
44 (load "ediff-init.el" nil nil 'nosuffix))
45 (or (featurep 'ediff-util)
46 (load "ediff-util.el" nil nil 'nosuffix))
47 ))
48 ;; end pacifier
49
26 (require 'ediff-init) 50 (require 'ediff-init)
27 51
28 52
29 (defvar ediff-default-variant 'combined 53 (defcustom ediff-default-variant 'combined
30 "*The variant to be used as a default for buffer C in merging. 54 "*The variant to be used as a default for buffer C in merging.
31 Valid values are the symbols `default-A', `default-B', and `combined'.") 55 Valid values are the symbols `default-A', `default-B', and `combined'."
32 56 :type '(radio (const default-A) (const default-B) (const combined))
33 (defvar ediff-combination-pattern 57 :group 'ediff-merge)
58
59 (defcustom ediff-combination-pattern
34 '("<<<<<<<<<<<<<< variant A" ">>>>>>>>>>>>>> variant B" "======= end of combination") 60 '("<<<<<<<<<<<<<< variant A" ">>>>>>>>>>>>>> variant B" "======= end of combination")
35 "*Pattern to be used for combining difference regions in buffers A and B. 61 "*Pattern to be used for combining difference regions in buffers A and B.
36 The value is (STRING1 STRING2 STRING3). The combined text will look like this: 62 The value is (STRING1 STRING2 STRING3). The combined text will look like this:
37 63
38 STRING1 64 STRING1
39 diff region from variant A 65 diff region from variant A
40 STRING2 66 STRING2
41 diff region from variant B 67 diff region from variant B
42 STRING3 68 STRING3
43 ") 69 "
70 :type '(list string string string)
71 :group 'ediff-merge)
44 72
45 (ediff-defvar-local ediff-show-clashes-only nil 73 (ediff-defvar-local ediff-show-clashes-only nil
46 "*If t, show only those diff regions where both buffers disagree with the ancestor. 74 "*If t, show only those diff regions where both buffers disagree with the ancestor.
47 This means that regions that have status prefer-A or prefer-B will be 75 This means that regions that have status prefer-A or prefer-B will be
48 skiped over. Nil means show all regions.") 76 skiped over. Nil means show all regions.")
268 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) 296 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
269 ;;; eval: (put 'ediff-eval-in-buffer 'lisp-indent-hook 1) 297 ;;; eval: (put 'ediff-eval-in-buffer 'lisp-indent-hook 1)
270 ;;; eval: (put 'ediff-eval-in-buffer 'edebug-form-spec '(form body)) 298 ;;; eval: (put 'ediff-eval-in-buffer 'edebug-form-spec '(form body))
271 ;;; End: 299 ;;; End:
272 300
273 (provide 'ediff-merg)
274
275 ;; ediff-merg.el ends here 301 ;; ediff-merg.el ends here