Mercurial > emacs
changeset 38723:3a1c2213b3d2
(viper-file-checked-in-p): Use `and'
instead of `progn'.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Tue, 07 Aug 2001 14:41:06 +0000 |
parents | b1f9c6a7a002 |
children | 3f2fc7cfcecf |
files | lisp/emulation/viper-util.el |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/emulation/viper-util.el Tue Aug 07 14:19:26 2001 +0000 +++ b/lisp/emulation/viper-util.el Tue Aug 07 14:41:06 2001 +0000 @@ -694,7 +694,7 @@ ;; CVS files are considered not checked in (not (memq (vc-backend file) '(nil CVS))) (if (fboundp 'vc-state) - (progn + (and (not (memq (vc-state file) '(edited needs-merge))) (not (stringp (vc-state file)))) ;; XEmacs has no vc-state