mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-28 19:42:02 +00:00
af32fa9562
This simplifies time conversions in other time zones. It also prevents display-time-world tampering with TZ (Bug#21020). * admin/admin.el (add-release-logs): Use improved add-log-time-format API. * admin/merge-gnulib (GNULIB_MODULES): Add time_rz, timegm. (GNULIB_TOOL_FLAGS): Avoid flexmember, setenv, unsetenv. * configure.ac (tzalloc): Remove test for this, since Emacs no longer uses HAVE_TZALLOC directly. * doc/lispref/os.texi (Time of Day, Time Conversion) (Time Parsing): * etc/NEWS: Document the new behavior. Merge from gnulib, incorporating: 2015-07-25 strftime: fix newly-introduced bug on Solaris 2015-07-23 fprintftime, strftime: use timezone_t args * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate. * lib/strftime.c, lib/strftime.h, lib/time.in.h, m4/sys_time_h.m4: * m4/time_h.m4: Update from gnulib. * lib/time_rz.c, lib/timegm.c, m4/time_rz.m4, m4/timegm.m4: New files from gnulib. * lisp/time-stamp.el (time-stamp-string): * lisp/time.el (display-time-world-list) (display-time-world-display): Use new API, with time zone arg. * lisp/time.el (display-time-world-display): Fix race when current-time advances while we're running. * lisp/vc/add-log.el (add-log-iso8601-time-zone) (add-log-iso8601-time-string): Accept optional time zone arg. * lisp/vc/add-log.el (add-change-log-entry): * lisp/vc/log-edit.el (log-edit-changelog-ours-p): Use new arg. * nt/gnulib.mk: Propagate lib/gnulib.mk changes here. Add rules for the time module, since they're now needed for tzalloc etc. * src/conf_post.h (getenv_TZ, setenv_TZ): New macros. (emacs_getenv_TZ, emacs_setenv_TZ): New decls. * src/editfns.c: Include errno.h. (set_time_zone_rule): Omit unnecessary forward decl. (initial_tz): Remove, replacing with ... (local_tz, wall_clock_tz, utc_tz): New static vars and constants. (tzeqlen): New constant; prefer it to (sizeof "TZ=" - 1). (emacs_localtime_rz, emacs_mktime_z, xtzalloc, xtzfree) (tzlookup): New static functions. (init_editfns): New arg DUMPING. All uses changed. (init_editfns): Omit most initialization if dumping, not if !initialized. Initialize wall_clock_tz and local_tz. (emacs_nmemftime, format_time_string): Time zone argument can now be any time zone, not just a boolean for UTC or local time. All callers changed. (Fformat_time_string, Fencode_time, Fcurrent_time_string) (Fcurrent_time_zone): New optional arg ZONE. (Fdecode_time, Fset_time_zone_rule): ZONE arg can now also take the same form as with the other new additions. (decode_time_zone): Remove; no longer needed. (tzvalbuf): Now file-scope. (emacs_getenv_TZ, emacs_setenv_TZ): New functions. (syms_of_editfns): Define Qwall. * src/editfns.c (mktime_z) [!HAVE_TZALLOC]: * src/systime.h (mktime_z, timezone_t, tzalloc, tzfree) [!HAVE_TZALLOC]: Remove; now supplied by gnulib. * src/emacs.c (main): * src/lisp.h (init_editfns): Adjust to init_editfns API change.
102 lines
3.2 KiB
Bash
Executable File
102 lines
3.2 KiB
Bash
Executable File
#! /bin/sh
|
|
# Merge gnulib sources into Emacs sources.
|
|
# Typical usage:
|
|
#
|
|
# admin/merge-gnulib
|
|
|
|
# Copyright 2012-2015 Free Software Foundation, Inc.
|
|
|
|
# This file is part of GNU Emacs.
|
|
|
|
# GNU Emacs is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
|
|
# GNU Emacs is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
# written by Paul Eggert
|
|
|
|
GNULIB_URL=git://git.savannah.gnu.org/gnulib.git
|
|
|
|
GNULIB_MODULES='
|
|
alloca-opt binary-io byteswap c-ctype c-strcase
|
|
careadlinkat close-stream count-one-bits count-trailing-zeros
|
|
crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512
|
|
dtoastr dtotimespec dup2 environ execinfo faccessat
|
|
fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync
|
|
getloadavg getopt-gnu gettime gettimeofday gitlog-to-changelog
|
|
intprops largefile lstat
|
|
manywarnings memrchr mkostemp mktime
|
|
pipe2 pselect pthread_sigmask putenv qcopy-acl readlink readlinkat
|
|
sig2str socklen stat-time stdalign stddef stdio
|
|
stpcpy strftime strtoimax strtoumax symlink sys_stat
|
|
sys_time time time_r time_rz timegm timer-time timespec-add timespec-sub
|
|
unsetenv update-copyright utimens
|
|
vla warnings
|
|
'
|
|
|
|
GNULIB_TOOL_FLAGS='
|
|
--avoid=close --avoid=dup
|
|
--avoid=fchdir --avoid=flexmember --avoid=fstat
|
|
--avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow
|
|
--avoid=open --avoid=openat-die --avoid=opendir
|
|
--avoid=raise
|
|
--avoid=save-cwd --avoid=select --avoid=setenv --avoid=sigprocmask
|
|
--avoid=stdarg --avoid=stdbool
|
|
--avoid=threadlib --avoid=unsetenv
|
|
--conditional-dependencies --import --no-changelog --no-vc-files
|
|
--makefile-name=gnulib.mk
|
|
'
|
|
|
|
# The source directory, with a trailing '/'.
|
|
# If empty, the source directory is the working directory.
|
|
src=$2
|
|
case $src in
|
|
*/ | '') ;;
|
|
*) src=$src/ ;;
|
|
esac
|
|
|
|
# Gnulib's source directory.
|
|
gnulib_srcdir=${1-$src../gnulib}
|
|
|
|
case $gnulib_srcdir in
|
|
-*) src=- ;;
|
|
esac
|
|
case $src in
|
|
-*)
|
|
echo >&2 "$0: usage: $0 [GNULIB_SRCDIR [SRCDIR]]
|
|
|
|
SRCDIR is the Emacs source directory (default: working directory).
|
|
GNULIB_SRCDIR is the Gnulib source directory (default: SRCDIR/../gnulib)."
|
|
exit 1 ;;
|
|
esac
|
|
|
|
test -x "$src"autogen.sh || {
|
|
echo >&2 "$0: '${src:-.}' is not an Emacs source directory."
|
|
exit 1
|
|
}
|
|
|
|
test -d "$gnulib_srcdir" ||
|
|
git clone -- "$GNULIB_URL" "$gnulib_srcdir" ||
|
|
exit
|
|
|
|
test -x "$gnulib_srcdir"/gnulib-tool || {
|
|
echo >&2 "$0: '$gnulib_srcdir' is not a Gnulib source directory."
|
|
exit 1
|
|
}
|
|
|
|
"$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS $GNULIB_MODULES &&
|
|
rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 "$src"m4/gl-openssl.m4 \
|
|
"$src"m4/gnulib-cache.m4"$src" m4/warn-on-use.m4 &&
|
|
cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc &&
|
|
cp -- "$gnulib_srcdir"/build-aux/move-if-change "$src"build-aux &&
|
|
{ test -z "$src" || cd "$src"; } &&
|
|
./autogen.sh
|