Remove some unused items introduced during pixelwise change.

* window.c (window_resize_total_check): Remove unused function.
* xdisp.c (remember_mouse_glyph): Remove unused label.
(Ftool_bar_height): Move declaration inside #if.
* xterm.c (x_set_window_size): Don't use r and c.

1 files changed, 0 insertions, 96 deletions

diff --git a/src/window.c b/src/window.c
index bf914662df7..e62fdad6827 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3784,102 +3784,6 @@ window_resize_check (struct window *w, bool horflag)
                                     : FRAME_LINE_HEIGHT (f)));
 }
 
-static int
-window_resize_total_check (struct window *w, int horflag)
-{
-  struct frame *f = XFRAME (w->frame);
-  struct window *c;
-
-  if (WINDOW_VERTICAL_COMBINATION_P (w))
-    /* W is a vertical combination.  */
-    {
-      c = XWINDOW (w->contents);
-      if (horflag)
-        /* All child windows of W must have the same width as W.  */
-        {
-          while (c)
-            {
-              if (XINT (c->new_pixel) != XINT (w->new_pixel)
-/**               || XINT (c->new_total != XINT (w->new_total)) **/
-                  || !window_resize_check (c, horflag))
-                return 0;
-
-              c = NILP (c->next) ? 0 : XWINDOW (c->next);
-            }
-
-          return 1;
-        }
-      else
-        /* The sum of the heights of the child windows of W must equal
-           W's height.  */
-        {
-          int sum_of_pixels = 0, sum_of_totals = 0;
-
-          while (c)
-            {
-              if (!window_resize_check (c, horflag))
-                return 0;
-
-              sum_of_pixels = sum_of_pixels + XINT (c->new_pixel);
-/**           sum_of_totals = sum_of_totals + XINT (c->new_total); **/
-              c = NILP (c->next) ? 0 : XWINDOW (c->next);
-            }
-
-          return (sum_of_pixels == XINT (w->new_pixel)
-/**               && sum_of_totals == XINT (w->new_total) **/
-                  );
-        }
-    }
-  else if (WINDOW_HORIZONTAL_COMBINATION_P (w))
-    /* W is a horizontal combination.  */
-    {
-      c = XWINDOW (w->contents);
-      if (horflag)
-        /* The sum of the widths of the child windows of W must equal W's
-           width.  */
-        {
-          int sum_of_pixels = 0, sum_of_totals = 0;
-
-          while (c)
-            {
-              if (!window_resize_check (c, horflag))
-                return 0;
-
-              sum_of_pixels = sum_of_pixels + XINT (c->new_pixel);
-              sum_of_totals = sum_of_totals + XINT (c->new_total);
-              c = NILP (c->next) ? 0 : XWINDOW (c->next);
-            }
-
-          return (sum_of_pixels == XINT (w->new_pixel)
-/**               && sum_of_totals == XINT (w->new_total) **/
-                  );
-        }
-      else
-        /* All child windows of W must have the same height as W.  */
-        {
-          while (c)
-            {
-              if (XINT (c->new_pixel) != XINT (w->new_pixel)
-/**               || XINT (c->new_total) != XINT (w->new_total) **/
-                  || !window_resize_check (c, horflag))
-                return 0;
-
-              c = NILP (c->next) ? 0 : XWINDOW (c->next);
-            }
-
-          return 1;
-        }
-    }
-  else
-    /* A leaf window.  Make sure it's not too small.  The following
-       hardcodes the values of `window-safe-min-width' (2) and
-       `window-safe-min-height' (1) which are defined in window.el.  */
-    return (XINT (w->new_pixel) >= (horflag
-                                    ? (2 * FRAME_COLUMN_WIDTH (f))
-                                    : FRAME_LINE_HEIGHT (f))
-/**         && XINT (w->new_total) >= (horflag ? 2 : 1) **/
-            );
-}
 
 /* Set w->pixel_height (w->pixel_height if HORIZONTAL is non-zero) to
    w->new_pixel for window W and recursively all child windows of W.