diff options
| author | Paul Eggert | 2014-12-11 23:16:37 -0800 |
|---|---|---|
| committer | Paul Eggert | 2014-12-12 16:04:10 -0800 |
| commit | b81a1837916a7f3f7abd953338302fa237a532f2 (patch) | |
| tree | eab3a9abb613126d80773cc6dd04d3a7b9f22ad3 /doc/misc | |
| parent | 074965f9355b7cc7f7a5f4385a19433e51c8afd2 (diff) | |
| download | emacs-b81a1837916a7f3f7abd953338302fa237a532f2.tar.gz emacs-b81a1837916a7f3f7abd953338302fa237a532f2.zip | |
Merge from gnulib
2014-12-12 stddef: support C11's max_align_t
2014-12-08 apply _GL_ATTRIBUTE_PURE to some inline functions
2014-12-02 support GNU format printf and scanf on mingw
* doc/misc/texinfo.tex, lib/stat-time.h, lib/stddef.in.h:
* lib/timespec.h, m4/extensions.m4, m4/stddef_h.m4, m4/stdio_h.m4:
Update from gnulib.
* lib/gnulib.mk: Regenerate.
Diffstat (limited to 'doc/misc')
| -rw-r--r-- | doc/misc/texinfo.tex | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex index 72c8cf4eed7..54cf66787d5 100644 --- a/doc/misc/texinfo.tex +++ b/doc/misc/texinfo.tex | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | % Load plain if necessary, i.e., if running under initex. | 3 | % Load plain if necessary, i.e., if running under initex. |
| 4 | \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi | 4 | \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi |
| 5 | % | 5 | % |
| 6 | \def\texinfoversion{2014-10-29.10} | 6 | \def\texinfoversion{2014-11-14.07} |
| 7 | % | 7 | % |
| 8 | % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, | 8 | % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, |
| 9 | % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, | 9 | % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, |
| @@ -1010,24 +1010,15 @@ where each line of input produces a line of output.} | |||
| 1010 | % paragraph. | 1010 | % paragraph. |
| 1011 | % | 1011 | % |
| 1012 | \gdef\dosuppressfirstparagraphindent{% | 1012 | \gdef\dosuppressfirstparagraphindent{% |
| 1013 | \gdef\indent{% | 1013 | \gdef\indent {\restorefirstparagraphindent \indent}% |
| 1014 | \restorefirstparagraphindent | 1014 | \gdef\noindent{\restorefirstparagraphindent \noindent}% |
| 1015 | \indent | 1015 | \global\everypar = {\kern -\parindent \restorefirstparagraphindent}% |
| 1016 | }% | ||
| 1017 | \gdef\noindent{% | ||
| 1018 | \restorefirstparagraphindent | ||
| 1019 | \noindent | ||
| 1020 | }% | ||
| 1021 | \global\everypar = {% | ||
| 1022 | \kern -\parindent | ||
| 1023 | \restorefirstparagraphindent | ||
| 1024 | }% | ||
| 1025 | } | 1016 | } |
| 1026 | 1017 | % | |
| 1027 | \gdef\restorefirstparagraphindent{% | 1018 | \gdef\restorefirstparagraphindent{% |
| 1028 | \global \let \indent = \ptexindent | 1019 | \global\let\indent = \ptexindent |
| 1029 | \global \let \noindent = \ptexnoindent | 1020 | \global\let\noindent = \ptexnoindent |
| 1030 | \global \everypar = {}% | 1021 | \global\everypar = {}% |
| 1031 | } | 1022 | } |
| 1032 | 1023 | ||
| 1033 | 1024 | ||
| @@ -5801,6 +5792,7 @@ end | |||
| 5801 | % | 5792 | % |
| 5802 | {% | 5793 | {% |
| 5803 | \chapfonts \rmisbold | 5794 | \chapfonts \rmisbold |
| 5795 | \let\footnote=\errfootnoteheading % give better error message | ||
| 5804 | % | 5796 | % |
| 5805 | % Have to define \lastsection before calling \donoderef, because the | 5797 | % Have to define \lastsection before calling \donoderef, because the |
| 5806 | % xref code eventually uses it. On the other hand, it has to be called | 5798 | % xref code eventually uses it. On the other hand, it has to be called |
| @@ -5912,6 +5904,7 @@ end | |||
| 5912 | \ifx\temptype\Yomitfromtockeyword\else | 5904 | \ifx\temptype\Yomitfromtockeyword\else |
| 5913 | \checkenv{}% non-@*heading should not be in an environment. | 5905 | \checkenv{}% non-@*heading should not be in an environment. |
| 5914 | \fi | 5906 | \fi |
| 5907 | \let\footnote=\errfootnoteheading | ||
| 5915 | % | 5908 | % |
| 5916 | % Switch to the right set of fonts. | 5909 | % Switch to the right set of fonts. |
| 5917 | \csname #2fonts\endcsname \rmisbold | 5910 | \csname #2fonts\endcsname \rmisbold |
| @@ -8368,9 +8361,6 @@ end | |||
| 8368 | % | 8361 | % |
| 8369 | % Auto-number footnotes. Otherwise like plain. | 8362 | % Auto-number footnotes. Otherwise like plain. |
| 8370 | \gdef\footnote{% | 8363 | \gdef\footnote{% |
| 8371 | \let\indent=\ptexindent | ||
| 8372 | \let\noindent=\ptexnoindent | ||
| 8373 | % | ||
| 8374 | \global\advance\footnoteno by \@ne | 8364 | \global\advance\footnoteno by \@ne |
| 8375 | \edef\thisfootno{$^{\the\footnoteno}$}% | 8365 | \edef\thisfootno{$^{\the\footnoteno}$}% |
| 8376 | % | 8366 | % |
| @@ -8397,7 +8387,7 @@ end | |||
| 8397 | % | 8387 | % |
| 8398 | % Nested footnotes are not supported in TeX, that would take a lot | 8388 | % Nested footnotes are not supported in TeX, that would take a lot |
| 8399 | % more work. (\startsavinginserts does not suffice.) | 8389 | % more work. (\startsavinginserts does not suffice.) |
| 8400 | \let\footnote=\errfootnote | 8390 | \let\footnote=\errfootnotenest |
| 8401 | % | 8391 | % |
| 8402 | % We want to typeset this text as a normal paragraph, even if the | 8392 | % We want to typeset this text as a normal paragraph, even if the |
| 8403 | % footnote reference occurs in (for example) a display environment. | 8393 | % footnote reference occurs in (for example) a display environment. |
| @@ -8436,12 +8426,17 @@ end | |||
| 8436 | } | 8426 | } |
| 8437 | }%end \catcode `\@=11 | 8427 | }%end \catcode `\@=11 |
| 8438 | 8428 | ||
| 8439 | \def\errfootnote{% | 8429 | \def\errfootnotenest{% |
| 8440 | \errhelp=\EMsimple | 8430 | \errhelp=\EMsimple |
| 8441 | \errmessage{Nested footnotes not supported in texinfo.tex, | 8431 | \errmessage{Nested footnotes not supported in texinfo.tex, |
| 8442 | even though they work in makeinfo; sorry} | 8432 | even though they work in makeinfo; sorry} |
| 8443 | } | 8433 | } |
| 8444 | 8434 | ||
| 8435 | \def\errfootnoteheading{% | ||
| 8436 | \errhelp=\EMsimple | ||
| 8437 | \errmessage{Footnotes in chapters, sections, etc., are not supported} | ||
| 8438 | } | ||
| 8439 | |||
| 8445 | % In case a @footnote appears in a vbox, save the footnote text and create | 8440 | % In case a @footnote appears in a vbox, save the footnote text and create |
| 8446 | % the real \insert just after the vbox finished. Otherwise, the insertion | 8441 | % the real \insert just after the vbox finished. Otherwise, the insertion |
| 8447 | % would be lost. | 8442 | % would be lost. |