[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114015: Minor merge from gnulib (mostly just for te
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] trunk r114015: Minor merge from gnulib (mostly just for texinfo.tex). |
Date: |
Mon, 26 Aug 2013 22:17:35 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114015
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2013-08-26 15:17:31 -0700
message:
Minor merge from gnulib (mostly just for texinfo.tex).
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
doc/misc/texinfo.tex
texinfo.tex-20091113204419-o5vbwnq5f7feedwu-6323
m4/sha256.m4 sha256.m4-20110620031515-6xi092i0qkbrr76i-1
m4/sha512.m4 sha512.m4-20110620031519-dh2hd1m84occc1jw-1
=== modified file 'ChangeLog'
--- a/ChangeLog 2013-08-22 17:35:00 +0000
+++ b/ChangeLog 2013-08-26 22:17:31 +0000
@@ -1,3 +1,7 @@
+2013-08-26 Paul Eggert <address@hidden>
+
+ Minor merge from gnulib (mostly just for texinfo.tex).
+
2013-08-22 Paul Eggert <address@hidden>
* configure.ac (EMACS_CONFIG_OPTIONS): Quote systematically (Bug#13274).
=== modified file 'doc/misc/texinfo.tex'
--- a/doc/misc/texinfo.tex 2013-08-12 00:52:17 +0000
+++ b/doc/misc/texinfo.tex 2013-08-26 22:17:31 +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{2013-08-09.09}
+\def\texinfoversion{2013-08-20.10}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -281,9 +281,9 @@
\toks6=\expandafter{\prevsectiondefs}%
\toks8=\expandafter{\lastcolordefs}%
\mark{%
- \the\toks0 \the\toks2
- \noexpand\or \the\toks4 \the\toks6
- \noexpand\else \the\toks8
+ \the\toks0 \the\toks2 % 0: top marks (\last...)
+ \noexpand\or \the\toks4 \the\toks6 % 1: bottom marks (default, \prev...)
+ \noexpand\else \the\toks8 % 2: color marks
}%
}
% \topmark doesn't work for the very first chapter (after the title
@@ -5909,7 +5909,7 @@
%
% Now the second mark, after the heading break. No break points
% between here and the heading.
- \let\prevsectiondefs=\lastsectiondefs
+ \global\let\prevsectiondefs=\lastsectiondefs
\domark
%
% Only insert the space after the number if we have a section number.
=== modified file 'm4/sha256.m4'
--- a/m4/sha256.m4 2013-01-02 16:37:04 +0000
+++ b/m4/sha256.m4 2013-08-26 22:17:31 +0000
@@ -1,4 +1,4 @@
-# sha256.m4 serial 6
+# sha256.m4 serial 7
dnl Copyright (C) 2005, 2008-2013 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -8,4 +8,5 @@
[
dnl Prerequisites of lib/sha256.c.
AC_REQUIRE([gl_BIGENDIAN])
+ :
])
=== modified file 'm4/sha512.m4'
--- a/m4/sha512.m4 2013-01-02 16:37:04 +0000
+++ b/m4/sha512.m4 2013-08-26 22:17:31 +0000
@@ -1,4 +1,4 @@
-# sha512.m4 serial 7
+# sha512.m4 serial 8
dnl Copyright (C) 2005-2006, 2008-2013 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -8,4 +8,5 @@
[
dnl Prerequisites of lib/sha512.c.
AC_REQUIRE([gl_BIGENDIAN])
+ :
])
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114015: Minor merge from gnulib (mostly just for texinfo.tex).,
Paul Eggert <=