texinfo update (Sun Feb 24 19:23:01 EST 2008)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.830
retrieving revision 1.831
diff -u -r1.830 -r1.831
--- ChangeLog   24 Feb 2008 23:52:56 -0000      1.830
+++ ChangeLog   25 Feb 2008 00:21:29 -0000      1.831
@@ -1,5 +1,11 @@
 2008-02-24  Karl Berry  <address@hidden>
 
+       * info/infomap.c (x): bind to delete_window.
+       * info/infodoc.c (info_internal_help_text): more rearrangements.
+       (create_internal_info_help_node: omit incorrect exiting suggestion
+               at end.
+       Suggestions from Benno Schulenberg, 24 Feb 2008 22:56:44.
+
        * install-info/install-info.c (munge_old_style_debian_options):
        avoid use of asprintf, just xmalloc ourselves.
        In report from Juan Manuel Guerrero, 24 Feb 2008 22:06:35.      
Index: NEWS
===================================================================
RCS file: /sources/texinfo/texinfo/NEWS,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- NEWS        19 Feb 2008 14:58:29 -0000      1.162
+++ NEWS        25 Feb 2008 00:21:29 -0000      1.163
@@ -1,4 +1,4 @@
-$Id: NEWS,v 1.162 2008/02/19 14:58:29 karl Exp $
+$Id: NEWS,v 1.163 2008/02/25 00:21:29 karl Exp $
 This NEWS file records noteworthy changes, very tersely.
 See the manual for detailed information.
 
@@ -53,6 +53,7 @@
   . the PageUp and PageDown keys move through the whole document by
     default, instead of just the current node.
   . the h command shows the basic help, and H starts the Info tutorial.
+  . the newly-bound x command deletes the current window, e.g., within help.
   . the scroll-step variable is set to 1 by default, for smooth scrolling.
   . the cursor-movement-scrolls-p variable is set to 1 by default, so
     link searches look through the whole document.
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/TODO,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- TODO        21 Feb 2008 19:08:24 -0000      1.43
+++ TODO        25 Feb 2008 00:21:29 -0000      1.44
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.43 2008/02/21 19:08:24 karl Exp $
+$Id: TODO,v 1.44 2008/02/25 00:21:29 karl Exp $
 This is the todo list for GNU Texinfo.
 If you are interested in working on any of these, email address@hidden
 
@@ -146,6 +146,8 @@
     
http://wiki.linuxfromscratch.org/patches/browser/trunk/texinfo/texinfo-4.8-multibyte-1.patch
     
   - The help message does not report Down/Up for next/prev-line.
+  - When scrolling through the help text, it should stop at the end, not
+    report "No more nodes" and go back to the beginning.
   - It would be nice for h in the help window to quit help.
   - It would be nice to be able to specify a preferred key to report in
     the help message, instead of using the last one set; cf. q vs. C-x C-c.
@@ -165,7 +167,6 @@
     Perhaps code from the pinfo viewer can be reused:
     http://zeus.polsl.gliwice.pl/~pborys/.
   - More sample .infokey files, so people can choose without writing their own.
-  - q within help should quit help like C-x 0.
   - Incorporate an X-based viewer, perhaps the old GNU xinfo widget
      (http://www.gnu.org/software/xinfo) or saxinfo
      or tkinfo (http://www.math.ucsb.edu/~boldt/tkinfo/).
Index: info/infodoc.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/infodoc.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- info/infodoc.c      21 Feb 2008 23:36:16 -0000      1.18
+++ info/infodoc.c      25 Feb 2008 00:21:29 -0000      1.19
@@ -1,5 +1,5 @@
 /* infodoc.c -- functions which build documentation nodes.
-   $Id: infodoc.c,v 1.18 2008/02/21 23:36:16 karl Exp $
+   $Id: infodoc.c,v 1.19 2008/02/25 00:21:29 karl Exp $
 
    Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2006,
    2007, 2008 Free Software Foundation, Inc.
@@ -42,26 +42,22 @@
 #if defined(INFOKEY)
 
 static char *info_internal_help_text[] = {
-  N_("Basic Commands in Info Windows\n\
+  N_("Basic Info command keys\n\
 ******************************\n"),
   "\n",
-  N_("\\%-10[quit-help]  Quit this help.\n"),
+  N_("\\%-10[quit-help]  Close this help window.\n"),
   N_("\\%-10[quit]  Quit Info altogether.\n"),
   N_("\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"),
   "\n",
-  N_("Selecting other nodes:\n\
-----------------------\n"),
-  N_("\\%-10[global-next-node]  Move to the next node in the document.\n"),
-  N_("\\%-10[global-prev-node]  Move to the previous node in the document.\n"),
-  N_("\\%-10[move-to-next-xref]  Skip to next hypertext link [*].\n"),
-  N_("\\%-10[select-reference-this-line]  Follow the hypertext link under 
cursor.\n"),
-  N_("\\%-10[up-node]  Move \"up\" from this node.\n"),
-  N_("\\%-10[history-node]  Move to the last node seen in this window.\n"),
-  N_("\\%-10[dir-node]  Move to the `directory' node.  Equivalent to 
`\\[goto-node] (DIR)'.\n"),
-  N_("\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] 
Top'.\n"),
+  N_("\\%-10[global-next-node]  Go to the next node in the document.\n"),
+  N_("\\%-10[global-prev-node]  Go to the previous node in the document.\n"),
+  N_("\\%-10[move-to-next-xref]  Skip to the next hypertext link.\n"),
+  N_("\\%-10[select-reference-this-line]  Follow the hypertext link under the 
cursor.\n"),
+  N_("\\%-10[history-node]  Go back to the last node seen in this window.\n"),
+  N_("\\%-10[up-node]  Go up one level.\n"),
+  N_("\\%-10[top-node]  Go to the top node of this document.\n"),
+  N_("\\%-10[dir-node]  Go to the main `directory' node.\n"),
   "\n",
-  N_("Moving within a node:\n\
----------------------\n"),
   N_("\\%-10[beginning-of-node]  Go to the beginning of this node.\n"),
   N_("\\%-10[end-of-node]  Go to the end of this node.\n"),
   N_("\\%-10[next-line]  Scroll forward one line.\n"),
@@ -69,8 +65,6 @@
   N_("\\%-10[scroll-forward-page-only]  Scroll forward within this node.\n"),
   N_("\\%-10[scroll-backward-page-only]  Scroll backward within this node.\n"),
   "\n",
-  N_("Other commands:\n\
----------------\n"),
   N_("\\%-10[search]  Search forward for a specified string\n\
               and select the node in which the next occurrence is found.\n"),
   N_("\\%-10[search-backward]  Search backward for a specified string\n\
@@ -371,10 +365,6 @@
       maybe_free (exec_keys);
 #endif /* NAMED_FUNCTIONS */
 
-      printf_to_message_buffer
-        ("%s", replace_in_documentation
-         ((char *) _("--- Use `\\[history-node]' or `\\[kill-node]' to exit 
---\n"), 0),
-         NULL, NULL);
       node = message_buffer_to_node ();
       internal_info_help_node_contents = node->contents;
     }
@@ -971,7 +961,7 @@
 
             /* If we have only one window (because the window size was too
                small to split it), we have to quit help by going back one
-               noew in the history list, not deleting the window.  */
+               node in the history list, not deleting the window.  */
               if (strcmp (rep_name, "quit-help") == 0)
                 fun_name = help_is_only_window_p ? "history-node"
                                                  : "delete-window";
Index: info/infomap.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/infomap.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- info/infomap.c      19 Feb 2008 14:58:29 -0000      1.15
+++ info/infomap.c      25 Feb 2008 00:21:30 -0000      1.16
@@ -1,5 +1,5 @@
 /* infomap.c -- keymaps for Info.
-   $Id: infomap.c,v 1.15 2008/02/19 14:58:29 karl Exp $
+   $Id: infomap.c,v 1.16 2008/02/25 00:21:30 karl Exp $
 
    Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008
    Free Software Foundation, Inc.
@@ -970,8 +970,9 @@
         CONTROL('x'), 't', NUL,         A_info_tile_windows,
         CONTROL('x'), 'w', NUL,         A_info_toggle_wrap,
 
-        /* We want help to report q, not C-x C-c.  */
+        /* We want help to report q, not C-x C-c, etc.  */
         'q', NUL,                       A_info_quit,
+        'x', NUL,                       A_info_delete_window,
 
 /*      Arrow key bindings for info keymaps.  It seems that some
         terminals do not match their termcap entries, so it's best to just
@@ -1263,8 +1264,9 @@
         CONTROL('x'), 'w', NUL,         A_info_toggle_wrap,
         CONTROL('x'), ',', NUL,         A_info_next_index_match,
 
-        /* We want help to report q, not C-x C-c.  */
+        /* We want help to report q, not C-x C-c, etc.  */
         'q', NUL,                       A_info_quit,
+        'x', NUL,                       A_info_delete_window,
 
 /*      Arrow key bindings for info keymaps.  It seems that some
         terminals do not match their termcap entries, so it's best to just
P ChangeLog
P NEWS
P TODO
P info/infodoc.c
P info/infomap.c