diff options
| author | Dmitry Antipov | 2013-09-23 13:50:47 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2013-09-23 13:50:47 +0400 |
| commit | 5492865b797b7ce33730ea7b013d43beeaf33dc3 (patch) | |
| tree | 4289b376ea0446ffb248426d7f63eb3fc1737939 /src/frame.c | |
| parent | b519df23900222df5637cbd23eba45e4bd540856 (diff) | |
| download | emacs-5492865b797b7ce33730ea7b013d43beeaf33dc3.tar.gz emacs-5492865b797b7ce33730ea7b013d43beeaf33dc3.zip | |
* dispnew.c (frame_garbaged, selected_frame, last_nonminibuf_frame):
Move to...
* frame.c (frame_garbaged, selected_frame, last_nonminibuf_frame):
...this file and convert the latter to static. Adjust comment.
(make_initial_frame):
* window.c (init_window_once): Adjust user.
* frame.h (last_nonminibuf_frame): Remove declaration.
* lisp.h (selected_frame): Likewise.
* msdos.c (the_only_display_info): Adjust comment.
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/frame.c b/src/frame.c index d2943211377..2e90713b6c3 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -113,6 +113,19 @@ static Lisp_Object Qdelete_frame_functions; | |||
| 113 | 113 | ||
| 114 | static Lisp_Object Qgeometry, Qworkarea, Qmm_size, Qframes, Qsource; | 114 | static Lisp_Object Qgeometry, Qworkarea, Qmm_size, Qframes, Qsource; |
| 115 | 115 | ||
| 116 | /* The currently selected frame. */ | ||
| 117 | |||
| 118 | Lisp_Object selected_frame; | ||
| 119 | |||
| 120 | /* A frame which is not just a mini-buffer, or NULL if there are no such | ||
| 121 | frames. This is usually the most recent such frame that was selected. */ | ||
| 122 | |||
| 123 | static struct frame *last_nonminibuf_frame; | ||
| 124 | |||
| 125 | /* Nonzero means there is at least one garbaged frame. */ | ||
| 126 | |||
| 127 | bool frame_garbaged; | ||
| 128 | |||
| 116 | #ifdef HAVE_WINDOW_SYSTEM | 129 | #ifdef HAVE_WINDOW_SYSTEM |
| 117 | static void x_report_frame_params (struct frame *, Lisp_Object *); | 130 | static void x_report_frame_params (struct frame *, Lisp_Object *); |
| 118 | #endif | 131 | #endif |
| @@ -546,6 +559,8 @@ make_initial_frame (void) | |||
| 546 | if (!noninteractive) | 559 | if (!noninteractive) |
| 547 | init_frame_faces (f); | 560 | init_frame_faces (f); |
| 548 | 561 | ||
| 562 | last_nonminibuf_frame = f; | ||
| 563 | |||
| 549 | return f; | 564 | return f; |
| 550 | } | 565 | } |
| 551 | 566 | ||