(custom-variable-prompt): Doc change. Use custom-variable-p.

[gnu-emacs] / lisp / ediff-util.el

diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index 64d19c5ee698624bbf83a5d976de87c4e84f5b34..865f14a41c561d6166f1ed9df38d1a74fee073fb 100644 (file)
--- 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)))
        ))