diff options
| author | Gerd Moellmann | 2001-08-07 14:41:37 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2001-08-07 14:41:37 +0000 |
| commit | 23f46f6fa4ec3168bdd5bb5f8059e67e58e02f7d (patch) | |
| tree | e174bad6dd70491b7b13ac6d4c8099a15bbc11cc /lisp/emulation | |
| parent | d466fa4dcf7844926c7c19a628680d7c10d3b6be (diff) | |
| download | emacs-23f46f6fa4ec3168bdd5bb5f8059e67e58e02f7d.tar.gz emacs-23f46f6fa4ec3168bdd5bb5f8059e67e58e02f7d.zip | |
(viper-file-checked-in-p): Use `and'
instead of `progn'.
Diffstat (limited to 'lisp/emulation')
| -rw-r--r-- | lisp/emulation/viper-util.el | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ | |||
| 694 | ;; CVS files are considered not checked in | 694 | ;; CVS files are considered not checked in |
| 695 | (not (memq (vc-backend file) '(nil CVS))) | 695 | (not (memq (vc-backend file) '(nil CVS))) |
| 696 | (if (fboundp 'vc-state) | 696 | (if (fboundp 'vc-state) |
| 697 | (progn | 697 | (and |
| 698 | (not (memq (vc-state file) '(edited needs-merge))) | 698 | (not (memq (vc-state file) '(edited needs-merge))) |
| 699 | (not (stringp (vc-state file)))) | 699 | (not (stringp (vc-state file)))) |
| 700 | ;; XEmacs has no vc-state | 700 | ;; XEmacs has no vc-state |