Merge from emacs--devo--0

[gnu-emacs] / src / window.c

diff --git a/src/window.c b/src/window.c
index efdf309121bf50fc333726a40dc5708d69426940..2fd4d286eba64334cfe8e595f63af2133589f01d 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -3790,7 +3790,7 @@ displayed.  */)
        window = call1 (Vsplit_window_preferred_function, window);
       else
        {
-         Lisp_Object upper, lower, other;
+         Lisp_Object upper, other;
 
          window = Fget_lru_window (frames, Qt);
          /* If the LRU window is tall enough, and either eligible for
@@ -3829,11 +3829,11 @@ displayed.  */)
            window = Fframe_selected_window (call0 (Vpop_up_frame_function));
          /* If window appears above or below another,
             even out their heights.  */
-         other = upper = lower = Qnil;
+         other = upper = Qnil;
          if (!NILP (XWINDOW (window)->prev))
-           other = upper = XWINDOW (window)->prev, lower = window;
+           other = upper = XWINDOW (window)->prev;
          if (!NILP (XWINDOW (window)->next))
-           other = lower = XWINDOW (window)->next, upper = window;
+           other = XWINDOW (window)->next, upper = window;
          if (!NILP (other)
              && !NILP (Veven_window_heights)
              /* Check that OTHER and WINDOW are vertically arrayed.  */