I wanted to make a change to the bootstrap script but every time I saved
the file Emacs would open a new window with an annoying warning. This is
because of the following change documented in Emac's etc/NEWS:
*** Some historical 'time-stamp' conversions now warn.
'time-stamp-pattern' and 'time-stamp-format' had quietly accepted
several 'time-stamp' conversions (e.g., "%:y") that have been deprecated
since Emacs 27.1. These now generate a warning with a suggested
migration.
Based on the 'git blame' it appears "%Y" was supported decades ago, so I
don't expect changing this to cause any trouble. Therefore, I have
pushed the attached patch.
The old convention still occurs in files that are autoupdated from
automake, etc.
Collin
>From 9a1a6385a57bd6c6493ba1d0660a960574953a9a Mon Sep 17 00:00:00 2001
Message-ID: <9a1a6385a57bd6c6493ba1d0660a960574953a9a.1749523932.git.collin.fu...@gmail.com>
From: Collin Funk <collin.fu...@gmail.com>
Date: Mon, 9 Jun 2025 19:50:35 -0700
Subject: [PATCH] Silence 'time-stamp' warnings with bleeding-edge Emacs.
* build-aux/announce-gen: Use "%Y" instead of "%:y" for the
'time-stamp-format' local variable.
* build-aux/do-release-commit-and-tag: Likewise.
* build-aux/gendocs.sh: Likewise.
* build-aux/git-version-gen: Likewise.
* build-aux/gitlog-to-changelog: Likewise.
* build-aux/gnu-web-doc-update: Likewise.
* build-aux/gnupload: Likewise.
* build-aux/move-if-change: Likewise.
* build-aux/prefix-gnulib-mk: Likewise.
* build-aux/update-copyright: Likewise.
* build-aux/useless-if-before-free: Likewise.
* build-aux/vc-list-files: Likewise.
* top/bootstrap: Likewise.
* top/bootstrap-funclib.sh: Likewise.
* build-aux/bootstrap: Regenerate.
---
ChangeLog | 20 ++++++++++++++++++++
build-aux/announce-gen | 4 ++--
build-aux/bootstrap | 10 +++++-----
build-aux/do-release-commit-and-tag | 4 ++--
build-aux/gendocs.sh | 4 ++--
build-aux/git-version-gen | 4 ++--
build-aux/gitlog-to-changelog | 4 ++--
build-aux/gnu-web-doc-update | 4 ++--
build-aux/gnupload | 4 ++--
build-aux/move-if-change | 4 ++--
build-aux/prefix-gnulib-mk | 4 ++--
build-aux/update-copyright | 4 ++--
build-aux/useless-if-before-free | 4 ++--
build-aux/vc-list-files | 4 ++--
top/bootstrap | 4 ++--
top/bootstrap-funclib.sh | 4 ++--
16 files changed, 53 insertions(+), 33 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index bae0566e0a..37713d5551 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2025-06-09 Collin Funk <collin.fu...@gmail.com>
+
+ Silence 'time-stamp' warnings with bleeding-edge Emacs.
+ * build-aux/announce-gen: Use "%Y" instead of "%:y" for the
+ 'time-stamp-format' local variable.
+ * build-aux/do-release-commit-and-tag: Likewise.
+ * build-aux/gendocs.sh: Likewise.
+ * build-aux/git-version-gen: Likewise.
+ * build-aux/gitlog-to-changelog: Likewise.
+ * build-aux/gnu-web-doc-update: Likewise.
+ * build-aux/gnupload: Likewise.
+ * build-aux/move-if-change: Likewise.
+ * build-aux/prefix-gnulib-mk: Likewise.
+ * build-aux/update-copyright: Likewise.
+ * build-aux/useless-if-before-free: Likewise.
+ * build-aux/vc-list-files: Likewise.
+ * top/bootstrap: Likewise.
+ * top/bootstrap-funclib.sh: Likewise.
+ * build-aux/bootstrap: Regenerate.
+
2025-06-09 Bruno Haible <br...@clisp.org>
file-has-acl tests: Avoid test failure on Cygwin.
diff --git a/build-aux/announce-gen b/build-aux/announce-gen
index 3970d3ce48..b0acad9035 100755
--- a/build-aux/announce-gen
+++ b/build-aux/announce-gen
@@ -35,7 +35,7 @@
eval 'exec perl -wSx "$0" "$@"'
if 0;
-my $VERSION = '2025-05-08 07:37'; # UTC
+my $VERSION = '2025-06-10 02:43'; # UTC
# The definition above must lie within the first 8 lines in order
# for the Emacs time-stamp write hook (at end) to update it.
# If you change this file with Emacs, please let the write hook
@@ -733,7 +733,7 @@ EOF
## eval: (add-hook 'before-save-hook 'time-stamp nil t)
## time-stamp-line-limit: 50
## time-stamp-start: "my $VERSION = '"
-## time-stamp-format: "%:y-%02m-%02d %02H:%02M"
+## time-stamp-format: "%Y-%02m-%02d %02H:%02M"
## time-stamp-time-zone: "UTC0"
## time-stamp-end: "'; # UTC"
## End:
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index fef3cbcd37..dc9fb43834 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -3,7 +3,7 @@
# Bootstrap this package from checked-out sources.
-scriptversion=2024-07-04.10; # UTC
+scriptversion=2025-06-10.02; # UTC
# Copyright (C) 2003-2025 Free Software Foundation, Inc.
#
@@ -37,7 +37,7 @@ medir=`dirname "$me"`
# A library of shell functions for autopull.sh, autogen.sh, and bootstrap.
-scriptlibversion=2025-02-16.12; # UTC
+scriptlibversion=2025-06-10.02; # UTC
# Copyright (C) 2003-2025 Free Software Foundation, Inc.
#
@@ -1337,7 +1337,7 @@ autogen()
# Invoke autoreconf with --force --install to ensure upgrades of tools
# such as ylwrap.
- AUTORECONFFLAGS="--verbose --install --force -I $m4_base $ACLOCAL_FLAGS"
+ AUTORECONFFLAGS="--verbose --install --force $ACLOCAL_FLAGS"
AUTORECONFFLAGS="$AUTORECONFFLAGS --no-recursive"
# Tell autoreconf not to invoke autopoint or libtoolize; they were run above.
@@ -1413,7 +1413,7 @@ autogen()
# Local Variables:
# eval: (add-hook 'before-save-hook 'time-stamp nil t)
# time-stamp-start: "scriptlibversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-format: "%Y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
@@ -1624,7 +1624,7 @@ fi
# Local Variables:
# eval: (add-hook 'before-save-hook 'time-stamp nil t)
# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-format: "%Y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff --git a/build-aux/do-release-commit-and-tag b/build-aux/do-release-commit-and-tag
index c78410de29..f01934c1eb 100755
--- a/build-aux/do-release-commit-and-tag
+++ b/build-aux/do-release-commit-and-tag
@@ -3,7 +3,7 @@
# controlled .prev-version file, automate the procedure by which we record
# the date, release-type and version string in the NEWS file. That commit
# will serve to identify the release, so apply a signed tag to it as well.
-VERSION=2024-07-04.10 # UTC
+VERSION=2025-06-10.02 # UTC
# Note: this is a bash script (could be zsh or dash)
@@ -173,7 +173,7 @@ git tag -s -m "$pkg $ver" v$ver HEAD || die 'git tag failed'
# indent-tabs-mode: nil
# eval: (add-hook 'before-save-hook 'time-stamp nil t)
# time-stamp-start: "VERSION="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-format: "%Y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: " # UTC"
# End:
diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh
index b73b52425f..b5e4cfb193 100755
--- a/build-aux/gendocs.sh
+++ b/build-aux/gendocs.sh
@@ -2,7 +2,7 @@
# gendocs.sh -- generate a GNU manual in many formats. This script is
# mentioned in maintain.texi. See the help message below for usage details.
-scriptversion=2025-04-26.12
+scriptversion=2025-06-09.19
# Copyright 2003-2025 Free Software Foundation, Inc.
#
@@ -557,6 +557,6 @@ echo "Done, see $outdir/ subdirectory for new files."
# Local variables:
# eval: (add-hook 'before-save-hook 'time-stamp nil t)
# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-format: "%Y-%02m-%02d.%02H"
# time-stamp-end: "$"
# End:
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index 250b77accb..f265494a05 100755
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -1,6 +1,6 @@
#!/bin/sh
# Print a version string.
-scriptversion=2025-01-28.09; # UTC
+scriptversion=2025-06-10.02; # UTC
# Copyright (C) 2007-2025 Free Software Foundation, Inc.
#
@@ -245,7 +245,7 @@ printf %s "$v"
# Local variables:
# eval: (add-hook 'before-save-hook 'time-stamp nil t)
# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-format: "%Y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog
index 2e34fc0d84..0c751f9570 100755
--- a/build-aux/gitlog-to-changelog
+++ b/build-aux/gitlog-to-changelog
@@ -35,7 +35,7 @@
eval 'exec perl -wSx "$0" "$@"'
if 0;
-my $VERSION = '2024-07-17 02:20'; # UTC
+my $VERSION = '2025-06-10 02:43'; # UTC
# The definition above must lie within the first 8 lines in order
# for the Emacs time-stamp write hook (at end) to update it.
# If you change this file with Emacs, please let the write hook
@@ -544,7 +544,7 @@ sub git_dir_option($)
# eval: (add-hook 'before-save-hook 'time-stamp nil t)
# time-stamp-line-limit: 50
# time-stamp-start: "my $VERSION = '"
-# time-stamp-format: "%:y-%02m-%02d %02H:%02M"
+# time-stamp-format: "%Y-%02m-%02d %02H:%02M"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "'; # UTC"
# End:
diff --git a/build-aux/gnu-web-doc-update b/build-aux/gnu-web-doc-update
index d5167a4ffe..6d32b2f255 100755
--- a/build-aux/gnu-web-doc-update
+++ b/build-aux/gnu-web-doc-update
@@ -2,7 +2,7 @@
# Run this after each non-alpha release, to update the web documentation at
# https://www.gnu.org/software/$pkg/manual/
-VERSION=2024-07-04.10; # UTC
+VERSION=2025-06-10.02; # UTC
# Copyright (C) 2009-2025 Free Software Foundation, Inc.
@@ -210,7 +210,7 @@ $RSYNC -avP "$builddir"/doc/manual/ $tmp/$pkg/manual
# Local variables:
# eval: (add-hook 'before-save-hook 'time-stamp nil t)
# time-stamp-start: "VERSION="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-format: "%Y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff --git a/build-aux/gnupload b/build-aux/gnupload
index c526437b87..6eac75c163 100755
--- a/build-aux/gnupload
+++ b/build-aux/gnupload
@@ -1,7 +1,7 @@
#!/bin/sh
# Sign files and upload them.
-scriptversion=2024-12-09.08; # UTC
+scriptversion=2025-06-10.02; # UTC
# Copyright (C) 2004-2025 Free Software Foundation, Inc.
#
@@ -477,7 +477,7 @@ exit 0
# Local variables:
# eval: (add-hook 'before-save-hook 'time-stamp nil t)
# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-format: "%Y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff --git a/build-aux/move-if-change b/build-aux/move-if-change
index 0674f34fce..90b8152ad8 100755
--- a/build-aux/move-if-change
+++ b/build-aux/move-if-change
@@ -2,7 +2,7 @@
# Like mv $1 $2, but if the files are the same, just delete $1.
# Status is zero if successful, nonzero otherwise.
-VERSION='2024-07-04 10:56'; # UTC
+VERSION='2025-06-10 02:42'; # UTC
# The definition above must lie within the first 8 lines in order
# for the Emacs time-stamp write hook (at end) to update it.
# If you change this file with Emacs, please let the write hook
@@ -78,7 +78,7 @@ fi
## Local Variables:
## eval: (add-hook 'before-save-hook 'time-stamp nil t)
## time-stamp-start: "VERSION='"
-## time-stamp-format: "%:y-%02m-%02d %02H:%02M"
+## time-stamp-format: "%Y-%02m-%02d %02H:%02M"
## time-stamp-time-zone: "UTC0"
## time-stamp-end: "'; # UTC"
## End:
diff --git a/build-aux/prefix-gnulib-mk b/build-aux/prefix-gnulib-mk
index b2b4867d07..9162c44f08 100755
--- a/build-aux/prefix-gnulib-mk
+++ b/build-aux/prefix-gnulib-mk
@@ -25,7 +25,7 @@
eval 'exec perl -wSx "$0" "$@"'
if 0;
-my $VERSION = '2025-05-08 07:38'; # UTC
+my $VERSION = '2025-06-10 02:42'; # UTC
# The definition above must lie within the first 8 lines in order
# for the Emacs time-stamp write hook (at end) to update it.
# If you change this file with Emacs, please let the write hook
@@ -330,7 +330,7 @@ sub prefix ($)
## eval: (add-hook 'before-save-hook 'time-stamp nil t)
## time-stamp-line-limit: 50
## time-stamp-start: "my $VERSION = '"
-## time-stamp-format: "%:y-%02m-%02d %02H:%02M"
+## time-stamp-format: "%Y-%02m-%02d %02H:%02M"
## time-stamp-time-zone: "UTC0"
## time-stamp-end: "'; # UTC"
## End:
diff --git a/build-aux/update-copyright b/build-aux/update-copyright
index 124c7d2e42..592bd8b269 100755
--- a/build-aux/update-copyright
+++ b/build-aux/update-copyright
@@ -138,7 +138,7 @@
eval 'exec perl -wSx -0777 -pi "$0" "$@"'
if 0;
-my $VERSION = '2025-01-01.07:36'; # UTC
+my $VERSION = '2025-06-10.02:42'; # UTC
# The definition above must lie within the first 8 lines in order
# for the Emacs time-stamp write hook (at end) to update it.
# If you change this file with Emacs, please let the write hook
@@ -301,7 +301,7 @@ if (!$found)
# eval: (add-hook 'before-save-hook 'time-stamp nil t)
# time-stamp-line-limit: 200
# time-stamp-start: "my $VERSION = '"
-# time-stamp-format: "%:y-%02m-%02d.%02H:%02M"
+# time-stamp-format: "%Y-%02m-%02d.%02H:%02M"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "'; # UTC"
# End:
diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free
index e78fa8659f..c9524c7b56 100755
--- a/build-aux/useless-if-before-free
+++ b/build-aux/useless-if-before-free
@@ -36,7 +36,7 @@
eval 'exec perl -wSx "$0" "$@"'
if 0;
-my $VERSION = '2025-05-08 07:38'; # UTC
+my $VERSION = '2025-06-10 02:42'; # UTC
# The definition above must lie within the first 8 lines in order
# for the Emacs time-stamp write hook (at end) to update it.
# If you change this file with Emacs, please let the write hook
@@ -235,7 +235,7 @@ EOF
## eval: (add-hook 'before-save-hook 'time-stamp nil t)
## time-stamp-line-limit: 50
## time-stamp-start: "my $VERSION = '"
-## time-stamp-format: "%:y-%02m-%02d %02H:%02M"
+## time-stamp-format: "%Y-%02m-%02d %02H:%02M"
## time-stamp-time-zone: "UTC0"
## time-stamp-end: "'; # UTC"
## End:
diff --git a/build-aux/vc-list-files b/build-aux/vc-list-files
index 502d0c69ee..ca59e88574 100755
--- a/build-aux/vc-list-files
+++ b/build-aux/vc-list-files
@@ -2,7 +2,7 @@
# List version-controlled file names.
# Print a version string.
-scriptversion=2024-07-04.10; # UTC
+scriptversion=2025-06-10.02; # UTC
# Copyright (C) 2006-2025 Free Software Foundation, Inc.
@@ -107,7 +107,7 @@ done
# Local variables:
# eval: (add-hook 'before-save-hook 'time-stamp nil t)
# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-format: "%Y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff --git a/top/bootstrap b/top/bootstrap
index 5780ae5a68..6542faafae 100755
--- a/top/bootstrap
+++ b/top/bootstrap
@@ -1,7 +1,7 @@
#! /bin/sh
# Bootstrap this package from checked-out sources.
-scriptversion=2024-07-04.10; # UTC
+scriptversion=2025-06-10.02; # UTC
# Copyright (C) 2003-2025 Free Software Foundation, Inc.
#
@@ -240,7 +240,7 @@ fi
# Local Variables:
# eval: (add-hook 'before-save-hook 'time-stamp nil t)
# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-format: "%Y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff --git a/top/bootstrap-funclib.sh b/top/bootstrap-funclib.sh
index 81884cc8b3..e4f42103b4 100644
--- a/top/bootstrap-funclib.sh
+++ b/top/bootstrap-funclib.sh
@@ -1,6 +1,6 @@
# A library of shell functions for autopull.sh, autogen.sh, and bootstrap.
-scriptlibversion=2025-03-27.18; # UTC
+scriptlibversion=2025-06-10.02; # UTC
# Copyright (C) 2003-2025 Free Software Foundation, Inc.
#
@@ -1376,7 +1376,7 @@ autogen()
# Local Variables:
# eval: (add-hook 'before-save-hook 'time-stamp nil t)
# time-stamp-start: "scriptlibversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-format: "%Y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
--
2.49.0
