[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108515: * texinfo.tex: Merge from gnulib.

[Paul Eggert]

------------------------------------------------------------
revno: 108515
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Thu 2012-06-07 17:03:10 -0700
message:
  * texinfo.tex: Merge from gnulib.
modified:
  doc/misc/ChangeLog
  doc/misc/texinfo.tex

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2012-05-29 05:19:41 +0000
+++ b/doc/misc/ChangeLog        2012-06-08 00:03:10 +0000
@@ -1,3 +1,7 @@
+2012-06-08  Paul Eggert  <address@hidden>
+
+       * texinfo.tex: Merge from gnulib.
+
 2012-05-29  Katsumi Yamaoka  <address@hidden>
 
        * Makefile.in (echo-info): Don't try to install info files named

=== modified file 'doc/misc/texinfo.tex'
--- a/doc/misc/texinfo.tex      2012-05-26 23:14:36 +0000
+++ b/doc/misc/texinfo.tex      2012-06-08 00:03:10 +0000
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2012-05-16.16}
+\def\texinfoversion{2012-06-05.14}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -1117,7 +1117,7 @@
 % #1 is a control sequence in which to do the replacements,
 % which we \xdef.
 \def\txiescapepdf#1{%
-  \ifx\pdfescapestring\relax
+  \ifx\pdfescapestring\thisisundefined
     % No primitive available; should we give a warning or log?
     % Many times it won't matter.
   \else