aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc
diff options
context:
space:
mode:
authorPaul Eggert2015-02-20 23:31:17 -0800
committerPaul Eggert2015-02-20 23:32:45 -0800
commit066b17df681fabb40108d719086669957aebbc51 (patch)
tree27f9362ed6a6e68ef6b61925932f84bb1afb37b8 /doc/misc
parent43fb42da8bd6851b5b22d2bbb5d2cd8ceede9c09 (diff)
downloademacs-066b17df681fabb40108d719086669957aebbc51.tar.gz
emacs-066b17df681fabb40108d719086669957aebbc51.zip
Merge from gnulib
* doc/misc/texinfo.tex: Update from gnulib. * lib/getdtablesize.c, lib/getopt.c, lib/signal.in.h, lib/tempname.c: * lib/tempname.h, m4/dup2.m4, m4/fcntl.m4, m4/getdtablesize.m4: Update from gnulib, incorporating: 2015-02-20 getdtablesize: port better for Android 2015-02-19 fcntl: Fix cross compiling 2015-02-18 dup2, fcntl: cross-compile better for Android 2015-02-18 getopt: don't crash on memory exhaustion 2015-02-17 tempname: allow compilation with C++ (trivial) 2015-02-17 dup2, fcntl: port to AIX 2015-02-16 getdtablesize, dup2, fcntl: port to Android 2015-02-11 getdtablesize, signal_h: Fix Android build 2015-02-11 maint: various whitespace cleanups in tempname
Diffstat (limited to 'doc/misc')
-rw-r--r--doc/misc/ChangeLog4
-rw-r--r--doc/misc/texinfo.tex55
2 files changed, 48 insertions, 11 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index c796b751f05..d04a8bbb083 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
12015-02-21 Paul Eggert <eggert@cs.ucla.edu>
2
3 * texinfo.tex: Update from gnulib.
4
12015-02-10 Lars Ingebrigtsen <larsi@gnus.org> 52015-02-10 Lars Ingebrigtsen <larsi@gnus.org>
2 6
3 * eww.texi (Basics): Mention eww-toggle-fonts. 7 * eww.texi (Basics): Mention eww-toggle-fonts.
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex
index 96b212d2ad1..8236d7d2f82 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{2015-01-31.10} 6\def\texinfoversion{2015-02-05.16}
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,
@@ -4489,7 +4489,6 @@ end
4489% Called from \indexdummies and \atdummies. 4489% Called from \indexdummies and \atdummies.
4490% 4490%
4491\def\commondummies{% 4491\def\commondummies{%
4492 %
4493 % \definedummyword defines \#1 as \string\#1\space, thus effectively 4492 % \definedummyword defines \#1 as \string\#1\space, thus effectively
4494 % preventing its expansion. This is used only for control words, 4493 % preventing its expansion. This is used only for control words,
4495 % not control letters, because the \space would be incorrect for 4494 % not control letters, because the \space would be incorrect for
@@ -4566,6 +4565,7 @@ end
4566 \definedummyword\guilsinglright 4565 \definedummyword\guilsinglright
4567 \definedummyword\lbracechar 4566 \definedummyword\lbracechar
4568 \definedummyword\leq 4567 \definedummyword\leq
4568 \definedummyword\mathopsup
4569 \definedummyword\minus 4569 \definedummyword\minus
4570 \definedummyword\ogonek 4570 \definedummyword\ogonek
4571 \definedummyword\pounds 4571 \definedummyword\pounds
@@ -4579,6 +4579,8 @@ end
4579 \definedummyword\quotesinglbase 4579 \definedummyword\quotesinglbase
4580 \definedummyword\rbracechar 4580 \definedummyword\rbracechar
4581 \definedummyword\result 4581 \definedummyword\result
4582 \definedummyword\sub
4583 \definedummyword\sup
4582 \definedummyword\textdegree 4584 \definedummyword\textdegree
4583 % 4585 %
4584 % We want to disable all macros so that they are not expanded by \write. 4586 % We want to disable all macros so that they are not expanded by \write.
@@ -4653,6 +4655,7 @@ end
4653 \definedummyword\samp 4655 \definedummyword\samp
4654 \definedummyword\strong 4656 \definedummyword\strong
4655 \definedummyword\tie 4657 \definedummyword\tie
4658 \definedummyword\U
4656 \definedummyword\uref 4659 \definedummyword\uref
4657 \definedummyword\url 4660 \definedummyword\url
4658 \definedummyword\var 4661 \definedummyword\var
@@ -8335,14 +8338,7 @@ end
8335 \catcode`\\=\other 8338 \catcode`\\=\other
8336 % 8339 %
8337 % Make the characters 128-255 be printing characters. 8340 % Make the characters 128-255 be printing characters.
8338 {% 8341 {\setnonasciicharscatcodenonglobal\other}%
8339 \count1=128
8340 \def\loop{%
8341 \catcode\count1=\other
8342 \advance\count1 by 1
8343 \ifnum \count1<256 \loop \fi
8344 }%
8345 }%
8346 % 8342 %
8347 % @ is our escape character in .aux files, and we need braces. 8343 % @ is our escape character in .aux files, and we need braces.
8348 \catcode`\{=1 8344 \catcode`\{=1
@@ -9831,15 +9827,51 @@ directory should work if nowhere else does.}
9831 \DeclareUnicodeCharacter{2261}{\equiv} 9827 \DeclareUnicodeCharacter{2261}{\equiv}
9832}% end of \utfeightchardefs 9828}% end of \utfeightchardefs
9833 9829
9834
9835% US-ASCII character definitions. 9830% US-ASCII character definitions.
9836\def\asciichardefs{% nothing need be done 9831\def\asciichardefs{% nothing need be done
9837 \relax 9832 \relax
9838} 9833}
9839 9834
9835% Latin1 (ISO-8859-1) character definitions.
9836\def\nonasciistringdefs{%
9837 \setnonasciicharscatcode\active
9838 \def\defstringchar##1{\def##1{\string##1}}%
9839 \defstringchar^^a0\defstringchar^^a1\defstringchar^^a2\defstringchar^^a3%
9840 \defstringchar^^a4\defstringchar^^a5\defstringchar^^a6\defstringchar^^a7%
9841 \defstringchar^^a8\defstringchar^^a9\defstringchar^^aa\defstringchar^^ab%
9842 \defstringchar^^ac\defstringchar^^ad\defstringchar^^ae\defstringchar^^af%
9843 %
9844 \defstringchar^^b0\defstringchar^^b1\defstringchar^^b2\defstringchar^^b3%
9845 \defstringchar^^b4\defstringchar^^b5\defstringchar^^b6\defstringchar^^b7%
9846 \defstringchar^^b8\defstringchar^^b9\defstringchar^^ba\defstringchar^^bb%
9847 \defstringchar^^bc\defstringchar^^bd\defstringchar^^be\defstringchar^^bf%
9848 %
9849 \defstringchar^^c0\defstringchar^^c1\defstringchar^^c2\defstringchar^^c3%
9850 \defstringchar^^c4\defstringchar^^c5\defstringchar^^c6\defstringchar^^c7%
9851 \defstringchar^^c8\defstringchar^^c9\defstringchar^^ca\defstringchar^^cb%
9852 \defstringchar^^cc\defstringchar^^cd\defstringchar^^ce\defstringchar^^cf%
9853 %
9854 \defstringchar^^d0\defstringchar^^d1\defstringchar^^d2\defstringchar^^d3%
9855 \defstringchar^^d4\defstringchar^^d5\defstringchar^^d6\defstringchar^^d7%
9856 \defstringchar^^d8\defstringchar^^d9\defstringchar^^da\defstringchar^^db%
9857 \defstringchar^^dc\defstringchar^^dd\defstringchar^^de\defstringchar^^df%
9858 %
9859 \defstringchar^^e0\defstringchar^^e1\defstringchar^^e2\defstringchar^^e3%
9860 \defstringchar^^e4\defstringchar^^e5\defstringchar^^e6\defstringchar^^e7%
9861 \defstringchar^^e8\defstringchar^^e9\defstringchar^^ea\defstringchar^^eb%
9862 \defstringchar^^ec\defstringchar^^ed\defstringchar^^ee\defstringchar^^ef%
9863 %
9864 \defstringchar^^f0\defstringchar^^f1\defstringchar^^f2\defstringchar^^f3%
9865 \defstringchar^^f4\defstringchar^^f5\defstringchar^^f6\defstringchar^^f7%
9866 \defstringchar^^f8\defstringchar^^f9\defstringchar^^fa\defstringchar^^fb%
9867 \defstringchar^^fc\defstringchar^^fd\defstringchar^^fe\defstringchar^^ff%
9868}
9869
9870
9840% define all the unicode characters we know about, for the sake of @U. 9871% define all the unicode characters we know about, for the sake of @U.
9841\utfeightchardefs 9872\utfeightchardefs
9842 9873
9874
9843% Make non-ASCII characters printable again for compatibility with 9875% Make non-ASCII characters printable again for compatibility with
9844% existing Texinfo documents that may use them, even without declaring a 9876% existing Texinfo documents that may use them, even without declaring a
9845% document encoding. 9877% document encoding.
@@ -10193,6 +10225,7 @@ directory should work if nowhere else does.}
10193% 10225%
10194{@catcode`- = @active 10226{@catcode`- = @active
10195 @gdef@normalturnoffactive{% 10227 @gdef@normalturnoffactive{%
10228 @nonasciistringdefs
10196 @let-=@normaldash 10229 @let-=@normaldash
10197 @let"=@normaldoublequote 10230 @let"=@normaldoublequote
10198 @let$=@normaldollar %$ font-lock fix 10231 @let$=@normaldollar %$ font-lock fix