diff options
| author | André Spiegel | 1995-08-17 13:50:33 +0000 |
|---|---|---|
| committer | André Spiegel | 1995-08-17 13:50:33 +0000 |
| commit | 7d88be52791c8ddb18a49c34c132c64bf29faa35 (patch) | |
| tree | a6bb5d7b17c4b105c35ee2a9cd6e769e1f86cfc6 | |
| parent | af5e65b99614043af20ed42e99be8810b27212cb (diff) | |
| download | emacs-7d88be52791c8ddb18a49c34c132c64bf29faa35.tar.gz emacs-7d88be52791c8ddb18a49c34c132c64bf29faa35.zip | |
Changed references to vc-top-version into vc-master-workfile-version.
| -rw-r--r-- | lisp/vc.el | 5 |
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.") | |||
| 224 | (progn ;; RCS | 224 | (progn ;; RCS |
| 225 | (vc-file-setprop file 'vc-default-branch nil) | 225 | (vc-file-setprop file 'vc-default-branch nil) |
| 226 | (vc-file-setprop file 'vc-head-version nil) | 226 | (vc-file-setprop file 'vc-head-version nil) |
| 227 | (vc-file-setprop file 'vc-top-version nil) | 227 | (vc-file-setprop file 'vc-master-workfile--version nil) |
| 228 | (vc-file-setprop file 'vc-master-locks nil)) | 228 | (vc-file-setprop file 'vc-master-locks nil)) |
| 229 | (progn | 229 | (progn |
| 230 | (vc-file-setprop file 'vc-cvs-status nil)))) | 230 | (vc-file-setprop file 'vc-cvs-status nil)))) |
| @@ -254,7 +254,8 @@ and that its contents match what the master file says.") | |||
| 254 | (string= (vc-file-getprop file 'vc-head-version) | 254 | (string= (vc-file-getprop file 'vc-head-version) |
| 255 | workfile-version)) | 255 | workfile-version)) |
| 256 | ;; If we are not on the trunk, we need to examine the | 256 | ;; If we are not on the trunk, we need to examine the |
| 257 | ;; whole current branch. (vc-top-version is not what we need.) | 257 | ;; whole current branch. (vc-master-workfile-version |
| 258 | ;; is not what we need.) | ||
| 258 | (save-excursion | 259 | (save-excursion |
| 259 | (set-buffer (get-buffer-create "*vc-info*")) | 260 | (set-buffer (get-buffer-create "*vc-info*")) |
| 260 | (vc-insert-file (vc-name file) "^desc") | 261 | (vc-insert-file (vc-name file) "^desc") |