diff options
Diffstat (limited to 'lisp/ediff-util.el')
| -rw-r--r-- | lisp/ediff-util.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el index 64d19c5ee69..865f14a41c5 100644 --- a/lisp/ediff-util.el +++ b/lisp/ediff-util.el @@ -1137,9 +1137,9 @@ of the current buffer." ;; CVS files are considered not checked in (not (memq (vc-backend file) '(nil CVS))) (if (fboundp 'vc-state) - (progn - (not (memq (vc-state file) '(edited needs-merge))) - (not (stringp (vc-state file)))) + (and + (not (memq (vc-state file) '(edited needs-merge))) + (not (stringp (vc-state file)))) ;; XEmacs has no vc-state (not (vc-locking-user file))) )) |