diff options
| author | Paul Eggert | 2017-09-10 08:39:55 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-09-10 08:40:43 -0700 |
| commit | b079ee72ac25590cd8b7b185b32ea5d2d43a9909 (patch) | |
| tree | bbd4f1a2a0524ce1e380019d7d2b59a5c18f0844 /doc/misc | |
| parent | c990f8d93dcc78aa98e58b89bddb666efcea2710 (diff) | |
| download | emacs-b079ee72ac25590cd8b7b185b32ea5d2d43a9909.tar.gz emacs-b079ee72ac25590cd8b7b185b32ea5d2d43a9909.zip | |
Merge from gnulib
This incorporates:
2017-09-08 stddef: Avoid conflict with system-defined max_align_t
2017-08-24 warnings: fix compilation with old autoconf
2017-08-23 glob: merge from glibc with Zanella glob changes
2017-08-17 random: Fix test compilation failure on Cygwin 1.5.25
* doc/misc/texinfo.tex, lib/flexmember.h, lib/stddef.in.h:
* lib/stdlib.in.h, m4/manywarnings.m4, m4/stdlib_h.m4:
* m4/warnings.m4:
Copy from Gnulib.
* lib/gnulib.mk.in: Regenerate.
Diffstat (limited to 'doc/misc')
| -rw-r--r-- | doc/misc/texinfo.tex | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex index 3844333faec..a774790c511 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{2017-07-04.16} | 6 | \def\texinfoversion{2017-08-23.19} |
| 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, |
| @@ -5696,10 +5696,13 @@ end | |||
| 5696 | \advance\dimen@ii by 1\dimen@i | 5696 | \advance\dimen@ii by 1\dimen@i |
| 5697 | \ifdim\wd\boxA > \dimen@ii % If the entry doesn't fit in one line | 5697 | \ifdim\wd\boxA > \dimen@ii % If the entry doesn't fit in one line |
| 5698 | \ifdim\dimen@ > 0.8\dimen@ii % due to long index text | 5698 | \ifdim\dimen@ > 0.8\dimen@ii % due to long index text |
| 5699 | \dimen@ = 0.7\dimen@ % Try to split the text roughly evenly | 5699 | % Try to split the text roughly evenly. \dimen@ will be the length of |
| 5700 | % the first line. | ||
| 5701 | \dimen@ = 0.7\dimen@ | ||
| 5700 | \dimen@ii = \hsize | 5702 | \dimen@ii = \hsize |
| 5701 | \ifnum\dimen@>\dimen@ii | 5703 | \ifnum\dimen@>\dimen@ii |
| 5702 | % If the entry is too long, use the whole line | 5704 | % If the entry is too long (for example, if it needs more than |
| 5705 | % two lines), use all the space in the first line. | ||
| 5703 | \dimen@ = \dimen@ii | 5706 | \dimen@ = \dimen@ii |
| 5704 | \fi | 5707 | \fi |
| 5705 | \advance\leftskip by 0pt plus 1fill % ragged right | 5708 | \advance\leftskip by 0pt plus 1fill % ragged right |
| @@ -5709,8 +5712,9 @@ end | |||
| 5709 | % instead of using \parshape with explicit line lengths, but TeX | 5712 | % instead of using \parshape with explicit line lengths, but TeX |
| 5710 | % doesn't seem to provide a way to do such a thing. | 5713 | % doesn't seem to provide a way to do such a thing. |
| 5711 | % | 5714 | % |
| 5712 | \leftskip = 1em | 5715 | % Indent all lines but the first one. |
| 5713 | \parindent = -1em | 5716 | \advance\leftskip by 1em |
| 5717 | \advance\parindent by -1em | ||
| 5714 | \fi\fi | 5718 | \fi\fi |
| 5715 | \indent % start paragraph | 5719 | \indent % start paragraph |
| 5716 | \unhbox\boxA | 5720 | \unhbox\boxA |
| @@ -6943,7 +6947,15 @@ end | |||
| 6943 | % exist, with an empty box. Let's hope all the numbers have the same width. | 6947 | % exist, with an empty box. Let's hope all the numbers have the same width. |
| 6944 | % Also ignore the page number, which is conventionally not printed. | 6948 | % Also ignore the page number, which is conventionally not printed. |
| 6945 | \def\numeralbox{\setbox0=\hbox{8}\hbox to \wd0{\hfil}} | 6949 | \def\numeralbox{\setbox0=\hbox{8}\hbox to \wd0{\hfil}} |
| 6946 | \def\partentry#1#2#3#4{\dochapentry{\numeralbox\labelspace#1}{}} | 6950 | \def\partentry#1#2#3#4{% |
| 6951 | % Add stretch and a bonus for breaking the page before the part heading. | ||
| 6952 | % This reduces the chance of the page being broken immediately after the | ||
| 6953 | % part heading, before a following chapter heading. | ||
| 6954 | \vskip 0pt plus 5\baselineskip | ||
| 6955 | \penalty-300 | ||
| 6956 | \vskip 0pt plus -5\baselineskip | ||
| 6957 | \dochapentry{\numeralbox\labelspace#1}{}% | ||
| 6958 | } | ||
| 6947 | % | 6959 | % |
| 6948 | % Parts, in the short toc. | 6960 | % Parts, in the short toc. |
| 6949 | \def\shortpartentry#1#2#3#4{% | 6961 | \def\shortpartentry#1#2#3#4{% |