Mercurial > hg > xemacs-beta

comparison lisp/ediff/ediff-vers.el @ 82:6a378aca36af r20-0b91

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-0b91
author cvs
date Mon, 13 Aug 2007 09:07:36 +0200
parents 1ce6082ce73f
children bfd6434d15b3
comparison
equal deleted inserted replaced
81:ebca3d831cea 82:6a378aca36af
1 ;;; ediff-vers.el --- version control interface to Ediff 1 ;;; ediff-vers.el --- version control interface to Ediff
2 2
3 ;;; Copyright (C) 1995, 1996 Free Software Foundation, Inc. 3 ;;; Copyright (C) 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
30 (defvar cvs-shell) 30 (defvar cvs-shell)
31 (defvar cvs-program) 31 (defvar cvs-program)
32 (defvar cvs-cookie-handle) 32 (defvar cvs-cookie-handle)
33 (defvar ediff-temp-file-prefix) 33 (defvar ediff-temp-file-prefix)
34 34
35 (eval-when-compile 35 (and noninteractive
36 (load "pcl-cvs" 'noerror) 36 (eval-when-compile
37 (load "rcs" 'noerror) 37 (load "pcl-cvs" 'noerror)
38 (load "generic-sc" 'noerror) 38 (load "rcs" 'noerror)
39 (load "vc" 'noerror)) 39 (load "generic-sc" 'noerror)
40 (load "vc" 'noerror)))
40 ;; end pacifier 41 ;; end pacifier
41 42
42 ;; VC.el support 43 ;; VC.el support
43 (defun ediff-vc-internal (rev1 rev2 &optional startup-hooks) 44 (defun ediff-vc-internal (rev1 rev2 &optional startup-hooks)
44 ;; Run Ediff on versions of the current buffer. 45 ;; Run Ediff on versions of the current buffer.