[6608] info mode line

[Gavin D. Smith]

Revision: 6608
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6608
Author:   gavin
Date:     2015-09-10 12:56:42 +0000 (Thu, 10 Sep 2015)
Log Message:
-----------
info mode line

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-09-08 23:55:13 UTC (rev 6607)
+++ trunk/ChangeLog     2015-09-10 12:56:42 UTC (rev 6608)
@@ -1,3 +1,12 @@
+2015-09-10  Gavin Smith  <address@hidden>
+
+       * info/window.c (window_make_modeline),
+       * doc/info-stnd.texi (The Mode Line): Remove *Tags out of Date* 
+       message, because it often won't fit in the mode line, the user 
+       won't know what it means, or be able to do anything about it.  
+       Also remove "Subfile:" part for split files (the subfile can 
+       still be shown with the "=" command.), and the "zz" part.
+
 2015-09-09  Gavin Smith  <address@hidden>
 
        * util/texi2dvi (usage),

Modified: trunk/doc/info-stnd.texi
===================================================================
--- trunk/doc/info-stnd.texi    2015-09-08 23:55:13 UTC (rev 6607)
+++ trunk/doc/info-stnd.texi    2015-09-10 12:56:42 UTC (rev 6608)
@@ -1514,12 +1514,9 @@
 of an Info window.  It describes the contents of the window just above
 it; this information includes the name of the file and node appearing in
 that window, the number of screen lines it takes to display the node,
-and the percentage of text that is above the top of the window.  It can
-also tell you if the indirect tags table for this Info file needs to be
-updated, and whether or not the Info file was compressed when stored on
-disk.
+and the percentage of text that is above the top of the window.
 
-Here is a sample mode line for a window containing an uncompressed file
+Here is a sample mode line for a window containing a file
 named @file{dir}, showing the node @samp{Top}.
 
 @example
@@ -1530,21 +1527,12 @@
 @end group
 @end example
 
-When a node comes from a file which is compressed on disk, this is
-indicated in the mode line with two small @samp{z}'s.  In addition, if
-the Info file containing the node has been split into subfiles, the name
-of the subfile containing the node appears in the mode line as well:
-
address@hidden
---zz-Info: (emacs)Top, 291 lines --Top-- Subfile: emacs-1.Z-------------
address@hidden example
-
 Truncation of long lines (as opposed to wrapping them to the next
 display line, @pxref{Scrolling Commands, toggle-wrap}) is indicated by a
 @samp{$} at the left edge of the mode line:
 
 @example
---$--Info: (texinfo)Top, 480 lines --Top-- Subfile: texinfo-1-----------
+--$--Info: (texinfo)Top, 480 lines --Top--------------------------------
 @end example
 
 When Info makes a node internally, such that there is no corresponding
@@ -2410,7 +2398,7 @@
 @example
 #var
 ref-rendition=yellow
-hl-ref-rendition=bold,yellow
+hl-ref-rendition=yellow,bold
 match-rendition=underline,bold,nocolour
 @end example
 

Modified: trunk/info/window.c
===================================================================
--- trunk/info/window.c 2015-09-08 23:55:13 UTC (rev 6607)
+++ trunk/info/window.c 2015-09-10 12:56:42 UTC (rev 6608)
@@ -899,7 +899,6 @@
     int modeline_len = 0;
     char *parent = NULL, *filename = "*no file*";
     char *nodename = "*no node*";
-    const char *update_message = NULL;
     NODE *node = window->node;
 
     if (node)
@@ -917,9 +916,6 @@
             parent = 0;
             filename = filename_non_directory (node->fullpath);
           }
-
-        if (node->flags & N_UpdateTags)
-          update_message = _("--*** Tags out of Date ***");
       }
 
     if (preprocess_nodes_p)
@@ -954,11 +950,6 @@
       }
     else
       {
-        if (node && node->subfile)
-            modeline_len += strlen ("Subfile: ") + strlen (node->subfile);
-
-        if (update_message)
-          modeline_len += strlen (update_message);
         modeline_len += strlen (filename);
         modeline_len += strlen (nodename);
         modeline_len += 4;          /* strlen (location_indicator). */
@@ -976,16 +967,10 @@
                    (window->flags & W_NoWrap) ? "$" : "-",
                    nodename, window->line_count, location_indicator);
         else
-          sprintf (modeline, _("-%s%s-Info: (%s)%s, %ld lines --%s--"),
+          sprintf (modeline, _("-%s---Info: (%s)%s, %ld lines --%s--"),
                    (window->flags & W_NoWrap) ? "$" : "-",
-                   (node && (node->flags & N_IsCompressed)) ? "zz" : "--",
                    parent ? parent : filename,
                    nodename, window->line_count, location_indicator);
-        if (node->subfile)
-          sprintf (modeline + strlen (modeline), _(" Subfile: %s"), filename);
-
-        if (update_message)
-          sprintf (modeline + strlen (modeline), "%s", update_message);
       }
 
     i = strlen (modeline);