[6799] resort to (info-stnd)

[Gavin D. Smith]

Revision: 6799
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6799
Author:   gavin
Date:     2015-11-22 16:22:38 +0000 (Sun, 22 Nov 2015)
Log Message:
-----------
resort to (info-stnd)

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-11-22 14:40:25 UTC (rev 6798)
+++ trunk/ChangeLog     2015-11-22 16:22:38 UTC (rev 6799)
@@ -1,5 +1,11 @@
 2015-11-22  Gavin Smith  <address@hidden>
 
+       * info/infodoc.c (info_get_info_help_node): Resort to 
+       "(info-stnd)" if "(info)" isn't found.  Look for "(info)" 
+       instead of "(Info)".
+
+2015-11-22  Gavin Smith  <address@hidden>
+
        * doc/texinfo.tex (\onepageout): Use \thischapterheading for 
        \thischapter but sometimes blank, and don't change \thischapter.
        This means that @everyheading @thischapter @| @| does what it 

Modified: trunk/info/infodoc.c
===================================================================
--- trunk/info/infodoc.c        2015-11-22 14:40:25 UTC (rev 6798)
+++ trunk/info/infodoc.c        2015-11-22 16:22:38 UTC (rev 6799)
@@ -388,14 +388,19 @@
     nodename = "Help";
 
   /* Try to get the info file for Info. */
-  node = info_get_node ("Info", nodename);
+  node = info_get_node ("info", nodename);
 
+  /* info.info is distributed with Emacs, not Texinfo, so fall back to 
+     info-stnd.info if it isn't there. */
   if (!node)
+    node = info_get_node ("info-stnd", "Top");
+
+  if (!node)
     {
       if (info_recent_file_error)
         info_error ("%s", info_recent_file_error);
       else
-        info_error (msg_cant_file_node, "Info", nodename);
+        info_error (msg_cant_file_node, "info", nodename);
         
       return;
     }