Allow building manuals with Texinfo before v4.12.

 doc/lispref/intro.texi (Acknowledgements): Convert to ISO-8859-1 encoding.
 doc/lispref/makefile.w32-in (MAKEINFO_OPTS): Add --enable-encoding.
 doc/lispref/elisp.texi: Use ISO-8859-1 in @documentencoding.
 doc/emacs/ack.texi (Acknowledgments): Convert to ISO-8859-1 encoding.  Use
 Texinfo @-commands for non Latin-1 characters.
 doc/emacs/emacs.texi: Use ISO-8859-1 in @documentencoding.
 doc/emacs/makefile.w32-in (MAKEINFO_OPTS): Add --enable-encoding.

8 files changed, 32 insertions, 21 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 4ce236604ed..4bdd1448add 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,10 @@
 2011-03-09  Eli Zaretskii  <eliz@gnu.org>
 
+        * ack.texi (Acknowledgments): Convert to ISO-8859-1 encoding.  Use
+        Texinfo @-commands for non Latin-1 characters.
+
+        * makefile.w32-in (MAKEINFO_OPTS): Add --enable-encoding.
+
         * custom.texi (Init File): Add index entries for ".emacs".
         (Bug#8210)
 
diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index 148aaaeaa30..debe7149cb5 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -1,4 +1,4 @@
-@c -*- coding: utf-8 -*-
+@c -*- coding: iso-latin-1 -*-
 @c This is part of the Emacs manual.
 @c Copyright (C) 1994-1997, 1999-2011  Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
@@ -52,7 +52,7 @@ files.
 Michael Albinus wrote @file{dbus.el}, a package that implements the
 D-Bus message bus protocol; @file{zeroconf.el}, a mode for browsing
 Avahi services; and @file{xesam.el}, a Xesam-based search engine
-interface.  He and Kai Großjohann wrote the Tramp package, which
+interface.  He and Kai Gro�johann wrote the Tramp package, which
 provides transparent remote file editing using rcp, ssh, ftp, and
 other network protocols.  He and Daniel Pittman wrote
 @file{tramp-cache.el}.
@@ -154,7 +154,7 @@ David M.@: Brown wrote @file{array.el}, for editing arrays and other
 tabular data.
 
 @item
-Włodek Bzyl and Ryszard Kubiak wrote @file{ogonek.el}, a package for
+W@l{}odek Bzyl and Ryszard Kubiak wrote @file{ogonek.el}, a package for
 changing the encoding of Polish characters.
 
 @item
@@ -191,7 +191,7 @@ prior to Emacs 23 for Mac OS.
 @item
 Chong Yidong was the Emacs co-maintainer for Emacs 23.  He made many
 improvements to the Emacs display engine; and, together with Kai
-Großjohann and Alex Schroeder, wrote @file{longlines.el}, a minor
+Gro�johann and Alex Schroeder, wrote @file{longlines.el}, a minor
 mode for wrapping long lines.
 
 @item
@@ -249,13 +249,13 @@ text replace the current selection.
 Eric Ding wrote @file{goto-addr.el},
 
 @item
-Jan Djärv added support for the GTK+ toolkit and X drag-and-drop.
+Jan Dj�rv added support for the GTK+ toolkit and X drag-and-drop.
 
 @item
 Carsten Dominik wrote Ref@TeX{}, a package for setting up labels and
 cross-references in La@TeX{} documents; and co-wrote IDLWAVE mode
 (q.v.@:).  He was the main author of Org mode, for maintaining notes,
-todo lists, and project planning.  Thomas Baumann, Jan Böcker, Lennart
+todo lists, and project planning.  Thomas Baumann, Jan B�cker, Lennart
 Borgman, Baoqiu Cui, Daniel German, Bastien Guerry, Tassilo Horn, Philip
 Jackson, Tokuya Kameshima, Ross Patterson, Sebastian Rose, Eric Schulte,
 Paul Sexton, Ulf Stegemann, Andy Stewart, David O'Toole, John Wiegley,
@@ -284,7 +284,7 @@ folders have mail waiting in them; and @file{iswitchb.el}, a feature
 for incremental reading and completion of buffer names.
 
 @item
-Torbjörn Einarsson wrote @file{f90.el}, a mode for Fortran 90 files.
+Torbj�rn Einarsson wrote @file{f90.el}, a mode for Fortran 90 files.
 
 @item
 Tsugutomo Enami co-wrote the support for international character sets.
@@ -350,7 +350,7 @@ Kevin Gallo added multiple-frame support for Windows NT and wrote
 @file{w32-win.el}, support functions for the MS-Windows window system.
 
 @item
-Juan León Lahoz García wrote @file{wdired.el}, a package for
+Juan Le�n Lahoz Garc�a wrote @file{wdired.el}, a package for
 performing file operations by directly editing Dired buffers.
 
 @item
@@ -484,8 +484,8 @@ Emacs: @file{dns.el} for Domain Name Service lookups;
 @file{netrc.el} for parsing of @file{.netrc} files; and
 @file{time-date.el} for general date and time handling.  Components of
 Gnus have also been written by: Nagy Andras, David Blacka, Scott Byer,
-Kevin Greiner, Kai Großjohann, Joe Hildebrand, Paul Jarc, Sascha
-Lüdecke, David Moore, Jim Radford, Benjamin Rutt, Raymond Scholz,
+Kevin Greiner, Kai Gro�johann, Joe Hildebrand, Paul Jarc, Sascha
+L�decke, David Moore, Jim Radford, Benjamin Rutt, Raymond Scholz,
 Thomas Steffen, Reiner Steib, Didier Verna, Ilja Weis, Katsumi Yamaoka,
 Teodor Zlatanov, and others (@pxref{Contributors,,,gnus, the Gnus Manual}).
 
@@ -525,7 +525,7 @@ S/MIME and Sieve components; and @file{tls.el} and @file{starttls.el}
 for the Transport Layer Security protocol.
 
 @item
-Arne Jørgensen wrote @file{latexenc.el}, a package to
+Arne J�rgensen wrote @file{latexenc.el}, a package to
 automatically guess the correct coding system in LaTeX files.
 
 @item
@@ -577,7 +577,7 @@ files and running a PostScript interpreter interactively from within
 Emacs.
 
 @item
-Karel Klíč contributed SELinux support, for preserving the
+Karel Kl�@v{c} contributed SELinux support, for preserving the
 Security-Enchanced Linux context of files on backup and copy.
 
 @item
@@ -668,7 +668,7 @@ directory-local variables; and the @code{info-finder} feature that
 creates a virtual Info manual of package keywords.
 
 @item
-Károly Lőrentey wrote the ``multi-terminal'' code, which allows Emacs to
+K�roly L@H{o}rentey wrote the ``multi-terminal'' code, which allows Emacs to
 run on graphical and text-only terminals simultaneously.
 
 @item
@@ -933,7 +933,7 @@ Fred Pierresteguy and Paul Reilly made Emacs work with X Toolkit
 widgets.
 
 @item
-François Pinard, Greg McGary, and Bruno Haible wrote @file{po.el},
+Fran�ois Pinard, Greg McGary, and Bruno Haible wrote @file{po.el},
 support for PO translation files.
 
 @item
@@ -1195,7 +1195,7 @@ Olaf Sylvester wrote @file{bs.el}, a package for manipulating Emacs
 buffers.
 
 @item
-Tibor Šimko and Milan Zamazal wrote @file{slovak.el}, support for
+Tibor @v{S}imko and Milan Zamazal wrote @file{slovak.el}, support for
 editing text in Slovak language.
 
 @item
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 75453993dde..ef56a0dedd8 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -29,7 +29,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@documentencoding UTF-8
+@documentencoding ISO-8859-1
 
 @dircategory Emacs
 @direntry
diff --git a/doc/emacs/makefile.w32-in b/doc/emacs/makefile.w32-in
index bbbcaf0528b..ad976468be9 100644
--- a/doc/emacs/makefile.w32-in
+++ b/doc/emacs/makefile.w32-in
@@ -28,7 +28,7 @@ infodir = $(srcdir)/../../info
 
 # The makeinfo program is part of the Texinfo distribution.
 MAKEINFO = makeinfo
-MAKEINFO_OPTS = --force -I$(srcdir)
+MAKEINFO_OPTS = --force --enable-encoding -I$(srcdir)
 MULTI_INSTALL_INFO = $(srcdir)\..\..\nt\multi-install-info.bat
 INFO_TARGETS = $(infodir)/emacs
 DVI_TARGETS =   emacs.dvi
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 7a402c902e5..fb99bee7aee 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * intro.texi (Acknowledgements): Convert to ISO-8859-1 encoding.
+
+        * makefile.w32-in (MAKEINFO_OPTS): Add --enable-encoding.
+
 2011-03-08  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (MAKEINFO_OPTS): Add --enable-encoding.
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index 1bd10633d44..69c50ba42be 100644
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -62,7 +62,7 @@ developing GNU and promoting software freedom.''
 @end quotation
 @end copying
 
-@documentencoding UTF-8
+@documentencoding ISO-8859-1
 
 @dircategory GNU Emacs Lisp
 @direntry
diff --git a/doc/lispref/intro.texi b/doc/lispref/intro.texi
index 59718cbee75..7c070726023 100644
--- a/doc/lispref/intro.texi
+++ b/doc/lispref/intro.texi
@@ -1,4 +1,4 @@
-@c -*-coding: utf-8-*-
+@c -*-coding: iso-latin-1-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990-1994, 2001-2011  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
@@ -542,6 +542,6 @@ Kirman, Bob Knighten, Frederick M. Korz, Joe Lammens, Glenn M. Lewis,
 K. Richard Magill, Brian Marick, Roland McGrath, Stefan Monnier, Skip
 Montanaro, John Gardiner Myers, Thomas A. Peterson, Francesco Potorti,
 Friedrich Pukelsheim, Arnold D. Robbins, Raul Rockwell, Jason Rumney,
-Per Starbäck, Shinichirou Sugou, Kimmo Suominen, Edward Tharp, Bill
+Per Starb�ck, Shinichirou Sugou, Kimmo Suominen, Edward Tharp, Bill
 Trost, Rickard Westman, Jean White, Eduard Wiebe, Matthew Wilding,
 Carl Witty, Dale Worley, Rusty Wright, and David D. Zuhn.
diff --git a/doc/lispref/makefile.w32-in b/doc/lispref/makefile.w32-in
index d074dd22e24..7b88e861d67 100644
--- a/doc/lispref/makefile.w32-in
+++ b/doc/lispref/makefile.w32-in
@@ -33,7 +33,7 @@ texinfodir = $(srcdir)/../misc
 TEX=tex
 INSTALL_INFO = install-info
 MAKEINFO = makeinfo
-MAKEINFO_OPTS = --force  -I$(srcdir) -I$(emacsdir)
+MAKEINFO_OPTS = --force --enable-encoding  -I$(srcdir) -I$(emacsdir)
 
 # The environment variable and its value to add $(srcdir) to the path
 # searched for TeX input files.