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-init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp/ediff-init.el') diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el index 01c9b1e129a..58a37e2566d 100644 --- a/lisp/ediff-init.el +++ b/lisp/ediff-init.el @@ -1550,7 +1550,7 @@ This default should work without changes." (defsubst ediff-frame-char-height (frame) (ediff-cond-compile-for-xemacs-or-emacs - (glyph-height ediff-H-glyph (selected-window frame)) ; xemacs cse + (glyph-height ediff-H-glyph (frame-selected-window frame)) ; xemacs case (frame-char-height frame) ; emacs case ) ) -- cgit v1.2.3