[7851] info_get_node_with_defaults remove man page fall back

[gavinsmith0123]

Revision: 7851
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7851
Author:   gavin
Date:     2017-06-25 10:32:12 -0400 (Sun, 25 Jun 2017)
Log Message:
-----------
info_get_node_with_defaults remove man page fall back

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2017-06-25 14:04:46 UTC (rev 7850)
+++ trunk/ChangeLog     2017-06-25 14:32:12 UTC (rev 7851)
@@ -1,7 +1,19 @@
 2017-06-25  Gavin Smith  <address@hidden>
 
+       * info/nodes.c (info_get_node_with_defaults): Remove code that
+       fell back to a man page.  This got in the way of the code in
+       info_get_info_help_node that fell back to info-stnd.info if 
+       info.info couldn't be loaded.  Also, this code is called from 
+       many places where falling back to a man page would definitely 
+       not be what was wanted, so removing the manpage fallback option 
+       makes the program more robust and easy to understand.
+       * NEWS: Mention info will not try to fall back to a man page if
+       it failed to follow a cross-reference.
+
+2017-06-25  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Convert/Plaintext.pm (_convert) <def commands>:
-       Change "@tie{ }" to "@tie{} in document strings passed to gdt.
+       Change "@tie{ }" to "@tie{}" in document strings passed to gdt.
        * tp/Texinfo/Parser.pm (_parse_texi) <closing a brace command>:
        Don't check if we are being called from gdt and the closed 
        command was @tie.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS  2017-06-25 14:04:46 UTC (rev 7850)
+++ trunk/NEWS  2017-06-25 14:32:12 UTC (rev 7851)
@@ -10,7 +10,13 @@
   are permitted in any medium without royalty provided the copyright
   notice and this notice are preserved.
 
--------------------------------------------------------------------------------
+------------------------------------------------------------------------------
+
+* info:
+  . do not fall back to a man page if following a cross-reference in an
+    info file failed
+
+
 6.4 (23 June 2017)
 * texi2any:
   . for HTML output, place section names before the manual in page

Modified: trunk/info/nodes.c
===================================================================
--- trunk/info/nodes.c  2017-06-25 14:04:46 UTC (rev 7850)
+++ trunk/info/nodes.c  2017-06-25 14:32:12 UTC (rev 7851)
@@ -996,18 +996,6 @@
       node = info_get_node_of_file_buffer (file_buffer, nodename);
     }
 
-  if (!file_buffer)
-    {
-      /* Try to find a man page with this name as a fall back. */
-      node = get_manpage_node (filename);
-      if (!node)
-        {
-          if (filesys_error_number)
-            info_recent_file_error =
-              filesys_error_string (filename, filesys_error_number);
-        }
-    }
-
   /* If the node not found was "Top", try again with different case. */
   if (!node && (nodename && mbscasecmp (nodename, "Top") == 0))
     {