[7786] up-line and down-line not confined to a single node

[gavinsmith0123]

Revision: 7786
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7786
Author:   gavin
Date:     2017-05-14 16:40:44 -0400 (Sun, 14 May 2017)
Log Message:
-----------
up-line and down-line not confined to a single node

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/NEWS
    trunk/info/session.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2017-05-14 19:16:12 UTC (rev 7785)
+++ trunk/ChangeLog     2017-05-14 20:40:44 UTC (rev 7786)
@@ -1,5 +1,21 @@
 2017-05-14  Gavin Smith  <address@hidden>
 
+       * info/session.c (point_backwards_word): Remove unused variable.
+
+2017-05-14  Gavin Smith  <address@hidden>
+
+       * info/session.c (info_down_line, info_up_line): Call
+       _scroll_backward and _scroll_forward with argument so that it
+       possible for scrolling to change node, depending on the value
+       of 'scroll-behaviour'.
+       (mouse_event_handler): Call _scroll_backward and _scroll_forward
+       instead of info_down_line, info_up_line so that mouse scrollwheel
+       scrolling continues to be confined to an single node.
+       * NEWS: Mention that 'down-line' and 'up-line' are affected by
+       the value of 'scroll-behaviour'.
+
+2017-05-14  Gavin Smith  <address@hidden>
+
        * doc/info-stnd.texi (infokey format): Add missing documentation 
        for 'C-x p' for 'prev-node' under --vi-keys.  Correct bindings
        of 'g' and 'G' to 'first-node' and 'last-node' respectively.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS  2017-05-14 19:16:12 UTC (rev 7785)
+++ trunk/NEWS  2017-05-14 20:40:44 UTC (rev 7786)
@@ -27,6 +27,9 @@
     documented)
 
 * info:
+  . the `up-line' and `down-line' commands now are like the other
+    scrolling commands and are no longer confined to a single node
+    (depending on the value of `scroll-behaviour')
   . supplying the --all option with --index-search displays a list
     of matching index entries
   . display bug fixed where color could be turned off prematurely

Modified: trunk/info/session.c
===================================================================
--- trunk/info/session.c        2017-05-14 19:16:12 UTC (rev 7785)
+++ trunk/info/session.c        2017-05-14 20:40:44 UTC (rev 7786)
@@ -546,6 +546,9 @@
 
 static int get_input_key_internal (void);
 
+static void _scroll_forward (WINDOW *window, int count, int nodeonly);
+static void _scroll_backward (WINDOW *window, int count, int nodeonly);
+
 /* Whether to process or skip mouse events in the input stream. */
 unsigned char mouse_cb, mouse_cx, mouse_cy;
 
@@ -557,16 +560,13 @@
 {
   if (mouse_cb & 0x40)
     {
-      void info_up_line (WINDOW *, int count);
-      void info_down_line (WINDOW *, int count);
-
       switch (mouse_cb & 0x03)
         {
         case 0: /* Mouse button 4 (scroll up). */
-          info_up_line (active_window, 3);
+          _scroll_backward (active_window, 3, 1);
           break;
         case 1: /* Mouse button 5 (scroll down). */
-          info_down_line (active_window, 3);
+          _scroll_forward (active_window, 3, 1);
           break;
         }
     }
@@ -1218,8 +1218,6 @@
 static void
 point_backward_word (WINDOW *win)
 {
-  int col;
-
   /* Skip any white space before current cursor position. */
   while (point_backward_char (win))
     {
@@ -1623,13 +1621,13 @@
 /* Scroll the window forward by N lines.  */
 DECLARE_INFO_COMMAND (info_down_line, _("Scroll down by lines"))
 {
-  _scroll_forward (window, count, 1);
+  _scroll_forward (window, count, 0);
 }
 
 /* Scroll the window backward by N lines.  */
 DECLARE_INFO_COMMAND (info_up_line, _("Scroll up by lines"))
 {
-  _scroll_backward (window, count, 1);
+  _scroll_backward (window, count, 0);
 }
 
 /* Lines to scroll when using commands that scroll by half screen size