[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff-vers.el,v
From: |
Michael Kifer |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff-vers.el,v |
Date: |
Fri, 02 Nov 2007 06:03:13 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Michael Kifer <kifer> 07/11/02 06:03:12
Index: lisp/ediff-vers.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff-vers.el,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- lisp/ediff-vers.el 31 Oct 2007 06:28:09 -0000 1.32
+++ lisp/ediff-vers.el 2 Nov 2007 06:03:11 -0000 1.33
@@ -52,8 +52,22 @@
:group 'ediff-vers
)
+(defalias 'ediff-vc-revision-other-window
+ (if (fboundp 'vc-revision-other-window)
+ 'vc-revision-other-window
+ 'vc-version-other-window))
+
+(defalias 'ediff-vc-working-revision
+ (if (fboundp 'vc-working-revision)
+ 'vc-working-revision
+ vc-workfile-version))
+
;; VC.el support
+(eval-when-compile
+ (require 'vc-hooks)) ;; for vc-call macro
+
+
(defun ediff-vc-latest-version (file)
"Return the version level of the latest version of FILE in repository."
(if (fboundp 'vc-latest-version)
@@ -77,12 +91,12 @@
(setq rev1 (ediff-vc-latest-version (buffer-file-name))))
(save-window-excursion
(save-excursion
- (vc-revision-other-window rev1)
+ (ediff-vc-revision-other-window rev1)
(setq rev1buf (current-buffer)
file1 (buffer-file-name)))
(save-excursion
(or (string= rev2 "") ; use current buffer
- (vc-revision-other-window rev2))
+ (ediff-vc-revision-other-window rev2))
(setq rev2buf (current-buffer)
file2 (buffer-file-name)))
(setq startup-hooks
@@ -158,17 +172,17 @@
(let (buf1 buf2 ancestor-buf)
(save-window-excursion
(save-excursion
- (vc-revision-other-window rev1)
+ (ediff-vc-revision-other-window rev1)
(setq buf1 (current-buffer)))
(save-excursion
(or (string= rev2 "")
- (vc-revision-other-window rev2))
+ (ediff-vc-revision-other-window rev2))
(setq buf2 (current-buffer)))
(if ancestor-rev
(save-excursion
(if (string= ancestor-rev "")
- (setq ancestor-rev (vc-working-revision buffer-file-name)))
- (vc-revision-other-window ancestor-rev)
+ (setq ancestor-rev (ediff-vc-working-revision
buffer-file-name)))
+ (ediff-vc-revision-other-window ancestor-rev)
(setq ancestor-buf (current-buffer))))
(setq startup-hooks
(cons
- [Emacs-diffs] Changes to emacs/lisp/ediff-vers.el,v,
Michael Kifer <=