From caf825516ab00bd6d111b5a901f36a5c5839b6d7 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 8 Feb 2011 17:40:01 -0800 Subject: [PATCH] Sync texinfo.tex and sed-related fixes from gnulib. --- ChangeLog | 9 +++++++++ doc/misc/ChangeLog | 4 ++++ doc/misc/texinfo.tex | 4 ++-- lib/Makefile.in | 4 +++- lib/gnulib.mk | 3 ++- 5 files changed, 20 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b250e89ed..8b7b674470 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2011-02-09 Paul Eggert + + * lib/Makefile.in, lib/gnulib.mk: Regenerate. + This merges the following fix from gnulib: + + 2011-02-08 Bruno Haible + + Split large sed scripts, for HP-UX sed. + 2011-02-08 Tom Tromey * configure: Rebuild. diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 53109fe794..61e05aaf33 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2011-02-09 Paul Eggert + + * texinfo.tex: Update to version 2011-02-07.16. + 2011-02-07 Michael Albinus * dbus.texi (Bus names): Adapt descriptions for diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex index 94d71885d0..1fe8a1872f 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{2011-02-01.10} +\def\texinfoversion{2011-02-07.16} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -8360,7 +8360,7 @@ directory should work if nowhere else does.} \gdef^^b9{$^1$} \gdef^^ba{\ordm} % - \gdef^^bb{\guilletright} + \gdef^^bb{\guillemetright} \gdef^^bc{$1\over4$} \gdef^^bd{$1\over2$} \gdef^^be{$3\over4$} diff --git a/lib/Makefile.in b/lib/Makefile.in index e50f9b31ef..fa2de9192a 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -307,6 +307,7 @@ NEXT_STDDEF_H = @NEXT_STDDEF_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NS_OBJ = @NS_OBJ@ +NS_OBJC_OBJ = @NS_OBJC_OBJ@ NS_SUPPORT = @NS_SUPPORT@ OBJEXT = @OBJEXT@ OLDXMENU = @OLDXMENU@ @@ -939,7 +940,8 @@ unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \ -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ - -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ + | \ + sed -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ diff --git a/lib/gnulib.mk b/lib/gnulib.mk index af628c8d30..ad4de074c5 100644 --- a/lib/gnulib.mk +++ b/lib/gnulib.mk @@ -327,7 +327,8 @@ unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \ -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ - -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ + | \ + sed -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ -- 2.20.1