[Emacs-diffs] emacs-24 r117393: * doc/emacs/emacs.texi (Intro): Workaround makeinfo 4 @acronym bug.

[Glenn Morris]

------------------------------------------------------------
revno: 117393
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18040
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Sun 2014-07-20 23:31:36 -0400
message:
  * doc/emacs/emacs.texi (Intro): Workaround makeinfo 4 @acronym bug.
modified:
  doc/emacs/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-6227
  doc/emacs/emacs.texi           emacs.texi-20091113204419-o5vbwnq5f7feedwu-6246

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2014-07-03 23:52:42 +0000
+++ b/doc/emacs/ChangeLog       2014-07-21 03:31:36 +0000
@@ -1,3 +1,7 @@
+2014-07-21  Glenn Morris  <address@hidden>
+
+       * emacs.texi (Intro): Workaround makeinfo 4 @acronym bug.  (Bug#18040)
+
 2014-07-03  Juri Linkov  <address@hidden>
 
        * search.texi (Regexp Search): Update lax space matching that is

=== modified file 'doc/emacs/emacs.texi'
--- a/doc/emacs/emacs.texi      2014-06-08 00:19:17 +0000
+++ b/doc/emacs/emacs.texi      2014-07-21 03:31:36 +0000
@@ -1477,7 +1477,16 @@
 
   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
address@hidden Workaround makeinfo 4 bug.
address@hidden 
http://lists.gnu.org/archive/html/bug-texinfo/2004-08/msg00009.html
address@hidden
address@hidden, @acronym{GNU}'s Not Unix}
address@hidden iftex
address@hidden
address@hidden, GNU's Not Unix}
address@hidden 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