[5336] rename to info-display-file, documentation

[karl]

Revision: 5336
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5336
Author:   karl
Date:     2013-08-22 17:33:59 +0000 (Thu, 22 Aug 2013)
Log Message:
-----------
rename to info-display-file, documentation

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/NEWS
    trunk/doc/info-stnd.texi
    trunk/doc/version-stnd.texi
    trunk/info/info.c
    trunk/info/infomap.c
    trunk/info/session.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2013-08-20 21:45:35 UTC (rev 5335)
+++ trunk/ChangeLog     2013-08-22 17:33:59 UTC (rev 5336)
@@ -1,3 +1,14 @@
+2013-08-22  Karl Berry  <address@hidden>
+
+       * info/infomap.c (default_{emacs,vi}_like_info_keys),
+       * info/session.c (info_display_file_info): rename from
+       info_display_file.
+       * NEWS: mention display-file-info.
+       * doc/info-stnd.texi (Invoking Info): mention new debugging level,
+       more about -f.
+       (Miscellaneous Commands): document =.
+       * info/info.c (info_short_help): mention -1 for all debugging.
+
 2013-08-20  Sergey Poznyakoff  <address@hidden>
 
        * info/info.h (add_pointer_to_array): Use x2nrealloc.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS  2013-08-20 21:45:35 UTC (rev 5335)
+++ trunk/NEWS  2013-08-22 17:33:59 UTC (rev 5336)
@@ -28,15 +28,16 @@
     with the usual syntax, -v VARIABLE=VALUE.
   . new option -a (--all) instructs Info to display all documents
     matching the command line arguments, not just the first.  In
-    conjunction with the -w option, it shows full names of the info
-    files matching the command line arguments.
+    conjunction with the -w option, it shows full names of all Info
+    files matching the command line arguments; with -o, it outputs all
+    matching files.
   . new variable search-skip-screen controls the starting position for
     repeated search commands ({ and }).  When set to On, repeated
     searches skip the lines displayed on the screen, i.e.,
     forward searches (}) start at the beginning of the next page, and
     backward searches ({) start at the end of the previous page.
-  . new command '=' (C-g in vi mode) shows full file name of the node
-    being displayed and position in it.
+  . new command display-file-info (bound to = by default, C-g in vi mode)
+    shows full file name of the node being displayed and position in it.
   
 * Distribution: automake-1.14, gettext-0.18.3.1.
 

Modified: trunk/doc/info-stnd.texi
===================================================================
--- trunk/doc/info-stnd.texi    2013-08-20 21:45:35 UTC (rev 5335)
+++ trunk/doc/info-stnd.texi    2013-08-22 17:33:59 UTC (rev 5336)
@@ -151,10 +151,11 @@
 
 First, if @code{--all} is used together with @option{--where},
 @command{info} prints the names of all matching files found on
-standard output and exits.
+standard output (including @samp{*manpages*} if relevant) and exits.
 
 Second, if @code{--all} is used together with @option{--output}, the
-contents of all matched files are dumped to the specified output file.
+contents of all matched files are dumped to the specified output
+file.
 
 Otherwise, an interactive session is initiated.  If more than one file
 matches, a menu node is displayed listing the matches and allowing you
@@ -187,21 +188,26 @@
 @cindex @code{--debug} (@code{-x}) command line option
 @cindex debugging
 Print additional debugging information.  The argument specifies the
-verbosity level.  For all available debugging output, use @option{-x
--1}.  Version @value{VERSION} has two specific verbosity levels:
+verbosity level, so a higher level includes all the information from
+lower levels.  For all available debugging output, use
address@hidden@tie{}-1}.  Info version @value{VERSION} has these levels:
 
address@hidden @asis
address@hidden @code
 @item 1
-Print information about file lookups.
+Print information about file handling, such as looking for @file{dir}
+files and nodes written with @samp{--output}.
 
 @item 2
 Print operations relating to @env{INFOPATH}.
+
address@hidden 3
+Print information about node searching.
 @end table
 
 @cindex @file{infodebug} output file
-Unless the window system is initialized, debugging output goes to the
-standard error.  When it is initialized, it is diverted to the file
address@hidden in the current working directory.
+Before Info's full-screen output is initialized, debugging output goes
+to standard error.  After it is initialized, the debugging output is
+written to the file @file{infodebug} in the current working directory.
 
 @item --directory @var{directory-path}
 @itemx -d @var{directory-path}
@@ -249,6 +255,19 @@
 @address@hidden  If no such file (or node) can be found,
 Info just exits immediately.
 
+Thus, @code{info -f emacs} is rather different from @code{info emacs}.
+With the latter, @samp{emacs} is treated as a menu item, meaning a
+case-insensitive match to the text before the colon in a typical
address@hidden entry:
+
address@hidden
+* Emacs: (emacs).  The extensible ...
address@hidden example
+
+An exact match (@samp{* emacs:})@: is preferred to a case-folding
+match.  This can often happen when the name of a utility and its
+containing manual are the same.
+
 @cindex relative Info file names
 @cindex file names, relative
 @cindex Info files, relative
