[Emacs-diffs] trunk r116278: Merge from gnulib.

[Paul Eggert]

------------------------------------------------------------
revno: 116278
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Wed 2014-02-05 11:41:03 -0800
message:
  Merge from gnulib.
  
  This incorporates:
  
  2014-01-23 pthread: work around winpthread header pollution on mingw
  * lib/time.in.h: Update from gnulib.
  
  * doc/misc/texinfo.tex: Update from texinfo.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  doc/misc/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-6331
  doc/misc/texinfo.tex           
texinfo.tex-20091113204419-o5vbwnq5f7feedwu-6323
  lib/time.in.h                  time.in.h-20110109015304-wm32754z0gtdsh7e-8

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-01-23 02:48:44 +0000
+++ b/ChangeLog 2014-02-05 19:41:03 +0000
@@ -1,3 +1,9 @@
+2014-02-05  Paul Eggert  <address@hidden>
+
+       Merge from gnulib, incorporating:
+       2014-01-23 pthread: work around winpthread header pollution on mingw
+       * lib/time.in.h: Update from gnulib.
+
 2014-01-23  Paul Eggert  <address@hidden>
 
        Merge from gnulib, incorporating:

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2014-02-05 08:35:24 +0000
+++ b/doc/misc/ChangeLog        2014-02-05 19:41:03 +0000
@@ -1,3 +1,7 @@
+2014-02-05  Paul Eggert  <address@hidden>
+
+       * texinfo.tex: Update from gnulib.
+
 2014-02-05  Glenn Morris  <address@hidden>
 
        * epa.texi: Add indices.

=== modified file 'doc/misc/texinfo.tex'
--- a/doc/misc/texinfo.tex      2014-01-20 20:48:14 +0000
+++ b/doc/misc/texinfo.tex      2014-02-05 19:41:03 +0000
@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2014-01-16.10}
+\def\texinfoversion{2014-01-30.15}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -4649,6 +4649,16 @@
   \definedummyword\verb
   \definedummyword\w
   \definedummyword\xref
+  %
+  % Consider:
+  %   @macro mkind{arg1,arg2}
+  %   @cindex \arg2\
+  %   @end macro
+  %   @mkind{foo, bar}
+  % The space after the comma will end up in the temporary definition
+  % that we make for arg2 (see \parsemargdef ff.).  We want all this to be
+  % expanded for the sake of the index, so we end up just seeing "bar".
+  \let\xeatspaces = \eatspaces
 }
 
 % \indexnofonts is used when outputting the strings to sort the index
@@ -7474,7 +7484,7 @@
 
 % Parse the optional {params} list.  Set up \paramno and \paramlist
 % so \defmacro knows what to do.  Define \macarg.BLAH for each BLAH
-% in the params list to some hook where the argument si to be expanded.  If
+% in the params list to some hook where the argument is to be expanded.  If
 % there are less than 10 arguments that hook is to be replaced by ##N where N
 % is the position in that list, that is to say the macro arguments are to be
 % defined `a la TeX in the macro body.  

=== modified file 'lib/time.in.h'
--- a/lib/time.in.h     2014-01-01 07:43:34 +0000
+++ b/lib/time.in.h     2014-02-05 19:41:03 +0000
@@ -48,20 +48,13 @@
 
 /* Some systems don't define struct timespec (e.g., AIX 4.1, Ultrix 4.3).
    Or they define it with the wrong member names or define it in <sys/time.h>
-   (e.g., FreeBSD circa 1997).  Stock Mingw does not define it, but the
-   pthreads-win32 library defines it in <pthread.h>.  */
+   (e.g., FreeBSD circa 1997).  Stock Mingw prior to 3.0 does not define it,
+   but the pthreads-win32 library defines it in <pthread.h>.  */
 # if ! @TIME_H_DEFINES_STRUCT_TIMESPEC@
 #  if @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
 #   include <sys/time.h>
 #  elif @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
 #   include <pthread.h>
-/* The pthreads-win32 <pthread.h> also defines a couple of broken macros.  */
-#   undef asctime_r
-#   undef ctime_r
-#   undef gmtime_r
-#   undef localtime_r
-#   undef rand_r
-#   undef strtok_r
 #  else
 
 #   ifdef __cplusplus