texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[5611] use numbered labels in allfiles node again


From: Gavin D. Smith
Subject: [5611] use numbered labels in allfiles node again
Date: Tue, 27 May 2014 18:03:30 +0000

Revision: 5611
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5611
Author:   gavin
Date:     2014-05-27 18:03:29 +0000 (Tue, 27 May 2014)
Log Message:
-----------
use numbered labels in allfiles node again

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-05-27 13:12:00 UTC (rev 5610)
+++ trunk/ChangeLog     2014-05-27 18:03:29 UTC (rev 5611)
@@ -3,6 +3,11 @@
        * info/info.c (add_initial_nodes) <--show-options>: Avoid loading
        extra node if we came here from a dir entry.
 
+       (allfiles_create_node): Use numbers as labels, as it was before.
+       Using the label as the node spec caused problems when the referenced
+       node didn't exist.  Output index tag to show destinations when
+       preprocess-nodes=On.
+
 2014-05-27  Gavin Smith  <address@hidden>
 
        * info/info-utils.c (info_get_menu_entry_by_label): New argument

Modified: trunk/info/info.c
===================================================================
--- trunk/info/info.c   2014-05-27 13:12:00 UTC (rev 5610)
+++ trunk/info/info.c   2014-05-27 18:03:29 UTC (rev 5611)
@@ -463,17 +463,19 @@
                      "%s File names matching `%s'\n\n"
                      "Info File Index\n"
                      "***************\n\n"
-                     "File names that match `%s':\n\n"
-                     "* Menu:\n\n",
+                     "File names that match `%s':\n",
                       INFO_NODE_LABEL,
                      term, term);
 
+  text_buffer_add_string (&text, "\000\010[index\000\010]", 11);
+  text_buffer_printf (&text, "\n* Menu:\n\n");
+
   for (i = 0; fref[i]; i++)
     {
-      text_buffer_printf (&text, "* (%s)", fref[i]->filename);
+      text_buffer_printf (&text, "* %4i: (%s)", i+1, fref[i]->filename);
       if (fref[i]->nodename)
        text_buffer_printf (&text, "%s", fref[i]->nodename);
-      text_buffer_printf (&text, "::\n");
+      text_buffer_printf (&text, ".\n");
     }
 
   allfiles_node = info_create_node ();




reply via email to

[Prev in Thread] Current Thread [Next in Thread]