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.

4 files changed, 10 insertions, 4 deletions

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.