diff options
| author | Richard M. Stallman | 1995-03-31 17:47:32 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1995-03-31 17:47:32 +0000 |
| commit | 5add3885ddaa0d67122703fde2644c3478259d5d (patch) | |
| tree | 1d3e8a251bbb121a4afeeb7451a1e01c8e802512 /src | |
| parent | 2eebaacd6972cf05f4535651395172ecb790bb7e (diff) | |
| download | emacs-5add3885ddaa0d67122703fde2644c3478259d5d.tar.gz emacs-5add3885ddaa0d67122703fde2644c3478259d5d.zip | |
[MULTI_FRAME] (Factive_minibuffer_window): New function.
[MULTI_FRAME] (syms_of_frame): Defsubr it.
Diffstat (limited to 'src')
| -rw-r--r-- | src/frame.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/frame.c b/src/frame.c index d1b70fdaa70..448e36b2974 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* Generic frame functions. | 1 | /* Generic frame functions. |
| 2 | Copyright (C) 1993, 1994 Free Software Foundation. | 2 | Copyright (C) 1993, 1994, 1995 Free Software Foundation. |
| 3 | 3 | ||
| 4 | This file is part of GNU Emacs. | 4 | This file is part of GNU Emacs. |
| 5 | 5 | ||
| @@ -556,6 +556,14 @@ If omitted, FRAME defaults to the currently selected frame.") | |||
| 556 | return w; | 556 | return w; |
| 557 | } | 557 | } |
| 558 | 558 | ||
| 559 | DEFUN ("active-minibuffer-window", Factive_minibuffer_window, | ||
| 560 | Sactive_minibuffer_window, 0, 0, 0, | ||
| 561 | "Return the currently active minibuffer window, or nil if none.") | ||
| 562 | () | ||
| 563 | { | ||
| 564 | return minibuf_level ? minibuf_window : Qnil; | ||
| 565 | } | ||
| 566 | |||
| 559 | DEFUN ("frame-root-window", Fframe_root_window, Sframe_root_window, 0, 1, 0, | 567 | DEFUN ("frame-root-window", Fframe_root_window, Sframe_root_window, 0, 1, 0, |
| 560 | "Returns the root-window of FRAME.\n\ | 568 | "Returns the root-window of FRAME.\n\ |
| 561 | If omitted, FRAME defaults to the currently selected frame.") | 569 | If omitted, FRAME defaults to the currently selected frame.") |
| @@ -1867,6 +1875,7 @@ The `menu-bar-lines' element of the list controls whether new frames\n\ | |||
| 1867 | have menu bars; `menu-bar-mode' works by altering this element."); | 1875 | have menu bars; `menu-bar-mode' works by altering this element."); |
| 1868 | Vdefault_frame_alist = Qnil; | 1876 | Vdefault_frame_alist = Qnil; |
| 1869 | 1877 | ||
| 1878 | defsubr (&Sactive_minibuffer_window); | ||
| 1870 | defsubr (&Sframep); | 1879 | defsubr (&Sframep); |
| 1871 | defsubr (&Sframe_live_p); | 1880 | defsubr (&Sframe_live_p); |
| 1872 | defsubr (&Smake_terminal_frame); | 1881 | defsubr (&Smake_terminal_frame); |