summaryrefslogtreecommitdiff
path: root/lisp/vc.el
diff options
context:
space:
mode:
authorAndré Spiegel <spiegel@gnu.org>1995-08-17 13:50:33 +0000
committerAndré Spiegel <spiegel@gnu.org>1995-08-17 13:50:33 +0000
commit7d88be52791c8ddb18a49c34c132c64bf29faa35 (patch)
treea6bb5d7b17c4b105c35ee2a9cd6e769e1f86cfc6 /lisp/vc.el
parentaf5e65b99614043af20ed42e99be8810b27212cb (diff)
downloademacs-7d88be52791c8ddb18a49c34c132c64bf29faa35.tar.gz
Changed references to vc-top-version into vc-master-workfile-version.
Diffstat (limited to 'lisp/vc.el')
-rw-r--r--lisp/vc.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/vc.el b/lisp/vc.el
index 01d2f993cfb..12762a38f67 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -224,7 +224,7 @@ and that its contents match what the master file says.")
(progn ;; RCS
(vc-file-setprop file 'vc-default-branch nil)
(vc-file-setprop file 'vc-head-version nil)
- (vc-file-setprop file 'vc-top-version nil)
+ (vc-file-setprop file 'vc-master-workfile--version nil)
(vc-file-setprop file 'vc-master-locks nil))
(progn
(vc-file-setprop file 'vc-cvs-status nil))))
@@ -254,7 +254,8 @@ and that its contents match what the master file says.")
(string= (vc-file-getprop file 'vc-head-version)
workfile-version))
;; If we are not on the trunk, we need to examine the
- ;; whole current branch. (vc-top-version is not what we need.)
+ ;; whole current branch. (vc-master-workfile-version
+ ;; is not what we need.)
(save-excursion
(set-buffer (get-buffer-create "*vc-info*"))
(vc-insert-file (vc-name file) "^desc")