aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2016-03-23 11:17:37 -0700
committerPaul Eggert2016-03-23 11:19:52 -0700
commitad250f2b673f3ca9d1e22c01ae4d0e83fabb4520 (patch)
tree2aa26f0265f03bb9b7bc3f4f04f8c63adc6d6322
parentc0165ea4d6ecf81db6728782c7322c311ee0a783 (diff)
downloademacs-ad250f2b673f3ca9d1e22c01ae4d0e83fabb4520.tar.gz
emacs-ad250f2b673f3ca9d1e22c01ae4d0e83fabb4520.zip
Sync with gnulib
This incorporates: 2016-03-22 gitlog-to-changelog: suppress ignored chatter 2016-03-21 sys_select: port to new Cygwin * build-aux/gitlog-to-changelog, doc/misc/texinfo.tex: * lib/sys_select.in.h: Copy from gnulib.
-rwxr-xr-xbuild-aux/gitlog-to-changelog19
-rw-r--r--doc/misc/texinfo.tex133
-rw-r--r--lib/sys_select.in.h10
3 files changed, 98 insertions, 64 deletions
diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog
index a2513d0efc7..83bafdffa6f 100755
--- a/build-aux/gitlog-to-changelog
+++ b/build-aux/gitlog-to-changelog
@@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" "$@"'
3 if 0; 3 if 0;
4# Convert git log output to ChangeLog format. 4# Convert git log output to ChangeLog format.
5 5
6my $VERSION = '2016-01-12 23:09'; # UTC 6my $VERSION = '2016-03-22 21:49'; # UTC
7# The definition above must lie within the first 8 lines in order 7# The definition above must lie within the first 8 lines in order
8# for the Emacs time-stamp write hook (at end) to update it. 8# for the Emacs time-stamp write hook (at end) to update it.
9# If you change this file with Emacs, please let the write hook 9# If you change this file with Emacs, please let the write hook
@@ -298,9 +298,7 @@ sub git_dir_option($)
298 { 298 {
299 if ($sha =~ /^$_/) 299 if ($sha =~ /^$_/)
300 { 300 {
301 $skipflag = 1; 301 $skipflag = $_;
302 ## Perhaps only warn if a pattern matches more than once?
303 warn "$ME: warning: skipping $sha due to $_\n";
304 last; 302 last;
305 } 303 }
306 } 304 }
@@ -386,8 +384,17 @@ sub git_dir_option($)
386 } 384 }
387 385
388 # Ignore commits that match the --ignore-matching pattern, if specified. 386 # Ignore commits that match the --ignore-matching pattern, if specified.
389 if (! ($skipflag || (defined $ignore_matching 387 if (defined $ignore_matching && @line && $line[0] =~ /$ignore_matching/)
390 && @line && $line[0] =~ /$ignore_matching/))) 388 {
389 $skipflag = 1;
390 }
391 elsif ($skipflag)
392 {
393 ## Perhaps only warn if a pattern matches more than once?
394 warn "$ME: warning: skipping $sha due to $skipflag\n";
395 }
396
397 if (! $skipflag)
391 { 398 {
392 if (defined $ignore_line && @line) 399 if (defined $ignore_line && @line)
393 { 400 {
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex
index d04e2ddd3b3..9437a4d3e31 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-03-06.18} 6\def\texinfoversion{2016-03-22.15}
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,
@@ -1513,10 +1513,27 @@ output) for that.)}
1513\fi % \ifx\pdfoutput 1513\fi % \ifx\pdfoutput
1514 1514
1515% 1515%
1516% PDF outline support for XeTeX 1516% For XeTeX
1517% 1517%
1518\newif\iftxiuseunicodedestname
1518\ifx\XeTeXrevision\thisisundefined 1519\ifx\XeTeXrevision\thisisundefined
1519\else 1520\else
1521 %
1522 % XeTeX version check
1523 %
1524 \ifnum\strcmp{\the\XeTeXversion\XeTeXrevision}{0.99995}>-1
1525 % XeTeX 0.99995+ contains xdvipdfmx 20160307+.
1526 % It can handle Unicode destination name for PDF.
1527 \txiuseunicodedestnametrue
1528 \else
1529 % XeTeX < 0.99995 can not handle Unicode destination name for PDF
1530 % because xdvipdfmx 20150315 has UTF-16 convert issue.
1531 % It fixed by xdvipdfmx 20160106 (TeX Live SVN r39753).
1532 \txiuseunicodedestnamefalse
1533 \fi
1534 %
1535 % PDF outline support
1536 %
1520 \pdfmakepagedesttrue \relax 1537 \pdfmakepagedesttrue \relax
1521 % Emulate the primitive of pdfTeX 1538 % Emulate the primitive of pdfTeX
1522 \def\pdfdest name#1 xyz{% 1539 \def\pdfdest name#1 xyz{%
@@ -1525,15 +1542,25 @@ output) for that.)}
1525 \def\pdfmkdest#1{{% 1542 \def\pdfmkdest#1{{%
1526 % We have to set dummies so commands such as @code, and characters 1543 % We have to set dummies so commands such as @code, and characters
1527 % such as \, aren't expanded when present in a section title. 1544 % such as \, aren't expanded when present in a section title.
1528 \indexnofonts % For avoiding UTF-16 convert issue of xdvipdfmx 20150315. 1545 \indexnofonts
1546 \iftxiuseunicodedestname
1547 \def\pdfdestname{#1}% Pass through Unicode characters.
1548 \else
1549 \edef\pdfdestname{#1}% Replace Unicode characters to ASCII.
1550 \fi
1551 \turnoffactive
1529 \makevalueexpandable 1552 \makevalueexpandable
1530 % In the case of XeTeX, xdvipdfmx converts strings to UTF-16. 1553 % In the case of XeTeX, xdvipdfmx converts strings to UTF-16.
1531 % Therefore \txiescapepdf is not necessary. 1554 % Therefore \txiescapepdf is not necessary.
1532 \safewhatsit{\pdfdest name{#1} xyz}% 1555 \safewhatsit{\pdfdest name{\pdfdestname} xyz}%
1533 }} 1556 }}
1534 % 1557 %
1535 \def\dopdfoutline#1#2#3#4{% 1558 \def\dopdfoutline#1#2#3#4{%
1536 \edef\pdfoutlinedest{#3}% 1559 \iftxiuseunicodedestname
1560 \def\pdfoutlinedest{#3}% Pass through Unicode characters.
1561 \else
1562 \edef\pdfoutlinedest{#3}% Replace Unicode characters to ASCII.
1563 \fi
1537 \ifx\pdfoutlinedest\empty 1564 \ifx\pdfoutlinedest\empty
1538 \def\pdfoutlinedest{#4}% 1565 \def\pdfoutlinedest{#4}%
1539 \fi 1566 \fi
@@ -1574,7 +1601,7 @@ output) for that.)}
1574 % In the case of XeTeX, xdvipdfmx converts strings to UTF-16. 1601 % In the case of XeTeX, xdvipdfmx converts strings to UTF-16.
1575 % Therefore, the encoding and the language may not be considered. 1602 % Therefore, the encoding and the language may not be considered.
1576 % 1603 %
1577 \indexnofonts % For avoiding UTF-16 convert issue of xdvipdfmx 20150315. 1604 \indexnofonts
1578 \setupdatafile 1605 \setupdatafile
1579 % We can have normal brace characters in the PDF outlines, unlike 1606 % We can have normal brace characters in the PDF outlines, unlike
1580 % Texinfo index files. So set that up. 1607 % Texinfo index files. So set that up.
@@ -1596,14 +1623,31 @@ output) for that.)}
1596 % However, due to UTF-16 convert issue of xdvipdfmx 20150315, 1623 % However, due to UTF-16 convert issue of xdvipdfmx 20150315,
1597 % ``\special{pdf:dest ...}'' can not handle non-ASCII strings. 1624 % ``\special{pdf:dest ...}'' can not handle non-ASCII strings.
1598 % It fixed by xdvipdfmx 20160106 (TeX Live SVN r39753). 1625 % It fixed by xdvipdfmx 20160106 (TeX Live SVN r39753).
1599\fi
1600
1601% 1626%
1602% @image support for XeTeX 1627 % make a live url in pdf output.
1628 \def\pdfurl#1{%
1629 \begingroup
1630 % it seems we really need yet another set of dummies; have not
1631 % tried to figure out what each command should do in the context
1632 % of @url. for now, just make @/ a no-op, that's the only one
1633 % people have actually reported a problem with.
1634 %
1635 \normalturnoffactive
1636 \def\@{@}%
1637 \let\/=\empty
1638 \makevalueexpandable
1639 % do we want to go so far as to use \indexnofonts instead of just
1640 % special-casing \var here?
1641 \def\var##1{##1}%
1642 %
1643 \leavevmode\setcolor{\urlcolor}%
1644 \special{pdf:bann << /Border [0 0 0]
1645 /Subtype /Link /A << /S /URI /URI (#1) >> >>}%
1646 \endgroup}
1647 \def\endlink{\setcolor{\maincolor}\special{pdf:eann}}
1603% 1648%
1604\newif\ifxeteximgpdf 1649 %
1605\ifx\XeTeXrevision\thisisundefined 1650 % @image support
1606\else
1607 % 1651 %
1608 % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto). 1652 % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
1609 \def\doxeteximage#1#2#3{% 1653 \def\doxeteximage#1#2#3{%
@@ -1615,7 +1659,6 @@ output) for that.)}
1615 % someone has a scalable image, presumably better to use that than a 1659 % someone has a scalable image, presumably better to use that than a
1616 % bitmap. 1660 % bitmap.
1617 \let\xeteximgext=\empty 1661 \let\xeteximgext=\empty
1618 \xeteximgpdffalse
1619 \begingroup 1662 \begingroup
1620 \openin 1 #1.pdf \ifeof 1 1663 \openin 1 #1.pdf \ifeof 1
1621 \openin 1 #1.PDF \ifeof 1 1664 \openin 1 #1.PDF \ifeof 1
@@ -1632,17 +1675,23 @@ output) for that.)}
1632 \fi 1675 \fi
1633 \else \gdef\xeteximgext{png}% 1676 \else \gdef\xeteximgext{png}%
1634 \fi 1677 \fi
1635 \else \gdef\xeteximgext{PDF} \global\xeteximgpdftrue% 1678 \else \gdef\xeteximgext{PDF}%
1636 \fi 1679 \fi
1637 \else \gdef\xeteximgext{pdf} \global\xeteximgpdftrue% 1680 \else \gdef\xeteximgext{pdf}%
1638 \fi 1681 \fi
1639 \closein 1 1682 \closein 1
1640 \endgroup 1683 \endgroup
1641 % 1684 %
1642 \ifxeteximgpdf 1685 \def\xetexpdfext{pdf}%
1686 \ifx\xeteximgext\xetexpdfext
1643 \XeTeXpdffile "#1".\xeteximgext "" 1687 \XeTeXpdffile "#1".\xeteximgext ""
1644 \else 1688 \else
1645 \XeTeXpicfile "#1".\xeteximgext "" 1689 \def\xetexpdfext{PDF}%
1690 \ifx\xeteximgext\xetexpdfext
1691 \XeTeXpdffile "#1".\xeteximgext ""
1692 \else
1693 \XeTeXpicfile "#1".\xeteximgext ""
1694 \fi
1646 \fi 1695 \fi
1647 \ifdim \wd0 >0pt width \xeteximagewidth \fi 1696 \ifdim \wd0 >0pt width \xeteximagewidth \fi
1648 \ifdim \wd2 >0pt height \xeteximageheight \fi \relax 1697 \ifdim \wd2 >0pt height \xeteximageheight \fi \relax
@@ -7804,7 +7853,7 @@ end
7804 % Process the macro body under the current catcode regime. 7853 % Process the macro body under the current catcode regime.
7805 \scantokens{#1\texinfoc}\aftermacro% 7854 \scantokens{#1\texinfoc}\aftermacro%
7806 % 7855 %
7807 % The \c is to remove the \newlinechar added by \scantokens, and 7856 % The \texinfoc is to remove the \newlinechar added by \scantokens, and
7808 % can be noticed by \parsearg. 7857 % can be noticed by \parsearg.
7809 % The \aftermacro allows a \comment at the end of the macro definition 7858 % The \aftermacro allows a \comment at the end of the macro definition
7810 % to duplicate itself past the final \newlinechar added by \scantokens: 7859 % to duplicate itself past the final \newlinechar added by \scantokens:
@@ -7817,15 +7866,7 @@ end
7817 7866
7818% Used for copying and captions 7867% Used for copying and captions
7819\def\scanexp#1{% 7868\def\scanexp#1{%
7820 \bgroup 7869 \expandafter\scanmacro\expandafter{#1}%
7821 % Undo catcode changes of \startcontents and \printindex
7822 % When called from @insertcopying or (short)caption, we need active
7823 % backslash to get it printed correctly.
7824 % FIXME: This may not be needed.
7825 %\catcode`\@=0 \catcode`\\=\active \escapechar=`\@
7826 \edef\temp{\noexpand\scanmacro{#1}}%
7827 \temp
7828 \egroup
7829} 7870}
7830 7871
7831\newcount\paramno % Count of parameters 7872\newcount\paramno % Count of parameters
@@ -9371,7 +9412,7 @@ end
9371 % 9412 %
9372 \ifx\thiscaption\empty \else 9413 \ifx\thiscaption\empty \else
9373 \ifx\floatident\empty \else 9414 \ifx\floatident\empty \else
9374 \appendtomacro\captionline{: }% had ident, so need a colon between 9415 \appendtomacro\captionline{: }% had ident, so need a colon between
9375 \fi 9416 \fi
9376 % 9417 %
9377 % caption text. 9418 % caption text.
@@ -9398,30 +9439,17 @@ end
9398 \requireauxfile 9439 \requireauxfile
9399 \atdummies 9440 \atdummies
9400 % 9441 %
9401 % since we read the caption text in the macro world, where ^^M 9442 \ifx\thisshortcaption\empty
9402 % is turned into a normal character, we have to scan it back, so 9443 \def\gtemp{\thiscaption}%
9403 % we don't write the literal three characters "^^M" into the aux file. 9444 \else
9404 \scanexp{% 9445 \def\gtemp{\thisshortcaption}%
9405 \xdef\noexpand\gtemp{% 9446 \fi
9406 \ifx\thisshortcaption\empty
9407 \thiscaption
9408 \else
9409 \thisshortcaption
9410 \fi
9411 }%
9412 }%
9413 \immediate\write\auxfile{@xrdef{\floatlabel-lof}{\floatident 9447 \immediate\write\auxfile{@xrdef{\floatlabel-lof}{\floatident
9414 \ifx\gtemp\empty \else : \gtemp \fi}}% 9448 \ifx\gtemp\empty \else : \gtemp \fi}}%
9415 }% 9449 }%
9416 \fi 9450 \fi
9417 \egroup % end of \vtop 9451 \egroup % end of \vtop
9418 % 9452 %
9419 % place the captured inserts
9420 %
9421 % BEWARE: when the floats start floating, we have to issue warning
9422 % whenever an insert appears inside a float which could possibly
9423 % float. --kasal, 26may04
9424 %
9425 \checkinserts 9453 \checkinserts
9426} 9454}
9427 9455
@@ -10865,6 +10893,10 @@ directory should work if nowhere else does.}
10865 \unicodechardefs 10893 \unicodechardefs
10866} 10894}
10867 10895
10896% Whether the active definitions of non-ASCII characters expand to
10897% non-active tokens with the same character code. This is used to
10898% write characters literally, instead of using active definitions for
10899% printing the correct glyphs.
10868\newif\ifpassthroughchars 10900\newif\ifpassthroughchars
10869\passthroughcharsfalse 10901\passthroughcharsfalse
10870 10902
@@ -10917,13 +10949,6 @@ directory should work if nowhere else does.}
10917 \relax 10949 \relax
10918} 10950}
10919 10951
10920% Whether the active definitions of non-ASCII characters expand to
10921% non-active tokens with the same character code. This is used to
10922% write characters literally, instead of using active definitions for
10923% printing the correct glyphs.
10924\newif\ifpassthroughchars
10925\passthroughcharsfalse
10926
10927% define all the unicode characters we know about, for the sake of @U. 10952% define all the unicode characters we know about, for the sake of @U.
10928\iftxinativeunicodecapable 10953\iftxinativeunicodecapable
10929 \nativeunicodechardefsatu 10954 \nativeunicodechardefsatu
diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h
index a557e04ab5d..9a2622f9789 100644
--- a/lib/sys_select.in.h
+++ b/lib/sys_select.in.h
@@ -81,8 +81,9 @@
81 of 'struct timeval', and no definition of this type. 81 of 'struct timeval', and no definition of this type.
82 Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select() 82 Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select()
83 in <sys/time.h>. 83 in <sys/time.h>.
84 But avoid namespace pollution on glibc systems. */ 84 But avoid namespace pollution on glibc systems and "unknown type
85# ifndef __GLIBC__ 85 name" problems on Cygwin. */
86# if !(defined __GLIBC__ || defined __CYGWIN__)
86# include <sys/time.h> 87# include <sys/time.h>
87# endif 88# endif
88 89
@@ -100,10 +101,11 @@
100#endif 101#endif
101 102
102/* Get definition of 'sigset_t'. 103/* Get definition of 'sigset_t'.
103 But avoid namespace pollution on glibc systems. 104 But avoid namespace pollution on glibc systems and "unknown type
105 name" problems on Cygwin.
104 Do this after the include_next (for the sake of OpenBSD 5.0) but before 106 Do this after the include_next (for the sake of OpenBSD 5.0) but before
105 the split double-inclusion guard (for the sake of Solaris). */ 107 the split double-inclusion guard (for the sake of Solaris). */
106#if !(defined __GLIBC__ && !defined __UCLIBC__) 108#if !((defined __GLIBC__ || defined __CYGWIN__) && !defined __UCLIBC__)
107# include <signal.h> 109# include <signal.h>
108#endif 110#endif
109 111