[6690] disable ignoring characters in index sort key

[Gavin D. Smith]

Revision: 6690
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6690
Author:   gavin
Date:     2015-10-13 14:09:06 +0000 (Tue, 13 Oct 2015)
Log Message:
-----------
disable ignoring characters in index sort key

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-10-13 11:53:31 UTC (rev 6689)
+++ trunk/ChangeLog     2015-10-13 14:09:06 UTC (rev 6690)
@@ -1,5 +1,10 @@
 2015-10-13  Gavin Smith  <address@hidden>
 
+       * doc/texinfo.tex (\indexnonalnumdisappear, \indexnonalnumreappear):
+       Disable ignoring \, < and @ until we have options for them.
+
+2015-10-13  Gavin Smith  <address@hidden>
+
        * doc/texinfo.tex (\entry): Get length of index entry text and 
        length of whole entry.  If it's too long, use \parshape to split 
        the entry across two lines.  Use \rightskip and \leftskip to 

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2015-10-13 11:53:31 UTC (rev 6689)
+++ trunk/doc/texinfo.tex       2015-10-13 14:09:06 UTC (rev 6690)
@@ -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{2015-10-13.13}
+\def\texinfoversion{2015-10-13.16}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -4702,17 +4702,18 @@
 \catcode`\<=13
 \catcode`\-=13
   \gdef\indexnonalnumdisappear{%
-    \backslashdisappear
+    % disabled until we can introduce options for them.
+    %\backslashdisappear
     \def-{}%
-    \def<{}%
-    address@hidden
+    %\def<{}%
+    address@hidden
   }
 
   \gdef\indexnonalnumreappear{%
-    \useindexbackslash
+    %\useindexbackslash
     \let-\normaldash
-    \let<\normalless
-    address@hidden@}%
+    %\let<\normalless
+    address@hidden@}%
   }
 }
 
@@ -5284,9 +5285,9 @@
         % If the entry is too long, use the whole line
         \dimen@ = address@hidden
       \else
-    % Cause stretch of 1fill at the end of the first line, to avoid
-    % extra spacing in a short first line.
-    \hskip 0pt plus 1fill
+        % Cause stretch of 1fill at the end of the first line, to avoid
+        % extra spacing in a short first line.
+        \hskip 0pt plus 1fill
       \fi
       \parshape = 2 0pt \dimen@ 1em address@hidden
       % Ideally we'd add a finite glue at the end of the first line only, but