[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r113808: Merge from gnulib.
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] trunk r113808: Merge from gnulib. |
Date: |
Mon, 12 Aug 2013 00:52:20 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 113808
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2013-08-11 17:52:17 -0700
message:
Merge from gnulib.
This incorporates:
2013-08-11 fpending: port to recent Cygwin change to stdio_ext.h
2013-08-10 sys_time: port to OpenBSD
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
doc/misc/texinfo.tex
texinfo.tex-20091113204419-o5vbwnq5f7feedwu-6323
lib/fpending.h fpending.h-20121103185247-mt4iwdj4emfl43gz-4
lib/sys_time.in.h sys_time.in.h-20120622212453-poe1wduuhk4mz8vy-7
m4/fpending.m4 fpending.m4-20121103185247-mt4iwdj4emfl43gz-6
m4/gnulib-comp.m4 glcomp.m4-20110127072028-6mkjqxjzdsx0wp15-1
=== modified file 'ChangeLog'
--- a/ChangeLog 2013-08-12 00:04:15 +0000
+++ b/ChangeLog 2013-08-12 00:52:17 +0000
@@ -1,3 +1,9 @@
+2013-08-12 Paul Eggert <address@hidden>
+
+ Merge from gnulib, incorporating:
+ 2013-08-11 fpending: port to recent Cygwin change to stdio_ext.h
+ 2013-08-10 sys_time: port to OpenBSD
+
2013-08-12 Glenn Morris <address@hidden>
* configure.ac (etcdocdir): Rename from docdir, to avoid confusion
=== modified file 'doc/misc/texinfo.tex'
--- a/doc/misc/texinfo.tex 2013-07-03 21:07:48 +0000
+++ b/doc/misc/texinfo.tex 2013-08-12 00:52:17 +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{2013-06-23.10}
+\def\texinfoversion{2013-08-09.09}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -2377,8 +2377,10 @@
\ifx\next,%
\else\ifx\next-%
\else\ifx\next.%
+ \else\ifx\next\.%
+ \else\ifx\next\comma%
\else\ptexslash
- \fi\fi\fi
+ \fi\fi\fi\fi\fi
\aftersmartic
}
@@ -2519,7 +2521,9 @@
\ifx\codedashprev\codedash
\else \discretionary{}{}{}\fi
\fi
- \global\let\codedashprev=\next
+ % we need the space after the = for the case when \next itself is a
+ % space token; it would get swallowed otherwise. As in @code{- a}.
+ \global\let\codedashprev= \next
}
}
\def\normaldash{-}
=== modified file 'lib/fpending.h'
--- a/lib/fpending.h 2013-01-02 16:37:04 +0000
+++ b/lib/fpending.h 2013-08-12 00:52:17 +0000
@@ -20,11 +20,10 @@
#include <stddef.h>
#include <stdio.h>
+#if HAVE_STDIO_EXT_H
+# include <stdio_ext.h>
+#endif
-#if HAVE_DECL___FPENDING
-# if HAVE_STDIO_EXT_H
-# include <stdio_ext.h>
-# endif
-#else
+#ifndef __fpending
size_t __fpending (FILE *);
#endif
=== modified file 'lib/sys_time.in.h'
--- a/lib/sys_time.in.h 2013-03-24 00:49:50 +0000
+++ b/lib/sys_time.in.h 2013-08-12 00:52:17 +0000
@@ -24,11 +24,12 @@
#endif
@PRAGMA_COLUMNS@
-/* On Cygwin, <sys/time.h> includes itself recursively via <sys/select.h>.
+/* On Cygwin and on many BSDish systems, <sys/time.h> includes itself
+ recursively via <sys/select.h>.
Simply delegate to the system's header in this case; it is a no-op.
Without this extra ifdef, the C++ gettimeofday declaration below
would be a forward declaration in gnulib's nested <sys/time.h>. */
-#ifdef _CYGWIN_SYS_TIME_H
+#if defined _CYGWIN_SYS_TIME_H || defined _SYS_TIME_H || defined _SYS_TIME_H_
# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
#else
=== modified file 'm4/fpending.m4'
--- a/m4/fpending.m4 2013-01-02 16:37:04 +0000
+++ b/m4/fpending.m4 2013-08-12 00:52:17 +0000
@@ -1,4 +1,4 @@
-# serial 19
+# serial 20
# Copyright (C) 2000-2001, 2004-2013 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
@@ -16,14 +16,19 @@
AC_DEFUN([gl_FUNC_FPENDING],
[
AC_CHECK_HEADERS_ONCE([stdio_ext.h])
- AC_CHECK_FUNCS_ONCE([__fpending])
- fp_headers='
-# include <stdio.h>
-# if HAVE_STDIO_EXT_H
-# include <stdio_ext.h>
-# endif
-'
- AC_CHECK_DECLS([__fpending], , , $fp_headers)
+ AC_CACHE_CHECK([for __fpending], [gl_cv_func___fpending],
+ [
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <stdio.h>
+ #if HAVE_STDIO_EXT_H
+ # include <stdio_ext.h>
+ #endif
+ ]],
+ [[return ! __fpending (stdin);]])],
+ [gl_cv_func___fpending=yes],
+ [gl_cv_func___fpending=no])
+ ])
])
AC_DEFUN([gl_PREREQ_FPENDING],
=== modified file 'm4/gnulib-comp.m4'
--- a/m4/gnulib-comp.m4 2013-08-04 16:56:56 +0000
+++ b/m4/gnulib-comp.m4 2013-08-12 00:52:17 +0000
@@ -216,7 +216,7 @@
gl_MODULE_INDICATOR([fdopendir])
gl_FILEMODE
gl_FUNC_FPENDING
- if test $ac_cv_func___fpending = no; then
+ if test $gl_cv_func___fpending = no; then
AC_LIBOBJ([fpending])
gl_PREREQ_FPENDING
fi
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r113808: Merge from gnulib.,
Paul Eggert <=