texinfo update (Fri Nov 16 18:53:01 EST 2007)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.775
retrieving revision 1.776
diff -u -r1.775 -r1.776
--- ChangeLog   31 Oct 2007 17:10:48 -0000      1.775
+++ ChangeLog   16 Nov 2007 23:44:41 -0000      1.776
@@ -1,3 +1,10 @@
+2007-11-16  Karl Berry  <address@hidden>
+
+       * info/info.c (info_error): use puts instead of fprintf if we
+       don't actually have any arguments.  Else
+       info --file=".%x.%x." will try to print NULL.
+       Report from Cody Rester, 16 Nov 2007 08:59:48.
+
 2007-10-31  Karl Berry  <address@hidden>
 
        * doc/txi-no.tex: rename to txi-nb.tex.
Index: info/info.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/info.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- info/info.c 21 Sep 2007 22:49:26 -0000      1.21
+++ info/info.c 16 Nov 2007 23:44:41 -0000      1.22
@@ -1,5 +1,5 @@
 /* info.c -- Display nodes of Info files in multiple windows.
-   $Id: info.c,v 1.21 2007/09/21 22:49:26 karl Exp $
+   $Id: info.c,v 1.22 2007/11/16 23:44:41 karl Exp $
 
    Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
    2004, 2005, 2007 Free Software Foundation, Inc.
@@ -568,7 +568,12 @@
   if (!info_windows_initialized_p || display_inhibited)
     {
       fprintf (stderr, "%s: ", program_name);
-      fprintf (stderr, format, arg1, arg2);
+      if (arg1)
+        fprintf (stderr, format, arg1, arg2);
+      else
+        /* If we're passed a string, just print it.  Otherwise a % in a
+           filename gets treated as a format specifier.  */
+        fputs (format, stderr);
       fprintf (stderr, "\n");
       fflush (stderr);
     }
@@ -582,9 +587,7 @@
         }
       else
         {
-          NODE *temp;
-
-          temp = build_message_node (format, arg1, arg2);
+          NODE *temp = build_message_node (format, arg1, arg2);
           if (info_error_rings_bell_p)
             terminal_ring_bell ();
           inform_in_echo_area (temp->contents);
P ChangeLog
P info/info.c