(try_window_reusing_current_matrix): Fix bug setting

the enabled_p flag of the glyph row at window_end_vpos to 0.
(handle_single_display_prop): Fix last change.

2 files changed, 9 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 6f3b4637ecc..4f622116ceb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-03  Gerd Moellmann  <gerd@gnu.org>
+
+        * xdisp.c (try_window_reusing_current_matrix): Fix bug setting
+        the enabled_p flag of the glyph row at window_end_vpos to 0.
+        (handle_single_display_prop): Fix last change.
+
 2001-01-02  Richard M. Stallman  <rms@caffeine.ai.mit.edu>
 
         * window.c (Frecenter): Doc fix.
diff --git a/src/xdisp.c b/src/xdisp.c
index 3a65bbf6175..482a704aee2 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2756,6 +2756,7 @@ handle_single_display_prop (it, prop, object, position)
       if (FRAME_TERMCAP_P (it->f)
           || FRAME_MSDOS_P (it->f)
           || FRAME_W32_CONSOLE_P (it->f))
+        return 0;
       
       value = XCAR (XCDR (prop));
       if (NUMBERP (value) && XFLOATINT (value) > 0)
@@ -2769,6 +2770,7 @@ handle_single_display_prop (it, prop, object, position)
       if (FRAME_TERMCAP_P (it->f)
           || FRAME_MSDOS_P (it->f)
           || FRAME_W32_CONSOLE_P (it->f))
+        return 0;
       
 #ifdef HAVE_WINDOW_SYSTEM
       value = XCAR (XCDR (prop));
@@ -10225,7 +10227,7 @@ try_window_reusing_current_matrix (w)
           
           /* Disable lines in the current matrix which are now
              below the window.  */
-          for (; row < bottom_row; ++row)
+          for (++row; row < bottom_row; ++row)
             row->enabled_p = 0;
         }