[5986] don\t display line continuation character on very last line

[Gavin D. Smith]

Revision: 5986
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5986
Author:   gavin
Date:     2014-12-25 16:37:09 +0000 (Thu, 25 Dec 2014)
Log Message:
-----------
don\t display line continuation character on very last line

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/display.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-12-24 17:34:06 UTC (rev 5985)
+++ trunk/ChangeLog     2014-12-25 16:37:09 UTC (rev 5986)
@@ -1,3 +1,10 @@
+2014-12-25  Gavin Smith  <address@hidden>
+
+       * info/display.c (display_update_window_1): Don't display a line 
+       continuation character on the last line of the display.  Check 
+       was formerly done in process_node_text.  Report from Eli 
+       Zaretskii.
+
 2014-12-19  Gavin Smith  <address@hidden>
 
        * tp/Texinfo/Convert/HTML.pm: Set CSS styles for @indentedblock, 

Modified: trunk/info/display.c
===================================================================
--- trunk/info/display.c        2014-12-24 17:34:06 UTC (rev 5985)
+++ trunk/info/display.c        2014-12-25 16:37:09 UTC (rev 5986)
@@ -371,10 +371,13 @@
               the_display[win->first_row + pl_num]->inverse = 1;
             }
 
-          /* Check if a line continuation character should be displayed. */
-          if (!delim)
+          /* Check if a line continuation character should be displayed.
+             Don't print one if printing the last character in this window 
+             could possibly cause the screen to scroll. */
+          if (!delim && 1 + pl_num + win->first_row < the_screen->height)
             {
               terminal_goto_xy (win->width - 1, win->first_row + pl_num);
+
               if (!(win->flags & W_NoWrap))
                 terminal_put_text ("\\");
               else