[7333] window modeline does not depend of preprocess_nodes_p

[gavinsmith0123]

Revision: 7333
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7333
Author:   gavin
Date:     2016-09-03 16:42:36 +0000 (Sat, 03 Sep 2016)
Log Message:
-----------
window modeline does not depend of preprocess_nodes_p

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/window.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-09-03 16:20:45 UTC (rev 7332)
+++ trunk/ChangeLog     2016-09-03 16:42:36 UTC (rev 7333)
@@ -1,5 +1,10 @@
 2016-09-03  Gavin Smith  <address@hidden>
 
+       * info/window.c (window_make_modeline): Do not make modeline 
+       depend on whether preprocess_nodes_p is set.
+
+2016-09-03  Gavin Smith  <address@hidden>
+
        * info/info-utils.c (scan_reference_target): Remove code that 
        altered the line number of an index entry if 
        preprocess_nodes_p=1, because this is is independent of whether 

Modified: trunk/info/window.c
===================================================================
--- trunk/info/window.c 2016-09-03 16:20:45 UTC (rev 7332)
+++ trunk/info/window.c 2016-09-03 16:42:36 UTC (rev 7333)
@@ -894,81 +894,42 @@
   /* Calculate the maximum size of the information to stick in MODELINE. */
   {
     int modeline_len = 0;
-    char *parent = NULL, *filename = "*no file*";
     char *nodename = "*no node*";
     NODE *node = window->node;
+    char *name;
+    int dot;
 
-    if (node)
-      {
-        if (node->nodename)
-          nodename = node->nodename;
+    if (node && node->nodename)
+      nodename = node->nodename;
 
-        if (node->subfile)
-          {
-            parent = filename_non_directory (node->fullpath);
-            filename = filename_non_directory (node->subfile);
-          }
-        else
-          {
-            parent = 0;
-            filename = filename_non_directory (node->fullpath);
-          }
-      }
+    name = filename_non_directory (node->fullpath);
 
-    if (preprocess_nodes_p)
-      {
-        char *name;
-        int dot;
+    /* 10 for the decimal representation of the number of lines in this
+       node, and the remainder of the text that can appear in the line. */
+    modeline_len += 10 + strlen (_("-----Info: (), lines ----, "));
+    modeline_len += 3; /* strlen (location_indicator) */
+    modeline_len += strlen (name);
+    if (nodename)
+      modeline_len += strlen (nodename);
+    if (modeline_len < window->width)
+      modeline_len = window->width;
 
-        name = filename_non_directory (node->fullpath);
+    modeline = xcalloc (1, 1 + modeline_len);
 
-        modeline_len += strlen ("--Info:() --");
-        modeline_len += 3; /* strlen (location_indicator) */
-        modeline_len += strlen (name);
-        if (nodename) modeline_len += strlen (nodename);
-        if (modeline_len < window->width)
-          modeline_len = window->width;
+    sprintf (modeline + strlen (modeline), "-----Info: ");
 
-        modeline = xcalloc (1, 1 + modeline_len);
+    /* Omit any extension like ".info.gz" from file name. */
+    dot = strcspn (name, ".");
 
-        sprintf (modeline + strlen (modeline), "%s", location_indicator);
-        sprintf (modeline + strlen (modeline), "--Info: ");
-
-        /* Omit any extension like ".info.gz" from file name. */
-        dot = strcspn (name, ".");
-
-        if (name && strcmp ("", name))
-          {
-            sprintf (modeline + strlen (modeline), "(");
-            strncpy (modeline + strlen (modeline), name, dot);
-            sprintf (modeline + strlen (modeline), ")");
-          }
-        sprintf (modeline + strlen (modeline), "%s--", nodename);
-      }
-    else
+    if (name && strcmp ("", name))
       {
-        modeline_len += strlen (filename);
-        modeline_len += strlen (nodename);
-        modeline_len += 4;          /* strlen (location_indicator). */
-
-        /* 10 for the decimal representation of the number of lines in this
-           node, and the remainder of the text that can appear in the line. */
-        modeline_len += 10 + strlen (_("-----Info: (), lines ----, "));
-        modeline_len += window->width;
-
-        modeline = xmalloc (1 + modeline_len);
-
-        /* Special internal windows have no filename. */
-        if (!filename || !*filename)
-          sprintf (modeline, _("-%s---Info: %s, %ld lines --%s--"),
-                   (window->flags & W_NoWrap) ? "$" : "-",
-                   nodename, window->line_count, location_indicator);
-        else
-          sprintf (modeline, _("-%s---Info: (%s)%s, %ld lines --%s--"),
-                   (window->flags & W_NoWrap) ? "$" : "-",
-                   parent ? parent : filename,
-                   nodename, window->line_count, location_indicator);
+        sprintf (modeline + strlen (modeline), "(");
+        strncpy (modeline + strlen (modeline), name, dot);
+        sprintf (modeline + strlen (modeline), ")");
       }
+    sprintf (modeline + strlen (modeline),
+             "%s, " "%ld lines --" "%s",
+             nodename, window->line_count, location_indicator);
 
     i = strlen (modeline);