[Emacs-diffs] /srv/bzr/emacs/trunk r103606: Allow building manuals with Texinfo before v4.12.

[Eli Zaretskii]

------------------------------------------------------------
revno: 103606
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Wed 2011-03-09 18:54:08 +0200
message:
  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.
modified:
  doc/emacs/ChangeLog
  doc/emacs/ack.texi
  doc/emacs/emacs.texi
  doc/emacs/makefile.w32-in
  doc/lispref/ChangeLog
  doc/lispref/elisp.texi
  doc/lispref/intro.texi
  doc/lispref/makefile.w32-in

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2011-03-09 16:04:43 +0000
+++ b/doc/emacs/ChangeLog       2011-03-09 16:54:08 +0000
@@ -1,5 +1,10 @@
 2011-03-09  Eli Zaretskii  <address@hidden>
 
+       * 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)
 

=== modified file 'doc/emacs/ack.texi'
--- a/doc/emacs/ack.texi        2011-03-08 08:59:18 +0000
+++ b/doc/emacs/ack.texi        2011-03-09 16:54:08 +0000
@@ -1,4 +1,4 @@
address@hidden -*- coding: utf-8 -*-
address@hidden -*- 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 @@
 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 @@
 tabular data.
 
 @item
-W??odek Bzyl and Ryszard Kubiak wrote @file{ogonek.el}, a package for
address@hidden Bzyl and Ryszard Kubiak wrote @file{ogonek.el}, a package for
 changing the encoding of Polish characters.
 
 @item
@@ -191,7 +191,7 @@
 @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 @@
 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 address@hidden, a package for setting up labels and
 cross-references in address@hidden 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 @@
 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 @@
 @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 @@
 @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 @@
 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 @@
 Emacs.
 
 @item
-Karel Kl???? contributed SELinux support, for preserving the
+Karel address@hidden contributed SELinux support, for preserving the
 Security-Enchanced Linux context of files on backup and copy.
 
 @item
@@ -668,7 +668,7 @@
 creates a virtual Info manual of package keywords.
 
 @item
-K??roly L??rentey wrote the ``multi-terminal'' code, which allows Emacs to
+K?roly address@hidden wrote the ``multi-terminal'' code, which allows Emacs to
 run on graphical and text-only terminals simultaneously.
 
 @item
@@ -933,7 +933,7 @@
 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 @@
 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

=== modified file 'doc/emacs/emacs.texi'
--- a/doc/emacs/emacs.texi      2011-03-08 08:59:18 +0000
+++ b/doc/emacs/emacs.texi      2011-03-09 16:54:08 +0000
@@ -29,7 +29,7 @@
 @end quotation
 @end copying
 
address@hidden UTF-8
address@hidden ISO-8859-1
 
 @dircategory Emacs
 @direntry

=== modified file 'doc/emacs/makefile.w32-in'
--- a/doc/emacs/makefile.w32-in 2011-01-29 14:48:19 +0000
+++ b/doc/emacs/makefile.w32-in 2011-03-09 16:54:08 +0000
@@ -28,7 +28,7 @@
 
 # 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

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2011-03-08 17:33:55 +0000
+++ b/doc/lispref/ChangeLog     2011-03-09 16:54:08 +0000
@@ -1,3 +1,9 @@
+2011-03-09  Eli Zaretskii  <address@hidden>
+
+       * intro.texi (Acknowledgements): Convert to ISO-8859-1 encoding.
+
+       * makefile.w32-in (MAKEINFO_OPTS): Add --enable-encoding.
+
 2011-03-08  Glenn Morris  <address@hidden>
 
        * Makefile.in (MAKEINFO_OPTS): Add --enable-encoding.

=== modified file 'doc/lispref/elisp.texi'
--- a/doc/lispref/elisp.texi    2011-03-08 17:33:55 +0000
+++ b/doc/lispref/elisp.texi    2011-03-09 16:54:08 +0000
@@ -62,7 +62,7 @@
 @end quotation
 @end copying
 
address@hidden UTF-8
address@hidden ISO-8859-1
 
 @dircategory GNU Emacs Lisp
 @direntry

=== modified file 'doc/lispref/intro.texi'
--- a/doc/lispref/intro.texi    2011-03-08 08:59:18 +0000
+++ b/doc/lispref/intro.texi    2011-03-09 16:54:08 +0000
@@ -1,4 +1,4 @@
address@hidden -*-coding: utf-8-*-
address@hidden -*-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 @@
 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.

=== modified file 'doc/lispref/makefile.w32-in'
--- a/doc/lispref/makefile.w32-in       2011-03-06 20:11:19 +0000
+++ b/doc/lispref/makefile.w32-in       2011-03-09 16:54:08 +0000
@@ -33,7 +33,7 @@
 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.