Mercurial > emacs
comparison src/frame.c @ 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 | 22011e724596 |
children | 1ed740e9aa64 |
comparison
equal
deleted
inserted
replaced
13395:c18547cf191f | 13396:b44cc5a62941 |
---|---|
1961 | 1961 |
1962 return Qt; | 1962 return Qt; |
1963 } | 1963 } |
1964 | 1964 |
1965 | 1965 |
1966 /* Put minibuf on currently selected frame's minibuffer. | |
1967 We do this whenever the user starts a new minibuffer | |
1968 or when a minibuffer exits. */ | |
1969 | |
1970 choose_minibuf_frame () | |
1971 { | |
1972 if (selected_frame != 0 | |
1973 && !EQ (minibuf_window, selected_frame->minibuffer_window)) | |
1974 { | |
1975 /* I don't think that any frames may validly have a null minibuffer | |
1976 window anymore. */ | |
1977 if (NILP (selected_frame->minibuffer_window)) | |
1978 abort (); | |
1979 | |
1980 Fset_window_buffer (selected_frame->minibuffer_window, | |
1981 XWINDOW (minibuf_window)->buffer); | |
1982 minibuf_window = selected_frame->minibuffer_window; | |
1983 } | |
1984 } | |
1985 | |
1986 syms_of_frame () | 1966 syms_of_frame () |
1987 { | 1967 { |
1988 syms_of_frame_1 (); | 1968 syms_of_frame_1 (); |
1989 | 1969 |
1990 staticpro (&Vframe_list); | 1970 staticpro (&Vframe_list); |
2385 0) | 2365 0) |
2386 (frame, alist) | 2366 (frame, alist) |
2387 Lisp_Object frame, alist; | 2367 Lisp_Object frame, alist; |
2388 { | 2368 { |
2389 Lisp_Object tail, elt, prop, val; | 2369 Lisp_Object tail, elt, prop, val; |
2370 FRAME_PTR f; | |
2371 | |
2372 if (NILP (frame)) | |
2373 f = selected_frame; | |
2374 else | |
2375 { | |
2376 CHECK_LIVE_FRAME (frame, 0); | |
2377 f = XFRAME (frame); | |
2378 } | |
2390 | 2379 |
2391 #ifdef MSDOS | 2380 #ifdef MSDOS |
2392 if (FRAME_X_P (frame)) | 2381 if (FRAME_X_P (frame)) |
2393 IT_set_frame_parameters (XFRAME (frame), alist); | 2382 IT_set_frame_parameters (XFRAME (frame), alist); |
2394 else | 2383 else |
2431 0) | 2420 0) |
2432 () | 2421 () |
2433 { | 2422 { |
2434 return Fcons (Fselected_frame (), Qnil); | 2423 return Fcons (Fselected_frame (), Qnil); |
2435 } | 2424 } |
2436 | 2425 |
2437 syms_of_frame () | 2426 syms_of_frame () |
2438 { | 2427 { |
2439 syms_of_frame_1 (); | 2428 syms_of_frame_1 (); |
2440 | 2429 |
2441 DEFVAR_LISP ("terminal-frame", &Vterminal_frame, | 2430 DEFVAR_LISP ("terminal-frame", &Vterminal_frame, |