[5547] H to close help window; invocation fixes

[Gavin D. Smith]

Revision: 5547
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5547
Author:   gavin
Date:     2014-05-10 11:47:12 +0000 (Sat, 10 May 2014)
Log Message:
-----------
H to close help window; invocation fixes

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/TODO
    trunk/doc/info-stnd.texi
    trunk/info/info.c
    trunk/info/infodoc.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-05-09 20:47:01 UTC (rev 5546)
+++ trunk/ChangeLog     2014-05-10 11:47:12 UTC (rev 5547)
@@ -1,3 +1,11 @@
+2014-05-10  Gavin Smith  <address@hidden>
+
+       * info/info.c (get_initial_file): Special handling of "info -O info"
+       moved from add_initial_nodes.  Save node name found in dir.
+       * info/infodoc.c (replace_in_documentation): Show "H" to close
+       help window.
+       * doc/info-stnd.texi: Tweaks to Invocation.
+
 2014-05-09  Gavin Smith  <address@hidden>
 
        * doc/info-stnd.texi: Some text from documentation of --file

Modified: trunk/TODO
===================================================================
--- trunk/TODO  2014-05-09 20:47:01 UTC (rev 5546)
+++ trunk/TODO  2014-05-10 11:47:12 UTC (rev 5547)
@@ -19,10 +19,10 @@
     recommended categories.
     For background, see the thread (which discusses a lot of other
     issues too) at
-    http://mail.gnu.org/pipermail/emacs-devel/2002-10/msg00011.html,
+    http://lists.gnu.org/archive/html/emacs-devel/2002-10/msg00011.html
     especially 
-      http://mail.gnu.org/archive/html/emacs-devel/2002-10/msg00090.html
-      http://mail.gnu.org/archive/html/emacs-devel/2002-10/msg00137.html
+      http://lists.gnu.org/archive/html/emacs-devel/2002-10/msg00090.html
+      http://lists.gnu.org/archive/html/emacs-devel/2002-10/msg00137.html
   - Support installation of manuals in different languages, along these lines:
     . support a LINGUAS file or variable saying which subdirs LL in the
       source to descend into (under doc/).
@@ -129,7 +129,6 @@
   - 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.
   - Full-text search across all info files installed on the system.
@@ -151,7 +150,6 @@
   - 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/).
-  - Make "info foo bar" search for bar in foo's index(es) if no menu match.
   - Handle M-n, C-u m, and C-u g like Emacs Info (opening new windows).
 
 * install-info:

Modified: trunk/doc/info-stnd.texi
===================================================================
--- trunk/doc/info-stnd.texi    2014-05-09 20:47:01 UTC (rev 5546)
+++ trunk/doc/info-stnd.texi    2014-05-10 11:47:12 UTC (rev 5547)
@@ -139,16 +139,16 @@
 info address@hidden@dots{}] address@hidden address@hidden@dots{}]
 @end example
 
-Info will look for an entry called @var{manual} in the directory
-files it finds in its search path.  (If @var{manual} is not given,
-Info by default displays a composite directory listing, constructed by
-combining the @file{dir} files it finds.)  For example:
+Info will look for an entry called @var{manual} in the directory files
+(called @file{dir}) it finds in its search path.  (If @var{manual}
+is not given, Info by default displays a composite directory listing,
+constructed by combining the @file{dir} files.)  For example:
 
 @example
 info ls
 @end example
 
-This looks for an entry labelled as @code{ls}, and if found, displays the
+This looks for an entry labelled @code{ls}, and if found, displays the
 referenced file at the location given.  
 
 @cindex compressed Info files
@@ -158,18 +158,18 @@
 search path with names based on @var{manual}.  If @var{manual} is
 not found, Info looks for it with a number of known extensions of Info
 files, namely @file{.info}, @file{-info}, @file{/index}, and @file{.inf}.
