(ediff-vc-latest-version): Use property `vc-latest-revision' instead

of `vc-latest-version'. (It was renamed in the big VC overhaul.)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 948c7e2a868e3e9730456f51d554778d703fd246..48496899690c80918438193e6a4528026177ba7f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-23  Johan Bockgård  <bojohan@gnu.org>
+
+       * ediff-vers.el (ediff-vc-latest-version): Use property
+       `vc-latest-revision' instead of `vc-latest-version'.  (It was
+       renamed in the big VC overhaul.)
+
 2009-05-23  Chong Yidong  <cyd@stupidchicken.com>
 
        * progmodes/grep.el (grep-compute-defaults): Simplify how settings

diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el
index a3a855278e3436d167b0024847f556f0699eba37..71f4465eb7bb10f8778867c6df862c62bdb665cb 100644 (file)
--- a/lisp/ediff-vers.el
+++ b/lisp/ediff-vers.el
@@ -69,10 +69,10 @@ comparison or merge operations are being performed."
   "Return the version level of the latest version of FILE in repository."
   (if (fboundp 'vc-latest-version)
       (vc-latest-version file)
-    (or (vc-file-getprop file 'vc-latest-version)
+    (or (vc-file-getprop file 'vc-latest-revision)
        (cond ((vc-backend file)
               (vc-call state file)
-              (vc-file-getprop file 'vc-latest-version))
+              (vc-file-getprop file 'vc-latest-revision))
              (t (error "File %s is not under version control" file))))
     ))