aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc
diff options
context:
space:
mode:
authorPaul Eggert2020-05-03 14:57:10 -0700
committerPaul Eggert2020-05-03 15:10:07 -0700
commit6bd47f4477904a55fc08345394bfab9cd7eae2eb (patch)
tree12c98d95f3e66d85164bcf3adbc8f8db1c391939 /doc/misc
parent40149b871889461713dc73634498f9d2150b0249 (diff)
downloademacs-6bd47f4477904a55fc08345394bfab9cd7eae2eb.tar.gz
emacs-6bd47f4477904a55fc08345394bfab9cd7eae2eb.zip
Update from Gnulib
This incorporates: 2020-05-03 attribute: new module 2020-04-13 explicit_bzero: improve code style 2020-04-13 explicit_bzero: On native Windows, use SecureZeroMemory 2020-04-13 explicit_bzero: use memset_s() when available 2020-04-04 maint: remove a stray inter-word space * build-aux/config.guess, build-aux/config.sub: * build-aux/gitlog-to-changelog, build-aux/update-copyright: * doc/misc/texinfo.tex, lib/explicit_bzero.c, lib/ieee754.in.h: * lib/nstrftime.c, m4/explicit_bzero.m4, m4/gnulib-common.m4: Copy from Gnulib. * lib/attribute.h: New file, copied from Gnulib. * lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
Diffstat (limited to 'doc/misc')
-rw-r--r--doc/misc/texinfo.tex45
1 files changed, 24 insertions, 21 deletions
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex
index deca5991870..427494cbbfc 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{2020-02-11.09} 6\def\texinfoversion{2020-05-02.00}
7% 7%
8% Copyright 1985, 1986, 1988, 1990-2019 Free Software Foundation, Inc. 8% Copyright 1985, 1986, 1988, 1990-2019 Free Software Foundation, Inc.
9% 9%
@@ -349,34 +349,19 @@
349 \ifodd\pageno \advance\hoffset by \bindingoffset 349 \ifodd\pageno \advance\hoffset by \bindingoffset
350 \else \advance\hoffset by -\bindingoffset\fi 350 \else \advance\hoffset by -\bindingoffset\fi
351 % 351 %
352 \checkchapterpage
353 %
352 % Retrieve the information for the headings from the marks in the page, 354 % Retrieve the information for the headings from the marks in the page,
353 % and call Plain TeX's \makeheadline and \makefootline, which use the 355 % and call Plain TeX's \makeheadline and \makefootline, which use the
354 % values in \headline and \footline. 356 % values in \headline and \footline.
355 % 357 %
356 % This is used to check if we are on the first page of a chapter.
357 \ifcase1\the\savedtopmark\fi
358 \let\prevchaptername\thischaptername
359 \ifcase0\firstmark\fi
360 \let\curchaptername\thischaptername
361 %
362 \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi
363 %
364 \ifx\curchaptername\prevchaptername
365 \let\thischapterheading\thischapter
366 \else
367 % \thischapterheading is the same as \thischapter except it is blank
368 % for the first page of a chapter. This is to prevent the chapter name
369 % being shown twice.
370 \def\thischapterheading{}%
371 \fi
372 %
373 % Common context changes for both heading and footing. 358 % Common context changes for both heading and footing.
374 % Do this outside of the \shipout so @code etc. will be expanded in 359 % Do this outside of the \shipout so @code etc. will be expanded in
375 % the headline as they should be, not taken literally (outputting ''code). 360 % the headline as they should be, not taken literally (outputting ''code).
376 \def\commonheadfootline{\let\hsize=\txipagewidth \texinfochars} 361 \def\commonheadfootline{\let\hsize=\txipagewidth \texinfochars}
377 % 362 %
363 \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi
378 \global\setbox\headlinebox = \vbox{\commonheadfootline \makeheadline}% 364 \global\setbox\headlinebox = \vbox{\commonheadfootline \makeheadline}%
379 %
380 \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi 365 \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi
381 \global\setbox\footlinebox = \vbox{\commonheadfootline \makefootline}% 366 \global\setbox\footlinebox = \vbox{\commonheadfootline \makefootline}%
382 % 367 %
@@ -423,6 +408,24 @@
423\ifr@ggedbottom \kern-\dimen@ \vfil \fi} 408\ifr@ggedbottom \kern-\dimen@ \vfil \fi}
424} 409}
425 410
411% Check if we are on the first page of a chapter.
412\def\checkchapterpage{%
413 % Get the chapter that was current at the end of the last page
414 \ifcase1\the\savedtopmark\fi
415 \let\prevchaptername\thischaptername
416 %
417 \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi
418 \let\curchaptername\thischaptername
419 %
420 \ifx\curchaptername\prevchaptername
421 \let\thischapterheading\thischapter
422 \else
423 % \thischapterheading is the same as \thischapter except it is blank
424 % for the first page of a chapter. This is to prevent the chapter name
425 % being shown twice.
426 \def\thischapterheading{}%
427 \fi
428}
426 429
427% Argument parsing 430% Argument parsing
428 431
@@ -3101,10 +3104,10 @@ end
3101 3104
3102% Allow a ragged right output to aid breaking long URL's. There can 3105% Allow a ragged right output to aid breaking long URL's. There can
3103% be a break at the \allowbreak with no extra glue (if the existing stretch in 3106% be a break at the \allowbreak with no extra glue (if the existing stretch in
3104% the line is sufficent), a break at the \penalty100 with extra glue added 3107% the line is sufficient), a break at the \penalty100 with extra glue added
3105% at the end of the line, or no break at all here. 3108% at the end of the line, or no break at all here.
3106% Changing the value of the penalty and/or the amount of stretch affects how 3109% Changing the value of the penalty and/or the amount of stretch affects how
3107% preferrable one choice is over the other. 3110% preferable one choice is over the other.
3108\def\urefallowbreak{% 3111\def\urefallowbreak{%
3109 \allowbreak 3112 \allowbreak
3110 \hskip 0pt plus 2 em\relax 3113 \hskip 0pt plus 2 em\relax