* doc/emacs/emacs.texi (Intro): Workaround makeinfo 4 @acronym bug.

Fixes: debbugs:18040

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index e2a6b627a1917d6d9c63d8de34320b8f25f0412d..3a4f67bf4b268156b34a874fc1fe52b2a813977e 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2014-07-21  Glenn Morris  <rgm@gnu.org>
+
+       * emacs.texi (Intro): Workaround makeinfo 4 @acronym bug.  (Bug#18040)
+
 2014-07-03  Juri Linkov  <juri@jurta.org>
 
        * search.texi (Regexp Search): Update lax space matching that is

diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 023974fec845f9cae8798c505dec05838a27d72b..81a7580751159b38160e9e4b22a644777a29af68 100644 (file)
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -1477,7 +1477,16 @@ Neal Ziring, Teodor Zlatanov, and Detlev Zundel.
 
   You are reading about GNU Emacs, the GNU incarnation of the
 advanced, self-documenting, customizable, extensible editor Emacs.
-(The @samp{G} in @acronym{GNU, @acronym{GNU}'s Not Unix} is not silent.)
+(The @samp{G} in
+@c Workaround makeinfo 4 bug.
+@c http://lists.gnu.org/archive/html/bug-texinfo/2004-08/msg00009.html
+@iftex
+@acronym{GNU, @acronym{GNU}'s Not Unix}
+@end iftex
+@ifnottex
+@acronym{GNU, GNU's Not Unix}
+@end ifnottex
+is not silent.)
 
   We call Emacs @dfn{advanced} because it can do much more than simple
 insertion and deletion of text.  It can control subprocesses, indent