Mercurial > hg > xemacs-beta

comparison lisp/ediff/ediff-merg.el @ 14:9ee227acff29 r19-15b90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r19-15b90
author cvs
date Mon, 13 Aug 2007 08:48:42 +0200
parents bcdc7deadc19
children 0293115a14e9
comparison
equal deleted inserted replaced
13:13c6d0aaafe5 14:9ee227acff29
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 "." 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
25 43
26 (require 'ediff-init) 44 (require 'ediff-init)
27 45
28 46
29 (defvar ediff-default-variant 'combined 47 (defvar ediff-default-variant 'combined
268 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) 286 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
269 ;;; eval: (put 'ediff-eval-in-buffer 'lisp-indent-hook 1) 287 ;;; eval: (put 'ediff-eval-in-buffer 'lisp-indent-hook 1)
270 ;;; eval: (put 'ediff-eval-in-buffer 'edebug-form-spec '(form body)) 288 ;;; eval: (put 'ediff-eval-in-buffer 'edebug-form-spec '(form body))
271 ;;; End: 289 ;;; End:
272 290
273 (provide 'ediff-merg)
274
275 ;; ediff-merg.el ends here 291 ;; ediff-merg.el ends here