diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-06-07 17:03:10 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-06-07 17:03:10 -0700 |
| commit | 0e8bbf669099d453b89e47896c8e897f390118ad (patch) | |
| tree | 5fc38d24b7451cc9b87b8e5c1ad27fb773eafad8 | |
| parent | 6fa6c4aedbc9f33cf8ed67fdb7794c3b4ff6660a (diff) | |
| download | emacs-0e8bbf669099d453b89e47896c8e897f390118ad.tar.gz | |
* texinfo.tex: Merge from gnulib.
| -rw-r--r-- | doc/misc/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/misc/texinfo.tex | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 57aa0e2651d..ccf8c4df40e 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2012-06-08 Paul Eggert <eggert@cs.ucla.edu> + + * texinfo.tex: Merge from gnulib. + 2012-05-29 Katsumi Yamaoka <yamaoka@jpl.org> * Makefile.in (echo-info): Don't try to install info files named diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex index 0f3a0960c03..a5a7b2beac7 100644 --- a/doc/misc/texinfo.tex +++ b/doc/misc/texinfo.tex @@ -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 @@ where each line of input produces a line of output.} % #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 |