[Emacs-diffs] master 0041ce8: Update from gnulib

[Paul Eggert]

branch: master
commit 0041ce81897ef837d04674b634720645379f3b18
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Update from gnulib
    
    This incorporates:
    2016-09-22 stdint: port to GCC 7
    2016-09-22 limits-h, stdint: don't assume extensions
    * doc/misc/texinfo.tex, m4/limits-h.m4, m4/stdint.m4: Copy from gnulib.
---
 doc/misc/texinfo.tex |   76 ++++++++++++++++----------------------------------
 m4/limits-h.m4       |    4 ++-
 m4/stdint.m4         |    8 ++++--
 3 files changed, 33 insertions(+), 55 deletions(-)

diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex
index 3d41530..c8913ab 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{2016-09-18.11}
+\def\texinfoversion{2016-09-18.18}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -2296,7 +2296,7 @@ end
 \font\ssecsy=cmsy10 scaled 1315
 \def\ssececsize{1200}
 
-% Reduced fonts for @acro in text (10pt).
+% Reduced fonts for @acronym in text (10pt).
 \def\reducednominalsize{10pt}
 \setfont\reducedrm\rmshape{10}{1000}{OT1}
 \setfont\reducedtt\ttshape{10}{1000}{OT1TT}
@@ -2429,7 +2429,7 @@ end
 \font\ssecsy=cmsy10
 \def\ssececsize{1000}
 
-% Reduced fonts for @acro in text (9pt).
+% Reduced fonts for @acronym in text (9pt).
 \def\reducednominalsize{9pt}
 \setfont\reducedrm\rmshape{9}{1000}{OT1}
 \setfont\reducedtt\ttshape{9}{1000}{OT1TT}
@@ -2564,56 +2564,28 @@ end
    \csname\curfontstyle\endcsname
 }%
 
-\def\textfonts{%
-  \def\curfontsize{text}%
-  \def\lsize{reduced}\def\lllsize{smaller}%
-  \rmisboldfalse
-  \assignfonts{text}%
-  \resetmathfonts \setleading{\textleading}}
-\def\titlefonts{%
-  \def\curfontsize{title}%
-  \def\lsize{chap}\def\lllsize{subsec}%
-  \rmisboldtrue
-  \assignfonts{title}%
-  \resetmathfonts \setleading{27pt}}
+\def\definefontsetatsize#1#2#3#4#5{%
+\expandafter\def\csname #1fonts\endcsname{%
+  \def\curfontsize{#1}%
+  \def\lsize{#2}\def\lllsize{#3}%
+  \csname rmisbold#5\endcsname
+  \assignfonts{#1}%
+  \resetmathfonts
+  \setleading{#4}%
+}}
+
+\definefontsetatsize{text}   {reduced}{smaller}{\textleading}{false}
+\definefontsetatsize{title}  {chap}   {subsec} {27pt}  {true}
+\definefontsetatsize{chap}   {sec}    {text}   {19pt}  {true}
+\definefontsetatsize{sec}    {subsec} {reduced}{17pt}  {true}
+\definefontsetatsize{ssec}   {text}   {small}  {15pt}  {true}
+\definefontsetatsize{reduced}{small}  {smaller}{10.5pt}{false}
+\definefontsetatsize{small}  {smaller}{smaller}{10.5pt}{false}
+\definefontsetatsize{smaller}{smaller}{smaller}{9.5pt} {false}
+
 \def\titlefont#1{{\titlefonts\rm #1}}
-\def\chapfonts{%
-  \def\curfontsize{chap}%
-  \def\lsize{sec}\def\lllsize{text}%
-  \rmisboldtrue
-  \assignfonts{chap}%
-  \resetmathfonts \setleading{19pt}}
-\def\secfonts{%
-  \def\curfontsize{sec}%
-  \def\lsize{subsec}\def\lllsize{reduced}%
-  \rmisboldtrue
-  \assignfonts{sec}%
-  \resetmathfonts \setleading{17pt}}
-\def\subsecfonts{%
-  \def\curfontsize{ssec}%
-  \def\lsize{text}\def\lllsize{small}%
-  \rmisboldtrue
-  \assignfonts{ssec}%
-  \resetmathfonts \setleading{15pt}}
-\let\subsubsecfonts = \subsecfonts
-\def\reducedfonts{%
-  \def\curfontsize{reduced}%
-  \def\lsize{small}\def\lllsize{smaller}%
-  \rmisboldfalse
-  \assignfonts{reduced}%
-  \resetmathfonts \setleading{10.5pt}}
-\def\smallfonts{%
-  \def\curfontsize{small}%
-  \def\lsize{smaller}\def\lllsize{smaller}%
-  \rmisboldfalse
-  \assignfonts{small}%
-  \resetmathfonts \setleading{10.5pt}}
-\def\smallerfonts{%
-  \def\curfontsize{smaller}%
-  \def\lsize{smaller}\def\lllsize{smaller}%
-  \rmisboldfalse
-  \assignfonts{smaller}%
-  \resetmathfonts \setleading{9.5pt}}
+\let\subsecfonts = \ssecfonts
+\let\subsubsecfonts = \ssecfonts
 
 % Define these just so they can be easily changed for other fonts.
 \def\angleleft{$\langle$}
diff --git a/m4/limits-h.m4 b/m4/limits-h.m4
index 9130786..31fdf0a 100644
--- a/m4/limits-h.m4
+++ b/m4/limits-h.m4
@@ -14,7 +14,9 @@ AC_DEFUN_ONCE([gl_LIMITS_H],
   AC_CACHE_CHECK([whether limits.h has ULLONG_WIDTH etc.],
     [gl_cv_header_limits_width],
     [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM([[#define __STDC_WANT_IEC_60559_BFP_EXT__ 1
+       [AC_LANG_PROGRAM([[#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+                           #define __STDC_WANT_IEC_60559_BFP_EXT__ 1
+                          #endif
                           #include <limits.h>
                           int ullw = ULLONG_WIDTH;]])],
        [gl_cv_header_limits_width=yes],
diff --git a/m4/stdint.m4 b/m4/stdint.m4
index 52f7814..fa6f103 100644
--- a/m4/stdint.m4
+++ b/m4/stdint.m4
@@ -1,4 +1,4 @@
-# stdint.m4 serial 45
+# stdint.m4 serial 47
 dnl Copyright (C) 2001-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -321,6 +321,9 @@ int32_t i32 = INT32_C (0x7fffffff);
          [AC_LANG_PROGRAM([[
             /* Work if build is not clean.  */
             #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1
+            #ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+             #define __STDC_WANT_IEC_60559_BFP_EXT__ 1
+            #endif
             #include <stdint.h>
             ]gl_STDINT_INCLUDES[
             int iw = UINTMAX_WIDTH;
@@ -343,7 +346,8 @@ int32_t i32 = INT32_C (0x7fffffff);
   fi
 
   # The substitute stdint.h needs the substitute limit.h's _GL_INTEGER_WIDTH.
-  test -z "$STDINT_H" || LIMITS_H=limits.h
+  LIMITS_H=limits.h
+  AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"])
 
   AC_SUBST([HAVE_C99_STDINT_H])
   AC_SUBST([HAVE_SYS_BITYPES_H])