Mercurial > hg > xemacs-beta

comparison lisp/ediff/ediff-merg.el @ 70:131b0175ea99 r20-0b30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-0b30
author cvs
date Mon, 13 Aug 2007 09:02:59 +0200
parents 0293115a14e9
children c7528f8e288d
comparison
equal deleted inserted replaced
69:804d1389bcd6 70:131b0175ea99
1 ;;; ediff-merg.el --- merging utilities 1 ;;; ediff-merg.el --- merging utilities
2 2
3 ;; Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. 3 ;; Copyright (C) 1994, 1995, 1996 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
20 ;; along with GNU Emacs; see the file COPYING. If not, write to the 20 ;; along with GNU Emacs; see the file COPYING. If not, write to the
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
26 (provide 'ediff-merg)
27
28 ;; compiler pacifier
29 (defvar ediff-window-A)
30 (defvar ediff-window-B)
31 (defvar ediff-window-C)
32 (defvar ediff-merge-window-share)
33 (defvar ediff-window-config-saved)
34
35 (eval-when-compile
36 (let ((load-path (cons (expand-file-name ".") load-path)))
37 (or (featurep 'ediff-init)
38 (load "ediff-init.el" nil nil 'nosuffix))
39 (or (featurep 'ediff-util)
40 (load "ediff-util.el" nil nil 'nosuffix))
41 ))
42 ;; end pacifier
43 25
44 (require 'ediff-init) 26 (require 'ediff-init)
45 27
46 28
47 (defvar ediff-default-variant 'combined 29 (defvar ediff-default-variant 'combined
280 (if (and reg-a-beg reg-a-end reg-b-beg reg-b-end) 262 (if (and reg-a-beg reg-a-end reg-b-beg reg-b-end)
281 (list reg-a-beg reg-a-end reg-b-beg reg-b-end reg-c-beg reg-c-end)) 263 (list reg-a-beg reg-a-end reg-b-beg reg-b-end reg-c-beg reg-c-end))
282 ))) 264 )))
283 265
284 266
285 ;;; Local Variables: 267 (provide 'ediff-merg)
286 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
287 ;;; eval: (put 'ediff-eval-in-buffer 'lisp-indent-hook 1)
288 ;;; eval: (put 'ediff-eval-in-buffer 'edebug-form-spec '(form body))
289 ;;; End:
290 268
291 ;; ediff-merg.el ends here 269 ;; ediff-merg.el ends here