Mercurial > hg > xemacs-beta

comparison lisp/ediff/ediff-vers.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
28 (defvar rcs-default-co-switches) 28 (defvar rcs-default-co-switches)
29 (defvar sc-mode) 29 (defvar sc-mode)
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 33 (defvar ediff-temp-file-prefix)
34 (and noninteractive 34
35 (eval-when-compile 35 (eval-when-compile
36 (load "pcl-cvs" 'noerror) 36 (load "pcl-cvs" 'noerror)
37 (load "rcs" 'noerror) 37 (load "rcs" 'noerror)
38 (load "generic-sc" 'noerror) 38 (load "generic-sc" 'noerror)
39 (load "vc" 'noerror))) 39 (load "vc" 'noerror))
40 ;; end pacifier 40 ;; end pacifier
41 41
42 ;; VC.el support 42 ;; VC.el support
43 (defun ediff-vc-internal (rev1 rev2 &optional startup-hooks) 43 (defun ediff-vc-internal (rev1 rev2 &optional startup-hooks)
44 ;; Run Ediff on versions of the current buffer. 44 ;; Run Ediff on versions of the current buffer.
65 rev1buf rev2buf 65 rev1buf rev2buf
66 startup-hooks 66 startup-hooks
67 'ediff-revision))) 67 'ediff-revision)))
68 68
69 ;; RCS.el support 69 ;; RCS.el support
70 (defun ediff-rcs-view-revision (&optional rev) 70 (defun rcs-ediff-view-revision (&optional rev)
71 ;; View previous RCS revision of current file. 71 ;; View previous RCS revision of current file.
72 ;; With prefix argument, prompts for a revision name. 72 ;; With prefix argument, prompts for a revision name.
73 (interactive (list (if current-prefix-arg 73 (interactive (list (if current-prefix-arg
74 (read-string "Revision: ")))) 74 (read-string "Revision: "))))
75 (let* ((filename (buffer-file-name (current-buffer))) 75 (let* ((filename (buffer-file-name (current-buffer)))