diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-05-26 22:55:18 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-05-26 22:55:18 -0700 |
| commit | c3e7b943a041a666305a219b9cca77f715f6d63e (patch) | |
| tree | b1cdb3460b1fb183ede35a0d4d0206944f3c3b53 | |
| parent | a366fbe2b77958df12824da799d65a127b14e834 (diff) | |
| download | emacs-c3e7b943a041a666305a219b9cca77f715f6d63e.tar.gz | |
Merge from gnulib.
This incorporates:
2014-05-21 fchdir: port 'open' and 'close' redefinitions to AIX 7.1
* doc/misc/texinfo.tex, lib/openat-proc.c: Update from gnulib.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | doc/misc/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/misc/texinfo.tex | 10 | ||||
| -rw-r--r-- | lib/openat-proc.c | 8 |
4 files changed, 15 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog index 8dfffbd9ba3..28c877a18bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-05-27 Paul Eggert <eggert@cs.ucla.edu> + + Merge from gnulib, incorporating: + 2014-05-21 fchdir: port 'open' and 'close' redefinitions to AIX 7.1 + * lib/openat-proc.c: Update from gnulib. + 2014-05-26 Paul Eggert <eggert@cs.ucla.edu> Fix port to 32-bit AIX (Bug#17540). diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index ec790f1f7b0..a0aa2879b5f 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2014-05-27 Paul Eggert <eggert@cs.ucla.edu> + + * texinfo.tex: Update from gnulib. + 2014-05-26 Paul Eggert <eggert@cs.ucla.edu> Specify coding if Latin-1 Emacs would misinterpret (Bug#17575). diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex index cfb5c5607d9..6312dadbce0 100644 --- a/doc/misc/texinfo.tex +++ b/doc/misc/texinfo.tex @@ -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-05-05.10} +\def\texinfoversion{2014-05-20.16} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -8856,20 +8856,20 @@ end { \catcode`\_ = \active \globaldefs=1 -\parseargdef\documentlanguage{\begingroup - \let_=\normalunderscore % normal _ character for filenames +\parseargdef\documentlanguage{% \tex % read txi-??.tex file in plain TeX. % Read the file by the name they passed if it exists. + \let_ = \normalunderscore % normal _ character for filename test \openin 1 txi-#1.tex \ifeof 1 - \documentlanguagetrywithoutunderscore{#1_\finish}% + \documentlanguagetrywithoutunderscore #1_\finish \else \globaldefs = 1 % everything in the txi-LL files needs to persist \input txi-#1.tex \fi \closein 1 \endgroup % end raw TeX -\endgroup} +} % % If they passed de_DE, and txi-de_DE.tex doesn't exist, % try txi-de.tex. diff --git a/lib/openat-proc.c b/lib/openat-proc.c index 6a4f6ad1cf1..7b40bb8f059 100644 --- a/lib/openat-proc.c +++ b/lib/openat-proc.c @@ -32,14 +32,6 @@ #include "intprops.h" -/* The results of open() in this file are not used with fchdir, - and we do not leak fds to any single-threaded code that could use stdio, - therefore save some unnecessary work in fchdir.c. - FIXME - if the kernel ever adds support for multi-thread safety for - avoiding standard fds, then we should use open_safer. */ -#undef open -#undef close - #define PROC_SELF_FD_FORMAT "/proc/self/fd/%d/%s" #define PROC_SELF_FD_NAME_SIZE_BOUND(len) \ |