From f2b01ed6cbfe5e68e10ca0d1206cdddef49310d2 Mon Sep 17 00:00:00 2001 From: Karl Heuer Date: Sat, 4 Nov 1995 00:19:00 +0000 Subject: [!MULTI_FRAME] (Fmodify_frame_parameters): Add missing declaration and initialization. [MULTI_FRAME] (choose_minibuf_frame): Moved to minibuf.c; now unconditional. --- src/frame.c | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) (limited to 'src/frame.c') diff --git a/src/frame.c b/src/frame.c index 857f0eb133..88ca837747 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1962,26 +1962,6 @@ the rightmost or bottommost possible position (that stays within the screen).") return Qt; } - -/* Put minibuf on currently selected frame's minibuffer. - We do this whenever the user starts a new minibuffer - or when a minibuffer exits. */ - -choose_minibuf_frame () -{ - if (selected_frame != 0 - && !EQ (minibuf_window, selected_frame->minibuffer_window)) - { - /* I don't think that any frames may validly have a null minibuffer - window anymore. */ - if (NILP (selected_frame->minibuffer_window)) - abort (); - - Fset_window_buffer (selected_frame->minibuffer_window, - XWINDOW (minibuf_window)->buffer); - minibuf_window = selected_frame->minibuffer_window; - } -} syms_of_frame () { @@ -2387,6 +2367,15 @@ DEFUN ("modify-frame-parameters", Fmodify_frame_parameters, Lisp_Object frame, alist; { Lisp_Object tail, elt, prop, val; + FRAME_PTR f; + + if (NILP (frame)) + f = selected_frame; + else + { + CHECK_LIVE_FRAME (frame, 0); + f = XFRAME (frame); + } #ifdef MSDOS if (FRAME_X_P (frame)) @@ -2433,7 +2422,7 @@ DEFUN ("frame-list", Fframe_list, Sframe_list, 0, 0, 0, { return Fcons (Fselected_frame (), Qnil); } - + syms_of_frame () { syms_of_frame_1 (); -- cgit v1.2.3