diff options
| author | Paul Eggert | 2016-01-24 14:50:47 -0800 |
|---|---|---|
| committer | Paul Eggert | 2016-01-24 14:51:22 -0800 |
| commit | 1698036a43d9e2c55ead6216ea7156df8615da47 (patch) | |
| tree | 60bb61c907536ebc38c6b301fd754028b8a9b542 /doc/misc | |
| parent | fbce4757a874cc43806eb41b8637538b101c3c69 (diff) | |
| download | emacs-1698036a43d9e2c55ead6216ea7156df8615da47.tar.gz emacs-1698036a43d9e2c55ead6216ea7156df8615da47.zip | |
Merge from gnulib
This incorporates:
2016-01-24 openat_proc_name: fix last '/' overwritten on OS/2 kLIBC
2016-01-24 closedir, dirfd, opendir: port to OpenSolaris 5.10
2016-01-15 detect utimes() correctly on OS/2 kLIBC
2016-01-15 openat_proc_name: port to OS/2 kLIBC
2016-01-14 stdint: check _INTPTR_T_DECLARED for intptr_t etc.
2016-01-14 opendir, closedir, dirfd, fdopendir: port to OS/2 kLIBC
2016-01-14 dup, dup2, fcntl: support a directory fd on OS/2 kLIBC
2016-01-14 binary-io: don't put fd in binary mode if a console on EMX
2016-01-14 sig2str: list all signals on FreeBSD >= 7
2016-01-13 acl-permissions: port to USE_ACL==0 platforms
2016-01-12 mktime: rename macro to avoid glibc clash
2016-01-12 Port "$@" to OpenIndiana ksh93
2016-01-12 Port Universal Time settings to strict POSIX
* build-aux/gitlog-to-changelog, build-aux/update-copyright:
* doc/misc/texinfo.tex, lib/acl-internal.c, lib/acl-internal.h:
* lib/binary-io.h, lib/dirent.in.h, lib/dirfd.c, lib/dup2.c:
* lib/fcntl.c, lib/fdopendir.c, lib/mktime.c, lib/openat-proc.c:
* lib/sig2str.h, lib/stdint.in.h, m4/dirfd.m4, m4/dup2.m4:
* m4/fcntl.m4, m4/utimes.m4:
Copy from gnulib.
* m4/gnulib-comp.m4: Regenerate.
Diffstat (limited to 'doc/misc')
| -rw-r--r-- | doc/misc/texinfo.tex | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex index 936c32dc5f4..8b3c9490f09 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{2016-01-11.19} | 6 | \def\texinfoversion{2016-01-20.20} |
| 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, |
| @@ -4737,11 +4737,10 @@ end | |||
| 4737 | \def\_{\normalunderscore}% | 4737 | \def\_{\normalunderscore}% |
| 4738 | \def\-{}% @- shouldn't affect sorting | 4738 | \def\-{}% @- shouldn't affect sorting |
| 4739 | % | 4739 | % |
| 4740 | \def\lbracechar{{\indexlbrace}}% | 4740 | \uccode`\1=`\{ \uppercase{\def\{{1}}% |
| 4741 | \def\rbracechar{{\indexrbrace}}% | 4741 | \uccode`\1=`\} \uppercase{\def\}{1}}% |
| 4742 | \let\{=\lbracechar | 4742 | \let\lbracechar\{ |
| 4743 | \let\}=\rbracechar | 4743 | \let\rbracechar\} |
| 4744 | % | ||
| 4745 | % | 4744 | % |
| 4746 | % Non-English letters. | 4745 | % Non-English letters. |
| 4747 | \def\AA{AA}% | 4746 | \def\AA{AA}% |
| @@ -4901,9 +4900,15 @@ end | |||
| 4901 | \indexdummies % Must do this here, since \bf, etc expand at this stage | 4900 | \indexdummies % Must do this here, since \bf, etc expand at this stage |
| 4902 | \useindexbackslash % \indexbackslash isn't defined now so it will be output | 4901 | \useindexbackslash % \indexbackslash isn't defined now so it will be output |
| 4903 | % as is; and it will print as backslash. | 4902 | % as is; and it will print as backslash. |
| 4903 | % The braces around \indexbrace are recognized by texindex. | ||
| 4904 | % | ||
| 4904 | % Get the string to sort by, by processing the index entry with all | 4905 | % Get the string to sort by, by processing the index entry with all |
| 4905 | % font commands turned off. | 4906 | % font commands turned off. |
| 4906 | {\indexnofonts | 4907 | {\indexnofonts |
| 4908 | \def\lbracechar{{\indexlbrace}}% | ||
| 4909 | \def\rbracechar{{\indexrbrace}}% | ||
| 4910 | \let\{=\lbracechar | ||
| 4911 | \let\}=\rbracechar | ||
| 4907 | \indexnonalnumdisappear | 4912 | \indexnonalnumdisappear |
| 4908 | \xdef\indexsortkey{}% | 4913 | \xdef\indexsortkey{}% |
| 4909 | \let\sortas=\indexwritesortas | 4914 | \let\sortas=\indexwritesortas |
| @@ -8526,10 +8531,6 @@ end | |||
| 8526 | }% | 8531 | }% |
| 8527 | \setcolor{\linkcolor}% | 8532 | \setcolor{\linkcolor}% |
| 8528 | \fi | 8533 | \fi |
| 8529 | % | ||
| 8530 | % Float references are printed completely differently: "Figure 1.2" | ||
| 8531 | % instead of "[somenode], p.3". We distinguish them by the | ||
| 8532 | % LABEL-title being set to a magic string. | ||
| 8533 | {% | 8534 | {% |
| 8534 | % Have to otherify everything special to allow the \csname to | 8535 | % Have to otherify everything special to allow the \csname to |
| 8535 | % include an _ in the xref name, etc. | 8536 | % include an _ in the xref name, etc. |
| @@ -8538,6 +8539,10 @@ end | |||
| 8538 | \expandafter\global\expandafter\let\expandafter\Xthisreftitle | 8539 | \expandafter\global\expandafter\let\expandafter\Xthisreftitle |
| 8539 | \csname XR#1-title\endcsname | 8540 | \csname XR#1-title\endcsname |
| 8540 | }% | 8541 | }% |
| 8542 | % | ||
| 8543 | % Float references are printed completely differently: "Figure 1.2" | ||
| 8544 | % instead of "[somenode], p.3". \iffloat distinguishes them by | ||
| 8545 | % \Xthisreftitle being set to a magic string. | ||
| 8541 | \iffloat\Xthisreftitle | 8546 | \iffloat\Xthisreftitle |
| 8542 | % If the user specified the print name (third arg) to the ref, | 8547 | % If the user specified the print name (third arg) to the ref, |
| 8543 | % print it instead of our usual "Figure 1.2". | 8548 | % print it instead of our usual "Figure 1.2". |