Mercurial > emacs
changeset 33742:f3a1a5ef5e7f
(viper-file-checked-in-p): Call vc-state instead of vc-locking-user,
which no longer exists.
author | André Spiegel <spiegel@gnu.org> |
---|---|
date | Wed, 22 Nov 2000 12:55:31 +0000 |
parents | 798176da5262 |
children | fb9bb620d52a |
files | lisp/emulation/viper-util.el |
diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/emulation/viper-util.el Wed Nov 22 12:54:21 2000 +0000 +++ b/lisp/emulation/viper-util.el Wed Nov 22 12:55:31 2000 +0000 @@ -684,7 +684,8 @@ (and (featurep 'vc-hooks) ;; CVS files are considered not checked in (not (memq (vc-backend file) '(nil CVS))) - (not (vc-locking-user file)))) + (not (memq (vc-state file) '(edited needs-merge))) + (not (stringp (vc-state file))))) ;; checkout if visited file is checked in (defun viper-maybe-checkout (buf)