summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/emulation/viper-util.el2
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2cb05fc7fba..a6ee9c8cbb7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
2001-08-07 Gerd Moellmann <gerd@gnu.org>
+ * emulation/viper-util.el (viper-file-checked-in-p): Use `and'
+ instead of `progn'.
+
* tar-mode.el (tar-extract): Avoid generating a new buffer
for each file visited. From Markus Rost <rost@math.ohio-state.edu>.
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index cacd8debd46..f5d4eb355ab 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -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