diff options
| author | Paul Eggert | 2015-05-27 17:46:15 -0700 |
|---|---|---|
| committer | Paul Eggert | 2015-05-27 17:55:06 -0700 |
| commit | 6c52e9b93b68795d1876718d8f3c1d57bf7f6d91 (patch) | |
| tree | b2d93b1121c05cfffa59df9325139cdf56eed6c0 /doc | |
| parent | cc41938ae0f5694d657f360f19dd9ac166271db2 (diff) | |
| download | emacs-6c52e9b93b68795d1876718d8f3c1d57bf7f6d91.tar.gz emacs-6c52e9b93b68795d1876718d8f3c1d57bf7f6d91.zip | |
Merge from gnulib
This incorporates:
2015-05-27 qacl: Reimplement qset_acl and qcopy_acl (Bug#20666)
2015-05-27 file-has-acl: Split feature tests again (Bug#20667)
2015-05-27 string: fix build failure on BSD/OSX with FORTIFY_SOURCE
2015-05-26 stdio: limit __gnu_printf__ witness to gcc 4.4+
2015-05-26 inttypes: force correct mingw PRIdMAX even without <stdio.h>
2015-05-26 stdio: fix probe on mingw under gcc 5.1
* admin/merge-gnulib (GNULIB_MODULES):
Replace qacl with qcopy-acl, since we don't need the rest of qacl.
* doc/misc/texinfo.tex, lib/acl-internal.c, lib/acl-internal.h:
* lib/inttypes.in.h, lib/qcopy-acl.c, lib/qset-acl.c:
* lib/string.in.h, m4/acl.m4, m4/stdio_h.m4:
Get latest versions from gnulib.
* lib/get-permissions.c, lib/set-permissions.c: New files.
* lib/gnulib.mk, m4/gnulib-comp.m4:
Regenerate.
* nt/gnulib.mk: Merge lib/gnulib.mk changes by hand.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/misc/texinfo.tex | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex index 152e9853485..4b4856469a8 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-05-06.11} | 6 | \def\texinfoversion{2015-05-26.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, |
| @@ -8954,7 +8954,6 @@ directory should work if nowhere else does.} | |||
| 8954 | \catcode\count255=#1\relax | 8954 | \catcode\count255=#1\relax |
| 8955 | \advance\count255 by 1 | 8955 | \advance\count255 by 1 |
| 8956 | \repeat | 8956 | \repeat |
| 8957 | |||
| 8958 | } | 8957 | } |
| 8959 | 8958 | ||
| 8960 | % @documentencoding sets the definition of non-ASCII characters | 8959 | % @documentencoding sets the definition of non-ASCII characters |