[6087] do not re-invoke \utfeightchardefs

[karl]

Revision: 6087
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6087
Author:   karl
Date:     2015-01-31 18:18:39 +0000 (Sat, 31 Jan 2015)
Log Message:
-----------
do not re-invoke \utfeightchardefs

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-01-31 00:07:07 UTC (rev 6086)
+++ trunk/ChangeLog     2015-01-31 18:18:39 UTC (rev 6087)
@@ -1,3 +1,8 @@
+2015-01-31  Karl Berry  <address@hidden>
+
+       * doc/texinfo.tex (\documentencoding): do not re-invoke
+       \utfeightchardefs.
+
 2015-01-30  Karl Berry  <address@hidden>
 
        * doc/texinfo.tex (\utfeightchardefs): define all the easy

Modified: trunk/doc/texinfo.tex
===================================================================
--- trunk/doc/texinfo.tex       2015-01-31 00:07:07 UTC (rev 6086)
+++ trunk/doc/texinfo.tex       2015-01-31 18:18:39 UTC (rev 6087)
@@ -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-01-30.16}
+\def\texinfoversion{2015-01-31.10}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -8988,7 +8988,9 @@
   %
   \else \ifx \declaredencoding \utfeight
      \setnonasciicharscatcode\active
-     \utfeightchardefs
+     % since we already invoked \utfeightchardefs at the top level
+     % (below), do not re-invoke it, then our check for duplicated
+     % definitions triggers.  Making non-ascii chars active is enough.
   %
   \else
     \message{Ignoring unknown document encoding: #1.}%