diff options
| author | André Spiegel <spiegel@gnu.org> | 2000-11-22 12:55:31 +0000 |
|---|---|---|
| committer | André Spiegel <spiegel@gnu.org> | 2000-11-22 12:55:31 +0000 |
| commit | 8d420b631d8cc385ac206b5aca920f96e662d9ad (patch) | |
| tree | e7bbaff821f277de289e8b855505c4a5908e94ac /lisp/emulation | |
| parent | f3bbec286b9c9aec68636b74366280e891dc91b6 (diff) | |
| download | emacs-8d420b631d8cc385ac206b5aca920f96e662d9ad.tar.gz | |
(viper-file-checked-in-p): Call vc-state instead of vc-locking-user,
which no longer exists.
Diffstat (limited to 'lisp/emulation')
| -rw-r--r-- | lisp/emulation/viper-util.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el index 393dc4d5276..a36478f0652 100644 --- a/lisp/emulation/viper-util.el +++ b/lisp/emulation/viper-util.el @@ -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) |