From 2e955a8b51cf21b6f5383ef77cd32d0d58fcabc1 Mon Sep 17 00:00:00 2001 From: Michael Kifer Date: Sat, 12 Oct 2002 07:13:59 +0000 Subject: 2002-10-12 Michael Kifer * ediff-init.el (ediff-frame-char-height): use frame-selected-window. * ediff-util.el (ediff-file-checked-in-p): changed progn with and * ediff-wind.el (ediff-skip-unsuitable-frames): distinguish selected frame from frame of selected window (ediff-frame-has-dedicated-windows): don't select any frames to avoid changing selected windows (ediff-setup-control-frame): make sure auto-rase is properly set for the control frame --- lisp/ediff-util.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lisp/ediff-util.el') 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))) )) -- cgit v1.2.3