--- texinfo.tex-original	Fri Jun 30 20:28:15 2000
+++ texinfo.tex	Tue Aug  8 22:03:24 2000
@@ -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{1999-09-25.10}
+\def\texinfoversion{2000-08-08.22}
 %
 % Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99
 % Free Software Foundation, Inc.
@@ -5676,9 +5676,43 @@
 should work if nowhere else does.}
 
 
-% @documentencoding should change something in TeX eventually, most
-% likely, but for now just recognize it.
-\let\documentencoding = \comment
+% @documentencoding
+%
+% Support for charactersets that are supersets of ascii. 
+%
+% The included .def files contain \global\catcode and \gdef commands
+% making all non-ascii characters special, analogous to 
+% latex/misc/isolatin1.sty. This won't quite make the right thing
+% for hyphenation, but I haven't been able to figure out how to do it
+% right. 
+%
+% It would also be preferable to have the .def files use some special
+% macro, defined here, instead of using \catcode etc directly. That
+% way, the mechanism could be changed by editing a single macro
+% definition here, without touching the .def files.
+%
+% /nisse@lysator.liu.se, August 2000
+
+\def\documentencoding{\parsearg\dodocumentencoding}
+
+\def\dodocumentencoding#1{%
+  \tex % read *.def file in plain TeX.
+  % Read the file if it exists.
+  \openin 1 #1.def
+  \ifeof1
+    \errhelp = \noencodinghelp
+    \errmessage{Cannot read charset definition file #1.def}%
+    \let\temp = \relax
+  \else
+    \def\temp{\input #1.def }%
+  \fi
+  \temp
+  \endgroup
+}
+\newhelp\noencodinghelp{The given encoding definition file cannot be found or
+is empty.  Maybe you need to install it?  In the current directory
+should work if nowhere else does.}
+
 
 
 % Page size parameters.