texinfo ChangeLog info/display.c info/terminal.c

[Sergey Poznyakoff]

CVSROOT:        /cvsroot/texinfo
Module name:    texinfo
Changes by:     Sergey Poznyakoff <gray>        12/12/01 15:15:44

Modified files:
        .              : ChangeLog 
        info           : display.c terminal.c 

Log message:
        Fix bug #37822 (incomplete redraw of screen).
        
        * info/display.c (display_scroll_display): Fix a "fencepost"
        error when scrolling down.
        * info/terminal.c: Improve conditional.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1467&r2=1.1468
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/display.c?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/terminal.c?cvsroot=texinfo&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1467
retrieving revision 1.1468
diff -u -b -r1.1467 -r1.1468
--- ChangeLog   30 Nov 2012 23:58:18 -0000      1.1467
+++ ChangeLog   1 Dec 2012 15:15:44 -0000       1.1468
@@ -1,5 +1,13 @@
 2012-12-01  Sergey Poznyakoff  <address@hidden>
 
+       Fix bug #37822 (incomplete redraw of screen).
+
+       * info/display.c (display_scroll_display): Fix a "fencepost"
+       error when scrolling down.
+       * info/terminal.c: Improve conditional.
+
+2012-12-01  Sergey Poznyakoff  <address@hidden>
+
        Fix cursor positioning after index searches (bug #37823).
 
        * info/window.h (WINDOW): Use size_t instead of int.

Index: info/display.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/info/display.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- info/display.c      30 Nov 2012 23:58:20 -0000      1.19
+++ info/display.c      1 Dec 2012 15:15:44 -0000       1.20
@@ -1,5 +1,5 @@
 /* display.c -- How to display Info windows.
-   $Id: display.c,v 1.19 2012/11/30 23:58:20 gray Exp $
+   $Id: display.c,v 1.20 2012/12/01 15:15:44 gray Exp $
 
    Copyright (C) 1993, 1997, 2003, 2004, 2006, 2007, 2008, 2012
    Free Software Foundation, Inc.
@@ -324,7 +324,7 @@
       last = end + amount;
 
       /* Shift the lines to scroll right into place. */
-      for (i = 0; i < (end - start); i++)
+      for (i = 1; i <= (end - start); i++)
         {
           temp = the_display[last - i];
           the_display[last - i] = the_display[end - i];
@@ -340,8 +340,7 @@
           the_display[i]->inverse = 0;
         }
     }
-
-  if (amount < 0)
+  else
     {
       last = start + amount;
       for (i = 0; i < (end - start); i++)

Index: info/terminal.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/info/terminal.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- info/terminal.c     26 Nov 2012 01:32:03 -0000      1.10
+++ info/terminal.c     1 Dec 2012 15:15:44 -0000       1.11
@@ -1,5 +1,5 @@
 /* terminal.c -- how to handle the physical terminal for Info.
-   $Id: terminal.c,v 1.10 2012/11/26 01:32:03 karl Exp $
+   $Id: terminal.c,v 1.11 2012/12/01 15:15:44 gray Exp $
 
    Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1996, 1997, 1998,
    1999, 2001, 2002, 2004, 2007, 2008, 2012 Free Software Foundation, Inc.
@@ -412,26 +412,22 @@
 
   if (terminal_scroll_terminal_hook)
     (*terminal_scroll_terminal_hook) (start, end, amount);
-  else
+  else if (amount > 0)
     {
       /* If we are scrolling down, delete AMOUNT lines at END.  Then insert
          AMOUNT lines at START. */
-      if (amount > 0)
-        {
           terminal_delete_lines (end, amount);
           terminal_insert_lines (start, amount);
         }
-
+  else
+    {
       /* If we are scrolling up, delete AMOUNT lines before START.  This
          actually does the upwards scroll.  Then, insert AMOUNT lines
          after the already scrolled region (i.e., END - AMOUNT). */
-      if (amount < 0)
-        {
           int abs_amount = -amount;
           terminal_delete_lines (start - abs_amount, abs_amount);
           terminal_insert_lines (end - abs_amount, abs_amount);
         }
-    }
 }
 
 /* Re-initialize the terminal considering that the TERM/TERMCAP variable