From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 23 Oct 2006 06:21:53 +0000 (+0000)
Subject: Import this change from Texinfo:
X-Git-Tag: AUTOCONF-2.60b~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12308e1b8131ef176da3cd08d6fb77dccdee59a3;p=thirdparty%2Fautoconf.git

Import this change from Texinfo:
2006-10-15  Karl Berry  <karl@gnu.org>
* build-aux/texinfo.tex: automake 1.10
---

diff --git a/ChangeLog b/ChangeLog
index 1d94d2f9c..07b3b661a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-10-22  Paul Eggert  <eggert@cs.ucla.edu>
 
+	Import this change from Texinfo:
+	2006-10-15  Karl Berry  <karl@gnu.org>
+	* build-aux/texinfo.tex: automake 1.10
+
 	* NEWS: Remove AC_CACHE_CHECK_INT.
 	* doc/autoconf.texi (Caching Results): Likewise.
 	* lib/autoconf/general.m4 (_AC_CACHE_CHECK_INT): Renamed from
diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex
index 808362235..ab95370db 100644
--- a/build-aux/texinfo.tex
+++ b/build-aux/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{2006-10-04.17}
+\def\texinfoversion{2006-10-15.13}
 %
 % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free
@@ -2015,6 +2015,7 @@ where each line of input produces a line of output.}
      \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
     \kern-0.4pt\hrule}%
   \kern-.06em\raise0.4pt\hbox{\angleright}}}}
+\def\key #1{{\nohyphenation \uppercase{#1}}\null}
 % The old definition, with no lozenge:
 %\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null}
 \def\ctrl #1{{\tt \rawbackslash \hat}#1}