More fixes for w32 console build

* src/w32term.c (w32_read_socket): Don't use FRAME_OBSCURED_P,
which was removed.
* src/frame.h (struct frame): Move !HAVE_NTGUI to its original
place.
* src/treesit.c (treesit_load_language): Shut up GCC warning.

(cherry picked from commit 4cb7f3935e2b600d23ae78bde2ce54a8a320e08b)

diff --git a/src/frame.h b/src/frame.h
index bf0a4169f212632f2381723fd68ce0a1f82b7935..bc8c349863458751d10b4dd0fd8271664774f883 100644 (file)
--- a/src/frame.h
+++ b/src/frame.h
@@ -450,7 +450,6 @@ struct frame
   bool_bf no_accept_focus : 1;
 
 #ifdef HAVE_WINDOW_SYSTEM
-# ifndef HAVE_NTGUI
   /* True if this frame is a tooltip frame.  */
   bool_bf tooltip : 1;
 
@@ -464,7 +463,7 @@ struct frame
   /* Nonzero if we should actually display horizontal scroll bars on this frame.  */
   bool_bf horizontal_scroll_bars : 1;
 
-
+# ifndef HAVE_NTGUI
   /* True if this is an override_redirect frame.  */
   bool_bf override_redirect : 1;
 #endif

diff --git a/src/treesit.c b/src/treesit.c
index 28c94f307c071c7d4c4235bcfc86c3651ee08c9d..b40df71a94ccfb1cfce3a44bd4541f254757344d 100644 (file)
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -651,7 +651,7 @@ treesit_load_language (Lisp_Object language_symbol,
 
   /* Override the library name and C name, if appropriate.  */
   Lisp_Object override_name;
-  Lisp_Object override_c_name;
+  Lisp_Object override_c_name UNINIT;
   bool found_override = treesit_find_override_name (language_symbol,
                                                    &override_name,
                                                    &override_c_name);

diff --git a/src/w32term.c b/src/w32term.c
index e18f39dd2a8bd53ffeb335925c85727279c05a20..aceb721f92bda9fd9818ad0b9436f5750bc19669 100644 (file)
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -6405,14 +6405,13 @@ w32_read_socket (struct terminal *terminal,
        if (FRAME_TOOLTIP_P (f))
          continue;
 
-       /* Check "visible" frames and mark each as obscured or not.
+       /* Check "visible" frames and mark each as visible or not.
           Note that visible is nonzero for unobscured and obscured
           frames, but zero for hidden and iconified frames.  */
        if (FRAME_W32_P (f) && FRAME_VISIBLE_P (f))
          {
            RECT clipbox;
            HDC  hdc;
-           bool obscured;
 
            enter_crit ();
            /* Query clipping rectangle for the entire window area
@@ -6426,29 +6425,11 @@ w32_read_socket (struct terminal *terminal,
            ReleaseDC (FRAME_W32_WINDOW (f), hdc);
            leave_crit ();
 
-           obscured = FRAME_OBSCURED_P (f);
-
-           if (clipbox.right == clipbox.left || clipbox.bottom == clipbox.top)
-             {
-               /* Frame has become completely obscured so mark as such (we
-                  do this by setting visible to 2 so that FRAME_VISIBLE_P
-                  is still true, but redisplay will skip it).  */
-               SET_FRAME_VISIBLE (f, 2);
-
-               if (!obscured)
-                 DebPrint (("frame %p (%s) obscured\n", f, SDATA (f->name)));
-             }
-           else
+           if (!(clipbox.right == clipbox.left
+                 || clipbox.bottom == clipbox.top))
              {
                /* Frame is not obscured, so mark it as such.  */
                SET_FRAME_VISIBLE (f, 1);
-
-               if (obscured)
-                 {
-                   SET_FRAME_GARBAGED (f);
-                   DebPrint (("obscured frame %p (%s) found to be visible\n",
-                              f, SDATA (f->name)));
-                 }
              }
          }
       }