* 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.

1 files changed, 1 insertions, 6 deletions

diff --git a/src/frame.h b/src/frame.h
index ffab992023a..09e4112d3a2 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -925,6 +925,7 @@ default_pixels_per_inch_y (void)
 #define SET_FRAME_ICONIFIED(f, i)                       \
   (f)->iconified = (eassert (0 <= (i) && (i) <= 1), (i))
 
+extern Lisp_Object selected_frame;
 extern Lisp_Object Qframep, Qframe_live_p;
 extern Lisp_Object Qtty, Qtty_type;
 extern Lisp_Object Qtty_color_mode;
@@ -934,8 +935,6 @@ extern Lisp_Object Qnoelisp;
 /* Nonzero means there is at least one garbaged frame.  */
 extern bool frame_garbaged;
 
-extern struct frame *last_nonminibuf_frame;
-
 extern void set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object);
 extern struct frame *decode_window_system_frame (Lisp_Object);
 extern struct frame *decode_live_frame (Lisp_Object);
@@ -955,10 +954,6 @@ extern void frame_make_pointer_visible (void);
 extern Lisp_Object delete_frame (Lisp_Object, Lisp_Object);
 
 extern Lisp_Object Vframe_list;
-
-/* The currently selected frame.  */
-
-extern Lisp_Object selected_frame;
 
 /* Value is a pointer to the selected frame.  If the selected frame
    isn't live, abort.  */