[5861] no error message for missing infokey file

[Gavin D. Smith]

Revision: 5861
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5861
Author:   gavin
Date:     2014-10-06 13:28:03 +0000 (Mon, 06 Oct 2014)
Log Message:
-----------
no error message for missing infokey file

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-10-06 13:17:14 UTC (rev 5860)
+++ trunk/ChangeLog     2014-10-06 13:28:03 UTC (rev 5861)
@@ -2,6 +2,9 @@
 
        * info/man.c: Don't include sys/ioctl.h.
 
+       * info/infomap.c (fetch_user_maps): Don't print an error message 
+       if ".infokey" wasn't found.  Report from Karl Berry.
+
 2014-10-06  Ken Brown  <address@hidden> (tiny change)
 
        * system.h [O_BINARY && !__MSDOS__]: Don't redefine setmode if 

Modified: trunk/info/infomap.c
===================================================================
--- trunk/info/infomap.c        2014-10-06 13:17:14 UTC (rev 5860)
+++ trunk/info/infomap.c        2014-10-06 13:28:03 UTC (rev 5861)
@@ -567,7 +567,7 @@
 static int sup_info, sup_ea;
 
 /* Fetch the contents of the init file at INIT_FILE, or the standard
-   infokey file "$HOME/.info".  Return non-zero on success. */
+   infokey file "$HOME/.infokey".  Return non-zero on success. */
 static int
 fetch_user_maps (char *init_file)
 {
@@ -596,11 +596,7 @@
   inf = fopen (filename, "r");
   if (!inf)
     {
-      if (errno)
-        info_error (_("cannot open input file '%s' - %s"),
-            filename, strerror (errno));
-      else
-        info_error (_("cannot open input file '%s'"), filename);
+      free (filename);
       return 0;
     }