From 23f46f6fa4ec3168bdd5bb5f8059e67e58e02f7d Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Tue, 7 Aug 2001 14:41:37 +0000 Subject: [PATCH] (viper-file-checked-in-p): Use `and' instead of `progn'. --- lisp/ChangeLog | 3 +++ lisp/emulation/viper-util.el | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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 + * 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 . 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 -- 2.39.2