Merge unicode branch

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1037

1 files changed, 4 insertions, 4 deletions

diff --git a/src/window.c b/src/window.c
index 5b0d8f4375a..d1e3225e198 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3822,7 +3822,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
@@ -3861,11 +3861,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.  */