mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-26 18:01:13 -08:00
[!MULTI_FRAME] (Fmodify_frame_parameters): Add missing
declaration and initialization. [MULTI_FRAME] (choose_minibuf_frame): Moved to minibuf.c; now unconditional.
This commit is contained in:
parent
265228419a
commit
f2b01ed6cb
1 changed files with 10 additions and 21 deletions
31
src/frame.c
31
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 ();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue