Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
12c4970d
Commit
12c4970d
authored
Aug 26, 2013
by
Paul Eggert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor merge from gnulib (mostly just for texinfo.tex).
parent
f462f075
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
7 deletions
+13
-7
ChangeLog
ChangeLog
+4
-0
doc/misc/texinfo.tex
doc/misc/texinfo.tex
+5
-5
m4/sha256.m4
m4/sha256.m4
+2
-1
m4/sha512.m4
m4/sha512.m4
+2
-1
No files found.
ChangeLog
View file @
12c4970d
2013-08-26 Paul Eggert <eggert@cs.ucla.edu>
Minor merge from gnulib (mostly just for texinfo.tex).
2013-08-22 Paul Eggert <eggert@cs.ucla.edu>
* configure.ac (EMACS_CONFIG_OPTIONS): Quote systematically (Bug#13274).
...
...
doc/misc/texinfo.tex
View file @
12c4970d
...
...
@@ -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 @@
\toks
6=
\expandafter
{
\prevsectiondefs
}
%
\toks
8=
\expandafter
{
\lastcolordefs
}
%
\mark
{
%
\the\toks
0
\the\toks
2
\noexpand\or
\the\toks
4
\the\toks
6
\noexpand\else
\the\toks
8
\the\toks
0
\the\toks
2
% 0: top marks (\last...)
\noexpand\or
\the\toks
4
\the\toks
6
% 1: bottom marks (default, \prev...)
\noexpand\else
\the\toks
8
% 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.
...
...
m4/sha256.m4
View file @
12c4970d
# 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 @@ AC_DEFUN([gl_SHA256],
[
dnl Prerequisites of lib/sha256.c.
AC_REQUIRE([gl_BIGENDIAN])
:
])
m4/sha512.m4
View file @
12c4970d
# 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 @@ AC_DEFUN([gl_SHA512],
[
dnl Prerequisites of lib/sha512.c.
AC_REQUIRE([gl_BIGENDIAN])
:
])
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment