Mercurial > hg > xemacs-beta

comparison lisp/ediff/ediff-merg.el @ 16:0293115a14e9 r19-15b91

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r19-15b91
author cvs
date Mon, 13 Aug 2007 08:49:20 +0200
parents 9ee227acff29
children 131b0175ea99
comparison
equal deleted inserted replaced
15:ad457d5f7d04 16:0293115a14e9
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
31 (defvar ediff-window-C) 31 (defvar ediff-window-C)
32 (defvar ediff-merge-window-share) 32 (defvar ediff-merge-window-share)
33 (defvar ediff-window-config-saved) 33 (defvar ediff-window-config-saved)
34 34
35 (eval-when-compile 35 (eval-when-compile
36 (let ((load-path (cons "." load-path))) 36 (let ((load-path (cons (expand-file-name ".") load-path)))
37 (or (featurep 'ediff-init) 37 (or (featurep 'ediff-init)
38 (load "ediff-init.el" nil nil 'nosuffix)) 38 (load "ediff-init.el" nil nil 'nosuffix))
39 (or (featurep 'ediff-util) 39 (or (featurep 'ediff-util)
40 (load "ediff-util.el" nil nil 'nosuffix)) 40 (load "ediff-util.el" nil nil 'nosuffix))
41 )) 41 ))