From: Johan Bockgård Date: Sat, 23 May 2009 12:46:55 +0000 (+0000) Subject: (ediff-vc-latest-version): Use property `vc-latest-revision' instead X-Git-Tag: emacs-pretest-23.0.95~175 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e290f028d693a3e3566abca98e664452478d1a04;p=emacs.git (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 948c7e2a868..48496899690 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2009-05-23 Johan BockgÃ¥rd + + * 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 * progmodes/grep.el (grep-compute-defaults): Simplify how settings diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el index a3a855278e3..71f4465eb7b 100644 --- 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)))) ))