[7262] \macrolist use \commondummyword

[gavinsmith0123]

Revision: 7262
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7262
Author:   gavin
Date:     2016-07-16 19:50:23 +0000 (Sat, 16 Jul 2016)
Log Message:
-----------
\macrolist use \commondummyword

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/texinfo.tex

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-07-16 14:34:03 UTC (rev 7261)
+++ trunk/ChangeLog     2016-07-16 19:50:23 UTC (rev 7262)
@@ -1,5 +1,14 @@
 2016-07-16  Gavin Smith  <address@hidden>
 
+       * doc/texinfo.tex (\macrolist, \addtomacrolist, \unmacro): Store
+       list of macros with "\commondummyword" instead of 
+       "\definedummyword", so that we remove the macro when writing an 
+       index sort key.  Otherwise, texindex can produce a broken sorted 
+       index file.  This fixes bug introduced on 2016-05-28, when the 
+       macros used in \commondummiesnofonts were changed.
+
+2016-07-16  Gavin Smith  <address@hidden>
+
        * doc/texinfo.tex (\ktable): Add to implement @ktable, following 
        pattern of \ftable and \vtable.
 
@@ -368,7 +377,7 @@
        writing to auxiliary files.  Expand the @value at the time of 
        writing, reversing change on 2016-05-07.
        (\commondummies): Use \dummyvalue definition for @value.
-       (Files using @value's in section titles broken when value was 
+       Files using @value's in section titles broken when value was 
        @set after the table of contents, reported by Paul Eggert.
 
 2016-05-24  Gavin Smith  <address@hidden>

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2016-07-16 14:34:03 UTC (rev 7261)
+++ trunk/doc/texinfo.tex       2016-07-16 19:50:23 UTC (rev 7262)
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2016-07-16.14}
+\def\texinfoversion{2016-07-16.19}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -8043,7 +8043,7 @@
 \newif\ifrecursive  % Is it recursive?
 
 % List of all defined macros in the form
-%    \definedummyword\macro1\definedummyword\macro2...
+%    \commondummyword\macro1\commondummyword\macro2...
 % Currently is also contains all @aliases; the list can be split
 % if there is a need.
 \def\macrolist{}
@@ -8051,7 +8051,7 @@
 % Add the macro to \macrolist
 \def\addtomacrolist#1{\expandafter \addtomacrolistxxx \csname#1\endcsname}
 \def\addtomacrolistxxx#1{%
-     \toks0 = \expandafter{\macrolist\definedummyword#1}%
+     \toks0 = \expandafter{\macrolist\commondummyword#1}%
      \xdef\macrolist{\the\toks0}%
 }
 
@@ -8192,7 +8192,7 @@
     % Remove the macro name from \macrolist:
     \begingroup
       \expandafter\let\csname#1\endcsname \relax
-      \let\definedummyword\unmacrodo
+      \let\commondummyword\unmacrodo
       \xdef\macrolist{\macrolist}%
     \endgroup
   \else
@@ -8207,7 +8207,7 @@
   \ifx #1\relax
     % remove this
   \else
-    \noexpand\definedummyword \noexpand#1%
+    \noexpand\commondummyword \noexpand#1%
   \fi
 }