Synch to No Gnus 200403032358.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index cdd093b..d9b3ba3 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,11 @@
+2004-03-04  Jesper Harder  <harder@ifa.au.dk>
+
+       * gnus.texi: Move @documentencoding back, and change to latin-1.
+
+       * emacs-mime.texi: do.
+
+       * infohack.el (infohack): Support @documentencoding in Emacs 21.3.
+
 2004-03-03  Jesper Harder  <harder@ifa.au.dk>
 
        * Makefile.in: Add gnus-news.

diff --git a/texi/emacs-mime.texi b/texi/emacs-mime.texi
index 25671f6..e536993 100644 (file)
--- a/texi/emacs-mime.texi
+++ b/texi/emacs-mime.texi
@@ -9,10 +9,8 @@
 @direntry
 * Emacs MIME: (emacs-mime).   The MIME de/composition library.
 @end direntry
-@iftex
-@iflatex
 @documentencoding ISO-8859-1
-@end iflatex
+@iftex
 @finalout
 @end iftex
 @setchapternewpage odd

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 9795da5..cebf1e0 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -9,10 +9,8 @@
 @direntry
 * Gnus: (gnus).         The newsreader Gnus.
 @end direntry
-@iftex
-@iflatex
 @documentencoding ISO-8859-1
-@end iflatex
+@iftex
 @finalout
 @end iftex
 @setchapternewpage odd
@@ -28286,5 +28284,5 @@ former).  The manual is unambiguous, but it can be confusing.
 
 @c Local Variables:
 @c mode: texinfo
-@c coding: utf-8
+@c coding: iso-8859-1
 @c End:

diff --git a/texi/infohack.el b/texi/infohack.el
index ad4abd0..126fbcc 100644 (file)
--- a/texi/infohack.el
+++ b/texi/infohack.el
@@ -45,6 +45,10 @@
   (let ((dest-directory default-directory)
        (max-lisp-eval-depth (max max-lisp-eval-depth 600))
        coding-system)
+    ;; Emacs 21.3 doesn't support @documentencoding
+    (unless (get 'documentencoding 'texinfo-format)
+      (put 'documentencoding 'texinfo-format 
+          'texinfo-discard-line-with-args))
     (find-file file)
     (setq buffer-read-only nil)
     (setq coding-system buffer-file-coding-system)