-For every known extension, Info looks for a compressed file, if a regular
-file isn't found.  Info supports files compressed with @code{gzip},
+For every known extension, if a regular file is not found, Info looks
+for a compressed file.  Info supports files compressed with @code{gzip},
 @code{xz}, @code{bzip2}, @code{lzip}, @code{lzma}, @code{compress} and
 @code{yabba} programs, assumed to have extensions @file{.z}, @file{.gz},
 @file{.xz}, @file{.bz2}, @file{.lz}, @file{.lzma}, @file{.Z}, and
address@hidden respectively, possibly after one of the known Info files
address@hidden MS-DOS, Info allows for the Info extension,
-such as @code{.inf}, and the short compressed file extensions, such as
address@hidden and @file{.gz}, to be merged into a single extension, since DOS
-doesn't allow more than a single dot in the basename of a file.  Thus, on
-MS-DOS, if Info looks for @file{bison}, file names like @file{bison.igz}
-and @file{bison.inz} will be found and decompressed by @code{gunzip}.}
address@hidden address@hidden MS-DOS, Info allows for the Info
+extension, such as @code{.inf}, and the short compressed file extensions,
+such as @file{.z} and @file{.gz}, to be merged into a single extension,
+since DOS doesn't allow more than a single dot in the basename of
+a file.  Thus, on MS-DOS, if Info looks for @file{bison}, file names
+like @file{bison.igz} and @file{bison.inz} will be found and decompressed
+by @code{gunzip}.}
 
 (To bypass the directory lookup and look for Info files by their file
 name only, use the @option{--file} option, described below.)
@@ -389,9 +389,8 @@
 @cindex @code{--node} (@code{-n}) command line option
 @cindex node, selecting from the command line
 Specify a particular node to visit in the initial file that Info
-loads.  This is especially useful in conjunction with @code{--file}.
-You may specify @code{--node} multiple times; for an interactive Info,
-each @var{nodename} is visited in its own window, for a
+loads.  You may specify @code{--node} multiple times; for an interactive
+Info, each @var{nodename} is visited in its own window, for a
 non-interactive Info (such as when @code{--output} is given) each
 @var{nodename} is processed sequentially.
 

Modified: trunk/info/info.c
===================================================================
--- trunk/info/info.c   2014-05-09 20:47:01 UTC (rev 5546)
+++ trunk/info/info.c   2014-05-10 11:47:12 UTC (rev 5547)
@@ -187,11 +187,20 @@
          dir entry given by the first one. */
       if ((*argv)[0])
         {
+          /* If they say info -O info, we want to show them the invocation node
+             for standalone info; there's nothing useful in info.texi.  */
+          if (goto_invocation_p && (*argv)[0]
+              && mbscasecmp ((*argv)[0], "info") == 0)
+            (*argv)[0] = "info-stnd";
+
           dir_node = info_get_node (0, 0, PARSE_NODE_DFLT);
 
           entry = info_get_menu_entry_by_label (dir_node, (*argv)[0]);
           if (entry)
-            initial_file = info_find_fullpath (entry->filename, 0);
+            {
+              initial_file = info_find_fullpath (entry->filename, 0);
+              add_pointer_to_array (entry, ref_index, ref_list, ref_slots, 2);
+            }
 
           if (!initial_file)
             /* Try finding a file with this name, in case
@@ -281,11 +290,6 @@
       char **p = argv;
       char *program;
 
-      /* If they say info -O info, we want to show them the invocation node
-         for standalone info; there's nothing useful in info.texi.  */
-      if (argv[0] && mbscasecmp (*argv, "info") == 0)
-        *argv = "info-stnd";
-
       /* If they said "info --show-options foo bar baz",
          the last of the arguments is the program whose
          options they want to see.  */

Modified: trunk/info/infodoc.c
===================================================================
--- trunk/info/infodoc.c        2014-05-09 20:47:01 UTC (rev 5546)
+++ trunk/info/infodoc.c        2014-05-10 11:47:12 UTC (rev 5547)
@@ -947,7 +947,7 @@
                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";
+                                                 : "get-help-window";
               else
                 fun_name = rep_name;