[5777] small doc fixes, no error messages for in-node scrolling

[Gavin D. Smith]

Revision: 5777
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5777
Author:   gavin
Date:     2014-08-24 19:24:57 +0000 (Sun, 24 Aug 2014)
Log Message:
-----------
small doc fixes, no error messages for in-node scrolling

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/info-stnd.texi
    trunk/doc/texinfo.texi
    trunk/info/session.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-08-23 16:16:39 UTC (rev 5776)
+++ trunk/ChangeLog     2014-08-24 19:24:57 UTC (rev 5777)
@@ -1,3 +1,13 @@
+2014-08-24  Gavin Smith  <address@hidden>
+
+       * info/session.c (_scroll_forward, _scroll_backward): Arguments
+       changed.  All callers updated.  Don't display an error message when
+       staying in the same node.
+       * doc/info-stnd.texi (Variables): Mention what mouse is used for.
+       (Node Commands) <goto-invocation>: Add missing closing parenthesis
+       and 'vi-like operation' text.
+       * doc/texinfo.texi (Overview): Remove two extra words.
+
 2014-08-23  Gavin Smith  <address@hidden>
 
        * info/variables.c (info_variables): New user variable 'mouse'.

Modified: trunk/doc/info-stnd.texi
===================================================================
--- trunk/doc/info-stnd.texi    2014-08-23 16:16:39 UTC (rev 5776)
+++ trunk/doc/info-stnd.texi    2014-08-24 19:24:57 UTC (rev 5777)
@@ -1028,10 +1028,10 @@
 finds the node @samp{Buffers} in the Info file @file{emacs}.
 
 @anchor{goto-invocation}
address@hidden @kbd{O} (@code{goto-invocation}
address@hidden @kbd{O} (@code{goto-invocation})
 @itemx @kbd{I}
 @kindex O
address@hidden I
address@hidden I, vi-like operation
 @findex goto-invocation
 @cindex finding the Invocation node
 Read the name of a program and look for a node in the current Info file
@@ -2181,8 +2181,9 @@
 @vindex mouse
 What method to use to get input from a mouse device.  The default value is
 @code{normal-tracking}, which makes Info use ``normal tracking mode'' if
-it detects that the terminal supports it.  If the value is @code{Off},
-mouse tracking is disabled.
+it detects that the terminal supports it.  This enables you to scroll the
+contents of the active window with a mouse scrollwheel.  Set this variable
+to @code{Off} to disable the use of a mouse.
 
 @anchor{scroll-behavior}
 @item scroll-behavior

Modified: trunk/doc/texinfo.texi
===================================================================
--- trunk/doc/texinfo.texi      2014-08-23 16:16:39 UTC (rev 5776)
+++ trunk/doc/texinfo.texi      2014-08-24 19:24:57 UTC (rev 5777)
@@ -796,7 +796,7 @@
 lowercase.
 
 Manuals for most GNU packages are written in Texinfo, and available
-online at @url{http://www.gnu.org/doc}.  The Texinfo
+online at @url{http://www.gnu.org/doc}.
 
 @menu
 * Reporting Bugs::              Submitting effective bug reports.

Modified: trunk/info/session.c
===================================================================
--- trunk/info/session.c        2014-08-23 16:16:39 UTC (rev 5776)
+++ trunk/info/session.c        2014-08-24 19:24:57 UTC (rev 5777)
@@ -1315,43 +1315,49 @@
   "Continuous", "Next Only", "Page Only", NULL
 };
 
-static void _scroll_forward (WINDOW *window, int count, int behaviour);
-static void _scroll_backward (WINDOW *window, int count, int behaviour);
+static void _scroll_forward (WINDOW *window, int count, int nodeonly);
+static void _scroll_backward (WINDOW *window, int count, int nodeonly);
 
 static void
-_scroll_forward (WINDOW *window, int count, int behaviour)
+_scroll_forward (WINDOW *window, int count, int nodeonly)
 {
   if (count < 0)
-    _scroll_backward (window, -count, behaviour);
+    _scroll_backward (window, -count, nodeonly);
   else
     {
-      /* If there are no more lines to scroll here, error, or get
-         another node, depending on BEHAVIOUR. */
       if (window->pagetop >= window->line_count - window->height)
         {
-          forward_move_node_structure (window, behaviour);
+          if (!nodeonly)
+            {
+              /* If there are no more lines to scroll here, error, or get
+                 another node. */
+              forward_move_node_structure (window, info_scroll_behaviour);
+            }
           return;
         }
-
       set_window_pagetop (window, window->pagetop + count);
     }
 }
 
 static void
-_scroll_backward (WINDOW *window, int count, int behaviour)
+_scroll_backward (WINDOW *window, int count, int nodeonly)
 {
   if (count < 0)
-    _scroll_backward (window, -count, behaviour);
+    _scroll_backward (window, -count, nodeonly);
   else
     {
       int desired_top;
 
-      /* If there are no more lines to scroll here, error, or get
-         another node, depending on BEHAVIOUR. */
       if (window->pagetop <= 0)
         {
-          if (backward_move_node_structure (window, behaviour) == 0)
-            info_end_of_node (window, 1, 0);
+          if (!nodeonly)
+            {
+              /* If there are no more lines to scroll here, error, or get
+                 another node. */
+              if (backward_move_node_structure (window, info_scroll_behaviour)
+                  == 0)
+                info_end_of_node (window, 1, 0);
+            }
           return;
         }
 
@@ -1376,7 +1382,7 @@
     lines = default_window_size * count;
   else
     lines = (window->height - 2) * count;
-  _scroll_forward (window, lines, info_scroll_behaviour);
+  _scroll_forward (window, lines, 0);
 }
 
 /* Show the previous screen of WINDOW's node. */
@@ -1419,7 +1425,7 @@
     lines = default_window_size * count;
   else
     lines = (window->height - 2) * count;
-  _scroll_forward (window, lines, IS_PageOnly);
+  _scroll_forward (window, lines, 1);
 }
 
 /* Show the previous screen of WINDOW's node but never move to previous
@@ -1453,7 +1459,7 @@
   else
     lines = (window->height - 2) * count;
 
-  _scroll_forward (window, lines, IS_PageOnly);
+  _scroll_forward (window, lines, 1);
 }
 
 /* Like info_scroll_backward_page_only, but sets default_window_size as a side
@@ -1467,13 +1473,13 @@
 /* Scroll the window forward by N lines.  */
 DECLARE_INFO_COMMAND (info_down_line, _("Scroll down by lines"))
 {
-  _scroll_forward (window, count, IS_PageOnly);
+  _scroll_forward (window, count, 1);
 }
 
 /* Scroll the window backward by N lines.  */
 DECLARE_INFO_COMMAND (info_up_line, _("Scroll up by lines"))
 {
-  _scroll_backward (window, count, IS_PageOnly);
+  _scroll_backward (window, count, 1);
 }
 
 /* Lines to scroll when using commands that scroll by half screen size
@@ -1504,7 +1510,7 @@
   else
     lines = (window->height + 1) / 2 * count;
 
-  _scroll_forward (window, lines, IS_PageOnly);
+  _scroll_forward (window, lines, 1);
 }
 
 /* Scroll the window backward by N lines and remember N as default for
@@ -1928,7 +1934,8 @@
 int scroll_last_node = SLN_Stop;
 
 /* Move to 1st menu item, Next, Up/Next, or error in this window. Return
-   non-zero on error, 0 on success. */
+   non-zero on error, 0 on success.  Display an error message if there is an
+   error. */
 static int
 forward_move_node_structure (WINDOW *window, int behaviour)
 {