Mercurial > emacs
comparison lisp/vc.el @ 12875:33a7a6329aa5
Changed references to vc-top-version into vc-master-workfile-version.
author | André Spiegel <spiegel@gnu.org> |
---|---|
date | Thu, 17 Aug 1995 13:50:33 +0000 |
parents | 03d3b7d60f67 |
children | fedbe59f374e |
comparison
equal
deleted
inserted
replaced
12874:3afd71d56015 | 12875:33a7a6329aa5 |
---|---|
222 (progn ;; SCCS | 222 (progn ;; SCCS |
223 (vc-file-setprop file 'vc-master-locks nil)) | 223 (vc-file-setprop file 'vc-master-locks nil)) |
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)))) |
231 | 231 |
232 (defun vc-head-version (file) | 232 (defun vc-head-version (file) |
252 ;; our back. | 252 ;; our back. |
253 (vc-fetch-master-properties file) | 253 (vc-fetch-master-properties file) |
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") |
261 (setq tip-version (car (vc-parse-buffer (list (list | 262 (setq tip-version (car (vc-parse-buffer (list (list |
262 (concat "^\\(" (regexp-quote (vc-branch-part workfile-version)) | 263 (concat "^\\(" (regexp-quote (vc-branch-part workfile-version)) |