Cut the emacs-29 release branch

* README:
* configure.ac:
* nt/README.W32:
* msdos/sed2v2.inp: Bump Emacs version to 29.0.60.

* admin/admin.el (set-version): Fix regexp for configure.ac.

* lisp/cus-edit.el (customize-changed-options-previous-release):
Bump last version to 28.2.

diff --git a/README b/README
index 80c04e20fea97396fd5a5c2cf44e8e30c2da1a03..2f11148411b458f5c06db1a499cb7edf09944de5 100644 (file)
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ Copyright (C) 2001-2022 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
-This directory tree holds version 29.0.50 of GNU Emacs, the extensible,
+This directory tree holds version 29.0.60 of GNU Emacs, the extensible,
 customizable, self-documenting real-time display editor.
 
 The file INSTALL in this directory says how to build and install GNU

diff --git a/admin/admin.el b/admin/admin.el
index 6a67f172e2c01f5864c0809b2537eb2797ec3ef6..4743d7769185401c2bb81c585ff48847b2ce72b6 100644 (file)
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -110,7 +110,7 @@ Root must be the root of an Emacs source tree."
                                (submatch (1+ (in "0-9."))))))
   (set-version-in-file root "configure.ac" version
                       (rx (and "AC_INIT" (1+ (not (in ?,)))
-                                ?, (0+ space)
+                                ?, (0+ space) ?\[
                                 (submatch (1+ (in "0-9."))))))
   (set-version-in-file root "nt/README.W32" version
                       (rx (and "version" (1+ space)

diff --git a/configure.ac b/configure.ac
index cc4e59ee5acb2dac4b0e188514886abcbc47c8a5..b844c6bc7305edacc991cd45ee03f2309f6b39b7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl  along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.65])
 dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el.
-AC_INIT([GNU Emacs], [29.0.50], [bug-gnu-emacs@gnu.org], [],
+AC_INIT([GNU Emacs], [29.0.60], [bug-gnu-emacs@gnu.org], [],
   [https://www.gnu.org/software/emacs/])
 
 dnl Set emacs_config_options to the options of 'configure', quoted for the shell,

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 00ee9504c22ea5716a266bd913efcb824996d164..0e09e99da95c9caf81f5bbead13d8a275f3a5b6f 100644 (file)
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1238,7 +1238,7 @@ Show the buffer in another window, but don't select it."
     (unless (eq symbol basevar)
       (message "`%s' is an alias for `%s'" symbol basevar))))
 
-(defvar customize-changed-options-previous-release "28.1"
+(defvar customize-changed-options-previous-release "28.2"
   "Version for `customize-changed' to refer back to by default.")
 
 ;; Packages will update this variable, so make it available.

diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index ff6be8d0830715ceb719e78c46c7c7e36a451309..4abea2ec597f365d622d34e2be14a67f90c62a79 100644 (file)
--- a/msdos/sed2v2.inp
+++ b/msdos/sed2v2.inp
@@ -67,7 +67,7 @@
 /^#undef PACKAGE_NAME/s/^.*$/#define PACKAGE_NAME ""/
 /^#undef PACKAGE_STRING/s/^.*$/#define PACKAGE_STRING ""/
 /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/
-/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION "29.0.50"/
+/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION "29.0.60"/
 /^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/
 /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/
 /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/

diff --git a/nt/README.W32 b/nt/README.W32
index cbb5b12551ee3ea55201d3e3dbd96c3c640994e3..840da905dabfb78dcc0ad6100871a4804c494e5b 100644 (file)
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -1,7 +1,7 @@
 Copyright (C) 2001-2022 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
-               Emacs version 29.0.50 for MS-Windows
+               Emacs version 29.0.60 for MS-Windows
 
   This README file describes how to set up and run a precompiled
   distribution of the latest version of GNU Emacs for MS-Windows.  You