[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r116087: Merge from gnulib.
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] trunk r116087: Merge from gnulib. |
Date: |
Mon, 20 Jan 2014 20:48:17 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116087
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2014-01-20 12:48:14 -0800
message:
Merge from gnulib.
This incorporates:
2014-01-20 stdalign: port to HP-UX compilers
2014-01-16 strtoimax: port to platforms lacking 'long long'
2014-01-16 update from texinfo
* doc/misc/texinfo.tex, lib/stdalign.in.h, lib/strtoimax.c:
Update from gnulib.
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
doc/misc/texinfo.tex
texinfo.tex-20091113204419-o5vbwnq5f7feedwu-6323
lib/stdalign.in.h stdalign.in.h-20120526231328-c130r2vqzi9ra04n-1
lib/strtoimax.c strtoimax.c-20110421191200-5ih8ukr2dul27ngf-3
=== modified file 'ChangeLog'
--- a/ChangeLog 2014-01-12 18:11:49 +0000
+++ b/ChangeLog 2014-01-20 20:48:14 +0000
@@ -1,3 +1,12 @@
+2014-01-20 Paul Eggert <address@hidden>
+
+ Merge from gnulib, incorporating:
+ 2014-01-20 stdalign: port to HP-UX compilers
+ 2014-01-16 strtoimax: port to platforms lacking 'long long'
+ 2014-01-16 update from texinfo
+ * doc/misc/texinfo.tex, lib/stdalign.in.h, lib/strtoimax.c:
+ Update from gnulib.
+
2014-01-12 Glenn Morris <address@hidden>
* README: Replace reference to etc/MAILINGLISTS.
=== modified file 'doc/misc/texinfo.tex'
--- a/doc/misc/texinfo.tex 2014-01-11 07:01:30 +0000
+++ b/doc/misc/texinfo.tex 2014-01-20 20:48:14 +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{2014-01-06.16}
+\def\texinfoversion{2014-01-16.10}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -8334,8 +8334,9 @@
%
% Auto-number footnotes. Otherwise like plain.
\gdef\footnote{%
- %\let\indent=\ptexindent
- %\let\noindent=\ptexnoindent
+ \let\indent=\ptexindent
+ \let\noindent=\ptexnoindent
+ %
\global\advance\footnoteno by address@hidden
\edef\thisfootno{$^{\the\footnoteno}$}%
%
@@ -8359,6 +8360,11 @@
%
\gdef\dofootnote{%
\insert\footins\bgroup
+ %
+ % Nested footnotes are not supported in TeX, that would take a lot
+ % more work. (\startsavinginserts does not suffice.)
+ \let\footnote=\errfootnote
+ %
% We want to typeset this text as a normal paragraph, even if the
% footnote reference occurs in (for example) a display environment.
% So reset some parameters.
@@ -8396,13 +8402,19 @@
}
}%end \catcode address@hidden
+\def\errfootnote{%
+ \errhelp=\EMsimple
+ \errmessage{Nested footnotes not supported in texinfo.tex,
+ even though they work in makeinfo; sorry}
+}
+
% In case a @footnote appears in a vbox, save the footnote text and create
% the real \insert just after the vbox finished. Otherwise, the insertion
% would be lost.
% Similarly, if a @footnote appears inside an alignment, save the footnote
% text to a box and make the \insert when a row of the table is finished.
% And the same can be done for other insert classes. --kasal, 16nov03.
-
+%
% Replace the \insert primitive by a cheating macro.
% Deeper inside, just make sure that the saved insertions are not spilled
% out prematurely.
=== modified file 'lib/stdalign.in.h'
--- a/lib/stdalign.in.h 2014-01-01 07:43:34 +0000
+++ b/lib/stdalign.in.h 2014-01-20 20:48:14 +0000
@@ -95,7 +95,8 @@
#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112
# if defined __cplusplus && 201103 <= __cplusplus
# define _Alignas(a) alignas (a)
-# elif __GNUC__ || __IBMC__ || __IBMCPP__ || __ICC || 0x5110 <= __SUNPRO_C
+# elif (__GNUC__ || __HP_cc || __HP_aCC || __IBMC__ || __IBMCPP__ \
+ || __ICC || 0x5110 <= __SUNPRO_C)
# define _Alignas(a) __attribute__ ((__aligned__ (a)))
# elif 1300 <= _MSC_VER
# define _Alignas(a) __declspec (align (a))
=== modified file 'lib/strtoimax.c'
--- a/lib/strtoimax.c 2014-01-01 07:43:34 +0000
+++ b/lib/strtoimax.c 2014-01-20 20:48:14 +0000
@@ -28,20 +28,24 @@
#include "verify.h"
#ifdef UNSIGNED
-# ifndef HAVE_DECL_STRTOULL
+# if HAVE_UNSIGNED_LONG_LONG_INT
+# ifndef HAVE_DECL_STRTOULL
"this configure-time declaration test was not run"
-# endif
-# if !HAVE_DECL_STRTOULL && HAVE_UNSIGNED_LONG_LONG_INT
+# endif
+# if !HAVE_DECL_STRTOULL
unsigned long long int strtoull (char const *, char **, int);
+# endif
# endif
#else
-# ifndef HAVE_DECL_STRTOLL
+# if HAVE_LONG_LONG_INT
+# ifndef HAVE_DECL_STRTOLL
"this configure-time declaration test was not run"
-# endif
-# if !HAVE_DECL_STRTOLL && HAVE_LONG_LONG_INT
+# endif
+# if !HAVE_DECL_STRTOLL
long long int strtoll (char const *, char **, int);
+# endif
# endif
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r116087: Merge from gnulib.,
Paul Eggert <=