texinfo update (Wed Jan 2 18:23:01 EST 2008)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.795
retrieving revision 1.796
diff -u -r1.795 -r1.796
--- ChangeLog   2 Jan 2008 17:46:55 -0000       1.795
+++ ChangeLog   2 Jan 2008 22:57:55 -0000       1.796
@@ -1,4 +1,9 @@
-2008-01-03  Karl Berry  <address@hidden>
+2008-01-02  Karl Berry  <address@hidden>
+
+       * info/info.c (info_short_help) [__MSDOS__]: puts -b string directly.
+       Suggestion from Benno.
+
+2008-01-02  Karl Berry  <address@hidden>
 
        * util/Makefile.am (TESTS): remove dvipdf.test, it is too
        dependent on functional TeX installations.  Not our place to test that.
@@ -136,7 +141,7 @@
        *  info/indices.c (info_next_index_match): use the line number
        specified in the index entry, if available.
 
-2007-11-23  Benno Schulenberg <address@hidden>
+2007-11-23  Benno Schulenberg <address@hidden>  (tiny change)
 
        * info/infodoc.c: keep help strings together for translation.
 
Index: info/info.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/info.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- info/info.c 2 Jan 2008 00:54:29 -0000       1.25
+++ info/info.c 2 Jan 2008 22:57:55 -0000       1.26
@@ -1,5 +1,5 @@
 /* info.c -- Display nodes of Info files in multiple windows.
-   $Id: info.c,v 1.25 2008/01/02 00:54:29 karl Exp $
+   $Id: info.c,v 1.26 2008/01/02 22:57:55 karl Exp $
 
    Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
    2004, 2005, 2007, 2008 Free Software Foundation, Inc.
@@ -588,13 +588,6 @@
 static void
 info_short_help (void)
 {
-#ifdef __MSDOS__
-  static const char speech_friendly_string[] = N_("\
-  -b, --speech-friendly        be friendly to speech synthesizers.\n");
-#else
-  static const char speech_friendly_string[] = "";
-#endif
-
   printf (_("\
 Usage: %s [OPTION]... [MENU-ITEM...]\n\
 \n\
@@ -620,7 +613,10 @@
       --restore=FILENAME       read initial keystrokes from FILENAME.\n\
   -O, --show-options, --usage  go to command-line options node."));
 
-  printf ("%s", speech_friendly_string);
+#ifdef __MSDOS__
+  puts (_("\
+  -b, --speech-friendly        be friendly to speech synthesizers."));
+#endif
 
   puts (_("\
       --subnodes               recursively output menu items.\n\
P ChangeLog
P info/info.c