emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] trunk r114441: * dispnew.c (frame_garbaged, selected_frame


From: Dmitry Antipov
Subject: [Emacs-diffs] trunk r114441: * dispnew.c (frame_garbaged, selected_frame, last_nonminibuf_frame):
Date: Mon, 23 Sep 2013 09:51:07 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 114441
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Mon 2013-09-23 13:50:47 +0400
message:
  * 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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/dispnew.c                  dispnew.c-20091113204419-o5vbwnq5f7feedwu-258
  src/frame.c                    frame.c-20091113204419-o5vbwnq5f7feedwu-243
  src/frame.h                    frame.h-20091113204419-o5vbwnq5f7feedwu-229
  src/lisp.h                     lisp.h-20091113204419-o5vbwnq5f7feedwu-253
  src/msdos.c                    msdos.c-20091113204419-o5vbwnq5f7feedwu-656
  src/window.c                   window.c-20091113204419-o5vbwnq5f7feedwu-231
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-09-23 09:28:57 +0000
+++ b/src/ChangeLog     2013-09-23 09:50:47 +0000
@@ -1,3 +1,15 @@
+2013-09-23  Dmitry Antipov  <address@hidden>
+
+       * 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.
+
 2013-09-23  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (mouse_face_from_string_pos): Fix off-by-one error in

=== modified file 'src/dispnew.c'
--- a/src/dispnew.c     2013-09-22 09:31:55 +0000
+++ b/src/dispnew.c     2013-09-23 09:50:47 +0000
@@ -102,30 +102,12 @@
 static void adjust_frame_glyphs_for_window_redisplay (struct frame *);
 static void adjust_frame_glyphs_for_frame_redisplay (struct frame *);
 
-/* True upon entry to redisplay means do not assume anything about
-   current contents of actual terminal frame; clear and redraw it.  */
-
-bool frame_garbaged;
-
 /* True means last display completed.  False means it was preempted.  */
 
 bool display_completed;
 
 Lisp_Object Qdisplay_table, Qredisplay_dont_pause;
 
-
-/* The currently selected frame.  In a single-frame version, this
-   variable always equals the_only_frame.  */
-
-Lisp_Object selected_frame;
-
-/* A frame which is not just a mini-buffer, or 0 if there are no such
-   frames.  This is usually the most recent such frame that was
-   selected.  In a single-frame version, this variable always holds
-   the address of the_only_frame.  */
-
-struct frame *last_nonminibuf_frame;
-
 /* True means SIGWINCH happened when not safe.  */
 
 static bool delayed_size_change;

=== modified file 'src/frame.c'
--- a/src/frame.c       2013-09-20 15:34:36 +0000
+++ b/src/frame.c       2013-09-23 09:50:47 +0000
@@ -113,6 +113,19 @@
 
 static Lisp_Object Qgeometry, Qworkarea, Qmm_size, Qframes, Qsource;
 
+/* The currently selected frame.  */
+
+Lisp_Object selected_frame;
+
+/* A frame which is not just a mini-buffer, or NULL if there are no such
+   frames.  This is usually the most recent such frame that was selected.  */
+
+static struct frame *last_nonminibuf_frame;
+
+/* Nonzero means there is at least one garbaged frame.  */
+
+bool frame_garbaged;
+
 #ifdef HAVE_WINDOW_SYSTEM
 static void x_report_frame_params (struct frame *, Lisp_Object *);
 #endif
@@ -546,6 +559,8 @@
   if (!noninteractive)
     init_frame_faces (f);
 
+  last_nonminibuf_frame = f;
+
   return f;
 }
 

=== modified file 'src/frame.h'
--- a/src/frame.h       2013-09-20 15:34:36 +0000
+++ b/src/frame.h       2013-09-23 09:50:47 +0000
@@ -925,6 +925,7 @@
 #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 @@
 /* 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 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.  */

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2013-09-22 09:31:55 +0000
+++ b/src/lisp.h        2013-09-23 09:50:47 +0000
@@ -3359,7 +3359,6 @@
      && (defined __FreeBSD__ || defined GNU_LINUX || defined __MINGW32__))
 _Noreturn void __executable_start (void);
 #endif
-extern Lisp_Object selected_frame;
 extern Lisp_Object Vwindow_system;
 extern Lisp_Object sit_for (Lisp_Object, bool, int);
 extern void init_display (void);

=== modified file 'src/msdos.c'
--- a/src/msdos.c       2013-09-13 15:03:51 +0000
+++ b/src/msdos.c       2013-09-23 09:50:47 +0000
@@ -408,7 +408,7 @@
 
 static unsigned short outside_cursor;
 
-/* Similar to the_only_frame.  */
+/* The only display since MS-DOS does not support multiple ones.  */
 struct tty_display_info the_only_display_info;
 
 /* Support for DOS/V (allows Japanese characters to be displayed on

=== modified file 'src/window.c'
--- a/src/window.c      2013-09-20 15:34:36 +0000
+++ b/src/window.c      2013-09-23 09:50:47 +0000
@@ -6505,7 +6505,6 @@
   Vterminal_frame = selected_frame;
   minibuf_window = f->minibuffer_window;
   selected_window = f->selected_window;
-  last_nonminibuf_frame = f;
 
   window_initialized = 1;
 }


reply via email to

[Prev in Thread] Current Thread [Next in Thread]