diff options
| author | Paul Eggert | 2018-03-07 17:55:44 -0800 |
|---|---|---|
| committer | Paul Eggert | 2018-03-07 17:56:28 -0800 |
| commit | bb1309f1eb7651b41f2b6b7fb97ddb86bb82160c (patch) | |
| tree | 001c7043f496575a590372c217015f6e1f9fed72 | |
| parent | 1ac190553886ff20817d3dd218464e2fc6f9e42a (diff) | |
| download | emacs-bb1309f1eb7651b41f2b6b7fb97ddb86bb82160c.tar.gz emacs-bb1309f1eb7651b41f2b6b7fb97ddb86bb82160c.zip | |
Update from Gnulib
This includes:
2018-03-07 maint: write-file-hooks -> before-save-hook
2018-03-05 binary-io: pacify gcc -Wunused-parameter
2018-03-05 fflush: adjust to glibc 2.28 libio.h removal
* build-aux/config.guess, build-aux/config.sub:
* build-aux/gitlog-to-changelog, build-aux/install-sh:
* build-aux/move-if-change, build-aux/update-copyright:
* doc/misc/texinfo.tex, lib/binary-io.h, lib/fpending.c:
* lib/stdio-impl.h: Copy from Gnulib.
| -rwxr-xr-x | build-aux/config.guess | 10 | ||||
| -rwxr-xr-x | build-aux/config.sub | 6 | ||||
| -rwxr-xr-x | build-aux/gitlog-to-changelog | 4 | ||||
| -rwxr-xr-x | build-aux/install-sh | 4 | ||||
| -rwxr-xr-x | build-aux/move-if-change | 4 | ||||
| -rwxr-xr-x | build-aux/update-copyright | 4 | ||||
| -rw-r--r-- | doc/misc/texinfo.tex | 4 | ||||
| -rw-r--r-- | lib/binary-io.h | 6 | ||||
| -rw-r--r-- | lib/fpending.c | 2 | ||||
| -rw-r--r-- | lib/stdio-impl.h | 6 |
10 files changed, 25 insertions, 25 deletions
diff --git a/build-aux/config.guess b/build-aux/config.guess index f50dcdb6de2..256083a70d3 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Attempt to guess a canonical system name. | 2 | # Attempt to guess a canonical system name. |
| 3 | # Copyright 1992-2018 Free Software Foundation, Inc. | 3 | # Copyright 1992-2018 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | timestamp='2018-02-24' | 5 | timestamp='2018-03-08' |
| 6 | 6 | ||
| 7 | # This file is free software; you can redistribute it and/or modify it | 7 | # This file is free software; you can redistribute it and/or modify it |
| 8 | # under the terms of the GNU General Public License as published by | 8 | # under the terms of the GNU General Public License as published by |
| @@ -1046,11 +1046,7 @@ EOF | |||
| 1046 | echo "$UNAME_MACHINE"-dec-linux-"$LIBC" | 1046 | echo "$UNAME_MACHINE"-dec-linux-"$LIBC" |
| 1047 | exit ;; | 1047 | exit ;; |
| 1048 | x86_64:Linux:*:*) | 1048 | x86_64:Linux:*:*) |
| 1049 | if objdump -f /bin/sh | grep -q elf32-x86-64; then | 1049 | echo "$UNAME_MACHINE"-pc-linux-"$LIBC" |
| 1050 | echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32 | ||
| 1051 | else | ||
| 1052 | echo "$UNAME_MACHINE"-pc-linux-"$LIBC" | ||
| 1053 | fi | ||
| 1054 | exit ;; | 1050 | exit ;; |
| 1055 | xtensa*:Linux:*:*) | 1051 | xtensa*:Linux:*:*) |
| 1056 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" | 1052 | echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
| @@ -1473,7 +1469,7 @@ EOF | |||
| 1473 | exit 1 | 1469 | exit 1 |
| 1474 | 1470 | ||
| 1475 | # Local variables: | 1471 | # Local variables: |
| 1476 | # eval: (add-hook 'write-file-functions 'time-stamp) | 1472 | # eval: (add-hook 'before-save-hook 'time-stamp) |
| 1477 | # time-stamp-start: "timestamp='" | 1473 | # time-stamp-start: "timestamp='" |
| 1478 | # time-stamp-format: "%:y-%02m-%02d" | 1474 | # time-stamp-format: "%:y-%02m-%02d" |
| 1479 | # time-stamp-end: "'" | 1475 | # time-stamp-end: "'" |
diff --git a/build-aux/config.sub b/build-aux/config.sub index 1d8e98bcee2..9ccf09a7a33 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Configuration validation subroutine script. | 2 | # Configuration validation subroutine script. |
| 3 | # Copyright 1992-2018 Free Software Foundation, Inc. | 3 | # Copyright 1992-2018 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | timestamp='2018-02-22' | 5 | timestamp='2018-03-08' |
| 6 | 6 | ||
| 7 | # This file is free software; you can redistribute it and/or modify it | 7 | # This file is free software; you can redistribute it and/or modify it |
| 8 | # under the terms of the GNU General Public License as published by | 8 | # under the terms of the GNU General Public License as published by |
| @@ -1376,7 +1376,7 @@ case $os in | |||
| 1376 | | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | 1376 | | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ |
| 1377 | | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | 1377 | | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ |
| 1378 | | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | 1378 | | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ |
| 1379 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | 1379 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \ |
| 1380 | | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ | 1380 | | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ |
| 1381 | | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | 1381 | | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
| 1382 | | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | 1382 | | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ |
| @@ -1794,7 +1794,7 @@ echo "$basic_machine$os" | |||
| 1794 | exit | 1794 | exit |
| 1795 | 1795 | ||
| 1796 | # Local variables: | 1796 | # Local variables: |
| 1797 | # eval: (add-hook 'write-file-functions 'time-stamp) | 1797 | # eval: (add-hook 'before-save-hook 'time-stamp) |
| 1798 | # time-stamp-start: "timestamp='" | 1798 | # time-stamp-start: "timestamp='" |
| 1799 | # time-stamp-format: "%:y-%02m-%02d" | 1799 | # time-stamp-format: "%:y-%02m-%02d" |
| 1800 | # time-stamp-end: "'" | 1800 | # time-stamp-end: "'" |
diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog index d8074aadabf..1e73f4214f7 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 | ||
| 6 | my $VERSION = '2017-09-13 06:45'; # UTC | 6 | my $VERSION = '2018-03-07 03:47'; # 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 |
| @@ -491,7 +491,7 @@ sub git_dir_option($) | |||
| 491 | # Local Variables: | 491 | # Local Variables: |
| 492 | # mode: perl | 492 | # mode: perl |
| 493 | # indent-tabs-mode: nil | 493 | # indent-tabs-mode: nil |
| 494 | # eval: (add-hook 'write-file-hooks 'time-stamp) | 494 | # eval: (add-hook 'before-save-hook 'time-stamp) |
| 495 | # time-stamp-start: "my $VERSION = '" | 495 | # time-stamp-start: "my $VERSION = '" |
| 496 | # time-stamp-format: "%:y-%02m-%02d %02H:%02M" | 496 | # time-stamp-format: "%:y-%02m-%02d %02H:%02M" |
| 497 | # time-stamp-time-zone: "UTC0" | 497 | # time-stamp-time-zone: "UTC0" |
diff --git a/build-aux/install-sh b/build-aux/install-sh index ac159ceda40..5f3d36cb761 100755 --- a/build-aux/install-sh +++ b/build-aux/install-sh | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #!/bin/sh | 1 | #!/bin/sh |
| 2 | # install - install a program, script, or datafile | 2 | # install - install a program, script, or datafile |
| 3 | 3 | ||
| 4 | scriptversion=2017-09-23.17; # UTC | 4 | scriptversion=2018-03-07.03; # UTC |
| 5 | 5 | ||
| 6 | # This originates from X11R5 (mit/util/scripts/install.sh), which was | 6 | # This originates from X11R5 (mit/util/scripts/install.sh), which was |
| 7 | # later released in X11R6 (xc/config/util/install.sh) with the | 7 | # later released in X11R6 (xc/config/util/install.sh) with the |
| @@ -501,7 +501,7 @@ do | |||
| 501 | done | 501 | done |
| 502 | 502 | ||
| 503 | # Local variables: | 503 | # Local variables: |
| 504 | # eval: (add-hook 'write-file-hooks 'time-stamp) | 504 | # eval: (add-hook 'before-save-hook 'time-stamp) |
| 505 | # time-stamp-start: "scriptversion=" | 505 | # time-stamp-start: "scriptversion=" |
| 506 | # time-stamp-format: "%:y-%02m-%02d.%02H" | 506 | # time-stamp-format: "%:y-%02m-%02d.%02H" |
| 507 | # time-stamp-time-zone: "UTC0" | 507 | # time-stamp-time-zone: "UTC0" |
diff --git a/build-aux/move-if-change b/build-aux/move-if-change index f15923613c8..5da3eae80ae 100755 --- a/build-aux/move-if-change +++ b/build-aux/move-if-change | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Like mv $1 $2, but if the files are the same, just delete $1. | 2 | # Like mv $1 $2, but if the files are the same, just delete $1. |
| 3 | # Status is zero if successful, nonzero otherwise. | 3 | # Status is zero if successful, nonzero otherwise. |
| 4 | 4 | ||
| 5 | VERSION='2017-09-13 06:45'; # UTC | 5 | VERSION='2018-03-07 03:47'; # UTC |
| 6 | # The definition above must lie within the first 8 lines in order | 6 | # The definition above must lie within the first 8 lines in order |
| 7 | # for the Emacs time-stamp write hook (at end) to update it. | 7 | # for the Emacs time-stamp write hook (at end) to update it. |
| 8 | # If you change this file with Emacs, please let the write hook | 8 | # If you change this file with Emacs, please let the write hook |
| @@ -75,7 +75,7 @@ else | |||
| 75 | fi | 75 | fi |
| 76 | 76 | ||
| 77 | ## Local Variables: | 77 | ## Local Variables: |
| 78 | ## eval: (add-hook 'write-file-hooks 'time-stamp) | 78 | ## eval: (add-hook 'before-save-hook 'time-stamp) |
| 79 | ## time-stamp-start: "VERSION='" | 79 | ## time-stamp-start: "VERSION='" |
| 80 | ## time-stamp-format: "%:y-%02m-%02d %02H:%02M" | 80 | ## time-stamp-format: "%:y-%02m-%02d %02H:%02M" |
| 81 | ## time-stamp-time-zone: "UTC0" | 81 | ## time-stamp-time-zone: "UTC0" |
diff --git a/build-aux/update-copyright b/build-aux/update-copyright index 3bb26abea1b..f2fc97e368f 100755 --- a/build-aux/update-copyright +++ b/build-aux/update-copyright | |||
| @@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -wS -0777 -pi "$0" "$@"' | |||
| 3 | if 0; | 3 | if 0; |
| 4 | # Update an FSF copyright year list to include the current year. | 4 | # Update an FSF copyright year list to include the current year. |
| 5 | 5 | ||
| 6 | my $VERSION = '2018-01-04.14:48'; # UTC | 6 | my $VERSION = '2018-03-07.03:47'; # UTC |
| 7 | 7 | ||
| 8 | # Copyright (C) 2009-2018 Free Software Foundation, Inc. | 8 | # Copyright (C) 2009-2018 Free Software Foundation, Inc. |
| 9 | # | 9 | # |
| @@ -269,7 +269,7 @@ else | |||
| 269 | # coding: utf-8 | 269 | # coding: utf-8 |
| 270 | # mode: perl | 270 | # mode: perl |
| 271 | # indent-tabs-mode: nil | 271 | # indent-tabs-mode: nil |
| 272 | # eval: (add-hook 'write-file-hooks 'time-stamp) | 272 | # eval: (add-hook 'before-save-hook 'time-stamp) |
| 273 | # time-stamp-start: "my $VERSION = '" | 273 | # time-stamp-start: "my $VERSION = '" |
| 274 | # time-stamp-format: "%:y-%02m-%02d.%02H:%02M" | 274 | # time-stamp-format: "%:y-%02m-%02d.%02H:%02M" |
| 275 | # time-stamp-time-zone: "UTC0" | 275 | # time-stamp-time-zone: "UTC0" |
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex index 0af2f09b527..ac5c1d922ec 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{2018-02-24.16} | 6 | \def\texinfoversion{2018-02-12.17} |
| 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, |
| @@ -182,7 +182,7 @@ | |||
| 182 | % Hyphenation fixes. | 182 | % Hyphenation fixes. |
| 183 | \hyphenation{ | 183 | \hyphenation{ |
| 184 | Flor-i-da Ghost-script Ghost-view Mac-OS Post-Script | 184 | Flor-i-da Ghost-script Ghost-view Mac-OS Post-Script |
| 185 | ap-pen-dix bit-map bit-maps | 185 | auto-ma-ti-cal-ly ap-pen-dix bit-map bit-maps |
| 186 | data-base data-bases eshell fall-ing half-way long-est man-u-script | 186 | data-base data-bases eshell fall-ing half-way long-est man-u-script |
| 187 | man-u-scripts mini-buf-fer mini-buf-fers over-view par-a-digm | 187 | man-u-scripts mini-buf-fer mini-buf-fers over-view par-a-digm |
| 188 | par-a-digms rath-er rec-tan-gu-lar ro-bot-ics se-vere-ly set-up spa-ces | 188 | par-a-digms rath-er rec-tan-gu-lar ro-bot-ics se-vere-ly set-up spa-ces |
diff --git a/lib/binary-io.h b/lib/binary-io.h index cce1301d56c..1f21fc051f6 100644 --- a/lib/binary-io.h +++ b/lib/binary-io.h | |||
| @@ -47,10 +47,8 @@ _GL_INLINE_HEADER_BEGIN | |||
| 47 | /* Use a function rather than a macro, to avoid gcc warnings | 47 | /* Use a function rather than a macro, to avoid gcc warnings |
| 48 | "warning: statement with no effect". */ | 48 | "warning: statement with no effect". */ |
| 49 | BINARY_IO_INLINE int | 49 | BINARY_IO_INLINE int |
| 50 | __gl_setmode (int fd, int mode) | 50 | __gl_setmode (int fd _GL_UNUSED, int mode _GL_UNUSED) |
| 51 | { | 51 | { |
| 52 | (void) fd; | ||
| 53 | (void) mode; | ||
| 54 | return O_BINARY; | 52 | return O_BINARY; |
| 55 | } | 53 | } |
| 56 | #endif | 54 | #endif |
| @@ -59,7 +57,7 @@ __gl_setmode (int fd, int mode) | |||
| 59 | extern int __gl_setmode_check (int); | 57 | extern int __gl_setmode_check (int); |
| 60 | #else | 58 | #else |
| 61 | BINARY_IO_INLINE int | 59 | BINARY_IO_INLINE int |
| 62 | __gl_setmode_check (int fd) { return 0; } | 60 | __gl_setmode_check (int fd _GL_UNUSED) { return 0; } |
| 63 | #endif | 61 | #endif |
| 64 | 62 | ||
| 65 | /* Set FD's mode to MODE, which should be either O_TEXT or O_BINARY. | 63 | /* Set FD's mode to MODE, which should be either O_TEXT or O_BINARY. |
diff --git a/lib/fpending.c b/lib/fpending.c index c84e3a5b4ec..789f50e4e4b 100644 --- a/lib/fpending.c +++ b/lib/fpending.c | |||
| @@ -32,7 +32,7 @@ __fpending (FILE *fp) | |||
| 32 | /* Most systems provide FILE as a struct and the necessary bitmask in | 32 | /* Most systems provide FILE as a struct and the necessary bitmask in |
| 33 | <stdio.h>, because they need it for implementing getc() and putc() as | 33 | <stdio.h>, because they need it for implementing getc() and putc() as |
| 34 | fast macros. */ | 34 | fast macros. */ |
| 35 | #if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ | 35 | #if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ |
| 36 | return fp->_IO_write_ptr - fp->_IO_write_base; | 36 | return fp->_IO_write_ptr - fp->_IO_write_base; |
| 37 | #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ | 37 | #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ |
| 38 | /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ | 38 | /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ |
diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h index 78d896e9f55..05c5752a243 100644 --- a/lib/stdio-impl.h +++ b/lib/stdio-impl.h | |||
| @@ -18,6 +18,12 @@ | |||
| 18 | the same implementation of stdio extension API, except that some fields | 18 | the same implementation of stdio extension API, except that some fields |
| 19 | have different naming conventions, or their access requires some casts. */ | 19 | have different naming conventions, or their access requires some casts. */ |
| 20 | 20 | ||
| 21 | /* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this | ||
| 22 | problem by defining it ourselves. FIXME: Do not rely on glibc | ||
| 23 | internals. */ | ||
| 24 | #if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN | ||
| 25 | # define _IO_IN_BACKUP 0x100 | ||
| 26 | #endif | ||
| 21 | 27 | ||
| 22 | /* BSD stdio derived implementations. */ | 28 | /* BSD stdio derived implementations. */ |
| 23 | 29 | ||