Mercurial > emacs
changeset 13396:b44cc5a62941
[!MULTI_FRAME] (Fmodify_frame_parameters): Add missing
declaration and initialization.
[MULTI_FRAME] (choose_minibuf_frame): Moved to minibuf.c; now
unconditional.
author | Karl Heuer <kwzh@gnu.org> |
---|---|
date | Sat, 04 Nov 1995 00:19:00 +0000 |
parents | c18547cf191f |
children | aac6ac5b87fd |
files | src/frame.c |
diffstat | 1 files changed, 10 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/src/frame.c Sat Nov 04 00:12:52 1995 +0000 +++ b/src/frame.c Sat Nov 04 00:19:00 1995 +0000 @@ -1963,26 +1963,6 @@ } -/* 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 () { syms_of_frame_1 (); @@ -2387,6 +2367,15 @@ 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 @@ { return Fcons (Fselected_frame (), Qnil); } - + syms_of_frame () { syms_of_frame_1 ();