From 2e0461d24e5cd4df0de3a07665d5516a6905ca15 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 20 Jul 2014 23:31:36 -0400 Subject: [PATCH] * doc/emacs/emacs.texi (Intro): Workaround makeinfo 4 @acronym bug. --- doc/emacs/ChangeLog | 4 ++++ doc/emacs/emacs.texi | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 84d17cef84f..d5efc5a2d19 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2014-07-21 Glenn Morris + + * emacs.texi (Intro): Workaround makeinfo 4 @acronym bug. (Bug#18040) + 2014-07-03 Juri Linkov * search.texi (Regexp Search): Update lax space matching that is diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index 023974fec84..81a75807511 100644 --- 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 -- 2.11.4.GIT