diff options
| author | Johan Bockgård | 2009-05-23 12:46:55 +0000 |
|---|---|---|
| committer | Johan Bockgård | 2009-05-23 12:46:55 +0000 |
| commit | e290f028d693a3e3566abca98e664452478d1a04 (patch) | |
| tree | 046878f80b903519624c0230778a8dfd2cc1eb89 | |
| parent | 21f73755fe7c72cc2a66acf46f1e1cc875910f17 (diff) | |
| download | emacs-e290f028d693a3e3566abca98e664452478d1a04.tar.gz emacs-e290f028d693a3e3566abca98e664452478d1a04.zip | |
(ediff-vc-latest-version): Use property `vc-latest-revision' instead
of `vc-latest-version'. (It was renamed in the big VC overhaul.)
| -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 948c7e2a868..48496899690 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2009-05-23 Johan Bockgård <bojohan@gnu.org> | ||
| 2 | |||
| 3 | * ediff-vers.el (ediff-vc-latest-version): Use property | ||
| 4 | `vc-latest-revision' instead of `vc-latest-version'. (It was | ||
| 5 | renamed in the big VC overhaul.) | ||
| 6 | |||
| 1 | 2009-05-23 Chong Yidong <cyd@stupidchicken.com> | 7 | 2009-05-23 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 8 | ||
| 3 | * progmodes/grep.el (grep-compute-defaults): Simplify how settings | 9 | * 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." | |||
| 69 | "Return the version level of the latest version of FILE in repository." | 69 | "Return the version level of the latest version of FILE in repository." |
| 70 | (if (fboundp 'vc-latest-version) | 70 | (if (fboundp 'vc-latest-version) |
| 71 | (vc-latest-version file) | 71 | (vc-latest-version file) |
| 72 | (or (vc-file-getprop file 'vc-latest-version) | 72 | (or (vc-file-getprop file 'vc-latest-revision) |
| 73 | (cond ((vc-backend file) | 73 | (cond ((vc-backend file) |
| 74 | (vc-call state file) | 74 | (vc-call state file) |
| 75 | (vc-file-getprop file 'vc-latest-version)) | 75 | (vc-file-getprop file 'vc-latest-revision)) |
| 76 | (t (error "File %s is not under version control" file)))) | 76 | (t (error "File %s is not under version control" file)))) |
| 77 | )) | 77 | )) |
| 78 | 78 | ||