@@ -1832,6 +1851,16 @@
 @file{info.texi} distributed with GNU Info contains this node.  Of
 course, the file must first be processed with @code{makeinfo}, and then
 placed into the location of your Info directory.
+
address@hidden @kbd{=} (@code{display-file-info})
address@hidden current file, information about
address@hidden display-file-info
address@hidden =, in Info windows
address@hidden C-g, vi-like operation
+Show information about what's currently being viewed in the echo area:
+the Info file name, and current line number and percentage within the
+current node.
+
 @end table
 
 Here are the commands for creating a numeric argument:
@@ -1890,17 +1919,17 @@
 if you need to specify negative arguments in the echo area.
 @end table
 
address@hidden is used to abort the reading of a multi-character key
-sequence, to cancel lengthy operations (such as multi-file searches) and
-to cancel reading input in the echo area.
address@hidden (@kbd{C-c} in vi-like mode) is used to abort the reading of
+a multi-character key sequence, to cancel lengthy operations (such as
+multi-file searches) and to cancel reading input in the echo area.
 
 @table @asis
 @item @kbd{C-g} (@code{abort-key})
address@hidden @kbd{C-u}, vi-like operation
address@hidden @kbd{C-c}, vi-like operation
 @cindex cancelling typeahead
 @cindex cancelling the current operation
 @kindex C-g, in Info windows
address@hidden C-u cancels typeahead, vi-like operation
address@hidden C-c, vi-like operation
 @findex abort-key
 Cancel current operation.
 @end table

Modified: trunk/doc/version-stnd.texi
===================================================================
--- trunk/doc/version-stnd.texi 2013-08-20 21:45:35 UTC (rev 5335)
+++ trunk/doc/version-stnd.texi 2013-08-22 17:33:59 UTC (rev 5336)
@@ -1,4 +1,4 @@
address@hidden UPDATED 13 August 2013
address@hidden UPDATED 22 August 2013
 @set UPDATED-MONTH August 2013
 @set EDITION 5.1.90
 @set VERSION 5.1.90

Modified: trunk/info/info.c
===================================================================
--- trunk/info/info.c   2013-08-20 21:45:35 UTC (rev 5335)
+++ trunk/info/info.c   2013-08-22 17:33:59 UTC (rev 5336)
@@ -912,7 +912,7 @@
       --vi-keys                use vi-like and less-like key bindings.\n\
       --version                display version information and exit.\n\
   -w, --where, --location      print physical location of Info file.\n\
-  -x, --debug=NUMBER           set debugging level.\n"));
+  -x, --debug=NUMBER           set debugging level (-1 for all).\n"));
 
   puts (_("\n\
 The first non-option argument, if present, is the menu entry to start from;\n\

Modified: trunk/info/infomap.c
===================================================================
--- trunk/info/infomap.c        2013-08-20 21:45:35 UTC (rev 5335)
+++ trunk/info/infomap.c        2013-08-22 17:33:59 UTC (rev 5336)
@@ -315,7 +315,7 @@
   '8', NUL,                       A_info_menu_digit,
   '9', NUL,                       A_info_menu_digit,
   '<', NUL,                       A_info_first_node,
-  '=', NUL,                       A_info_display_file,
+  '=', NUL,                       A_info_display_file_info,
   '>', NUL,                       A_info_last_node,
   '?', NUL,                       A_info_get_help_window,
   '[', NUL,                       A_info_global_prev_node,
@@ -581,7 +581,7 @@
   CONTROL('d'), NUL,              A_info_scroll_half_screen_down,
   CONTROL('e'), NUL,              A_info_down_line,
   CONTROL('f'), NUL,              A_info_scroll_forward_page_only,
-  CONTROL('g'), NUL,              A_info_display_file,
+  CONTROL('g'), NUL,              A_info_display_file_info,
   CONTROL('k'), NUL,              A_info_up_line,
   CONTROL('l'), NUL,              A_info_redraw_display,
   CONTROL('n'), NUL,              A_info_down_line,

Modified: trunk/info/session.c
===================================================================
--- trunk/info/session.c        2013-08-20 21:45:35 UTC (rev 5335)
+++ trunk/info/session.c        2013-08-22 17:33:59 UTC (rev 5336)
@@ -2,7 +2,7 @@
    $Id$
 
    Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-   2004, 2007, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
+   2004, 2007, 2008, 2009, 2011, 2012, 2013 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -5384,8 +5384,8 @@
     }
 }
 
-DECLARE_INFO_COMMAND (info_display_file,
-                     _("Show full file name of the node being displayed"))
+DECLARE_INFO_COMMAND (info_display_file_info,
+                     _("Show full file name of node being displayed"))
 {
   const char *fname = info_find_fullpath (window->node->filename);
   if (fname)