diff options
| author | Johan Bockgård <[email protected]> | 2009-05-23 12:46:55 +0000 |
|---|---|---|
| committer | Johan Bockgård <[email protected]> | 2009-05-23 12:46:55 +0000 |
| commit | e290f028d693a3e3566abca98e664452478d1a04 (patch) | |
| tree | 046878f80b903519624c0230778a8dfd2cc1eb89 /lisp | |
| parent | 21f73755fe7c72cc2a66acf46f1e1cc875910f17 (diff) | |
(ediff-vc-latest-version): Use property `vc-latest-revision' instead
of `vc-latest-version'. (It was renamed in the big VC overhaul.)
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/ediff-vers.el | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 948c7e2a86..4849689969 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2009-05-23 Johan Bockgård <[email protected]> + + * 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 <[email protected]> * progmodes/grep.el (grep-compute-defaults): Simplify how settings diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el index a3a855278e..71f4465eb7 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)))) )) |