From 311f1fe2ba2a4d069715c992ba839645b55a9427 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Thu, 7 May 2026 17:38:20 +0100 Subject: [PATCH] Cut the emacs-31 release branch * README: * configure.ac: * exec/configure.ac: * java/AndroidManifest.xml.in (Version-code): * msdos/sed2v2.inp: * nt/README.W32: Bump Emacs version to 31.0.60. * lisp/cus-edit.el (customize-changed-options-previous-release): Set last version to 30.2. --- README | 2 +- configure.ac | 2 +- exec/configure.ac | 2 +- java/AndroidManifest.xml.in | 2 +- lisp/cus-edit.el | 2 +- msdos/sed2v2.inp | 2 +- nt/README.W32 | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README b/README index 4c6bab5d3cb..4bd79384117 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ Copyright (C) 2001-2026 Free Software Foundation, Inc. See the end of the file for license conditions. -This directory tree holds version 31.0.50 of GNU Emacs, the extensible, +This directory tree holds version 31.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/configure.ac b/configure.ac index eeaaaa53a3d..8bc5f6daa11 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ dnl along with GNU Emacs. If not, see . AC_PREREQ([2.65]) dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el. -AC_INIT([GNU Emacs], [31.0.50], [bug-gnu-emacs@gnu.org], [], +AC_INIT([GNU Emacs], [31.0.60], [bug-gnu-emacs@gnu.org], [], [https://www.gnu.org/software/emacs/]) if test "$XCONFIGURE" = "android"; then diff --git a/exec/configure.ac b/exec/configure.ac index bc35b41e14e..d3907b61bc8 100644 --- a/exec/configure.ac +++ b/exec/configure.ac @@ -22,7 +22,7 @@ dnl You should have received a copy of the GNU General Public License dnl along with GNU Emacs. If not, see . AC_PREREQ([2.65]) -AC_INIT([libexec], [31.0.50], [bug-gnu-emacs@gnu.org], [], +AC_INIT([libexec], [31.0.60], [bug-gnu-emacs@gnu.org], [], [https://www.gnu.org/software/emacs/]) AH_TOP([/* Copyright (C) 2026 Free Software Foundation, Inc. diff --git a/java/AndroidManifest.xml.in b/java/AndroidManifest.xml.in index a1760294046..138a0fb8b1e 100644 --- a/java/AndroidManifest.xml.in +++ b/java/AndroidManifest.xml.in @@ -350,6 +350,6 @@ repositories require an incrementing numeric version code to detect upgrades, which is provided here and is altered by admin/admin.el. Refer to e.g. https://forum.f-droid.org/t/emacs-packaging/30424/25. -Version-code: 310050000 +Version-code: 310060000 --> diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 87d8ecade54..a54ecfab614 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -1344,7 +1344,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 "30.1" +(defvar customize-changed-options-previous-release "30.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 d7441f1e34d..47ffc77835f 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp @@ -66,7 +66,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 "31.0.50"/ +/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION "31.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 788a87af8a8..5ac4e1dba7f 100644 --- a/nt/README.W32 +++ b/nt/README.W32 @@ -1,7 +1,7 @@ Copyright (C) 2001-2026 Free Software Foundation, Inc. See the end of the file for license conditions. - Emacs version 31.0.50 for MS-Windows + Emacs version 31.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