# HG changeset patch # User Gerd Moellmann # Date 997195266 0 # Node ID 3a1c2213b3d23ff9d97e4340a985f07b0886faf5 # Parent b1f9c6a7a0026036ad3ee444233caf0807c745f9 (viper-file-checked-in-p): Use `and' instead of `progn'. diff -r b1f9c6a7a002 -r 3a1c2213b3d2 lisp/emulation/viper-util.el --- 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