[Emacs-diffs] /srv/bzr/emacs/trunk r103195: Sync texinfo.tex and sed-related fixes from gnulib.

[Paul Eggert]

------------------------------------------------------------
revno: 103195
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2011-02-08 17:40:01 -0800
message:
  Sync texinfo.tex and sed-related fixes from gnulib.
modified:
  ChangeLog
  doc/misc/ChangeLog
  doc/misc/texinfo.tex
  lib/Makefile.in
  lib/gnulib.mk

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-02-08 21:42:56 +0000
+++ b/ChangeLog 2011-02-09 01:40:01 +0000
@@ -1,3 +1,12 @@
+2011-02-09  Paul Eggert  <address@hidden>
+
+       * lib/Makefile.in, lib/gnulib.mk: Regenerate.
+       This merges the following fix from gnulib:
+
+       2011-02-08  Bruno Haible  <address@hidden>
+
+       Split large sed scripts, for HP-UX sed.
+
 2011-02-08  Tom Tromey  <address@hidden>
 
        * configure: Rebuild.

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2011-02-07 09:21:08 +0000
+++ b/doc/misc/ChangeLog        2011-02-09 01:40:01 +0000
@@ -1,3 +1,7 @@
+2011-02-09  Paul Eggert  <address@hidden>
+
+       * texinfo.tex: Update to version 2011-02-07.16.
+
 2011-02-07  Michael Albinus  <address@hidden>
 
        * dbus.texi (Bus names): Adapt descriptions for

=== modified file 'doc/misc/texinfo.tex'
--- a/doc/misc/texinfo.tex      2011-02-03 19:29:10 +0000
+++ b/doc/misc/texinfo.tex      2011-02-09 01:40:01 +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{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 @@
   \gdef^^b9{$^1$}
   \gdef^^ba{\ordm}
   %
-  \gdef^^bb{\guilletright}
+  \gdef^^bb{\guillemetright}
   \gdef^^bc{$1\over4$}
   \gdef^^bd{$1\over2$}
   \gdef^^be{$3\over4$}

=== modified file 'lib/Makefile.in'
--- a/lib/Makefile.in   2011-02-06 22:13:03 +0000
+++ b/lib/Makefile.in   2011-02-09 01:40:01 +0000
@@ -307,6 +307,7 @@
 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 @@
              -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' \

=== modified file 'lib/gnulib.mk'
--- a/lib/gnulib.mk     2011-02-06 22:13:03 +0000
+++ b/lib/gnulib.mk     2011-02-09 01:40:01 +0000
@@ -327,7 +327,8 @@
              -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' \