Mercurial > emacs
changeset 12944:b10874fddeb3
(vc-fetch-master-properties): Count cvs status "Needs Patch" as
`needs-checkout'.
(vc-after-save): Clear the cvs status.
author | André Spiegel <spiegel@gnu.org> |
---|---|
date | Fri, 25 Aug 1995 18:35:32 +0000 |
parents | 10d0f42db2da |
children | 14e16370799d |
files | lisp/vc-hooks.el |
diffstat | 1 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/vc-hooks.el Fri Aug 25 18:30:11 1995 +0000 +++ b/lisp/vc-hooks.el Fri Aug 25 18:35:32 1995 +0000 @@ -332,9 +332,11 @@ (cond ((string-match "Locally Modified" status) 'locally-modified) ((string-match "Needs Merge" status) 'needs-merge) - ((string-match "Needs Checkout" status) 'needs-checkout) + ((string-match "Needs \\(Checkout\\|Patch\\)" status) + 'needs-checkout) ((string-match "Unresolved Conflict" status) 'unresolved-conflict) ((string-match "Locally Added" status) 'locally-added) + (t 'unknown) )))))))) (if (get-buffer "*vc-info*") (kill-buffer (get-buffer "*vc-info*"))))) @@ -804,7 +806,10 @@ (not (vc-locking-user file)) (eq (vc-checkout-model file) 'implicit) (vc-file-setprop file 'vc-locking-user (user-login-name)) - (vc-mode-line file)))) + (progn + (and (eq (vc-backend file) 'CVS) + (vc-file-setprop file 'vc-cvs-status nil)) + (vc-mode-line file))))) (defun vc-mode-line (file &optional label) "Set `vc-mode' to display type of version control for FILE.