[Emacs-diffs] Changes to emacs/lisp/ediff-vers.el,v

[Eric S. Raymond]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Eric S. Raymond <esr>   07/10/11 16:02:53

Index: ediff-vers.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff-vers.el,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- ediff-vers.el       10 Oct 2007 18:52:44 -0000      1.30
+++ ediff-vers.el       11 Oct 2007 16:02:52 -0000      1.31
@@ -84,12 +84,12 @@
        (setq rev1 (ediff-vc-latest-version (buffer-file-name))))
     (save-window-excursion
       (save-excursion
-       (vc-version-other-window rev1)
+       (vc-revision-other-window rev1)
        (setq rev1buf (current-buffer)
              file1 (buffer-file-name)))
       (save-excursion
        (or (string= rev2 "")           ; use current buffer
-           (vc-version-other-window rev2))
+           (vc-revision-other-window rev2))
        (setq rev2buf (current-buffer)
              file2 (buffer-file-name)))
       (setq startup-hooks
@@ -191,17 +191,17 @@
   (let (buf1 buf2 ancestor-buf)
     (save-window-excursion
       (save-excursion
-       (vc-version-other-window rev1)
+       (vc-revision-other-window rev1)
        (setq buf1 (current-buffer)))
       (save-excursion
        (or (string= rev2 "")
-           (vc-version-other-window rev2))
+           (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-version-other-window ancestor-rev)
+           (vc-revision-other-window ancestor-rev)
            (setq ancestor-buf (current-buffer))))
       (setq startup-hooks
            (cons