Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-06-14 12:31:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cut the emacs-31 release branch

Browse source 
* 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.
This commit is contained in:
Sean Whitton 2026-05-07 17:38:20 +01:00
parent 2f73996647
commit 311f1fe2ba
7 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README
View file

@ -2,7 +2,7 @@ Copyright (C) 2001-2026 Free Software Foundation, Inc.
See the end of the file for license conditions. 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. customizable, self-documenting real-time display editor.
The file INSTALL in this directory says how to build and install GNU The file INSTALL in this directory says how to build and install GNU

2
configure.ac
View file

@ -23,7 +23,7 @@ dnl along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
AC_PREREQ([2.65]) AC_PREREQ([2.65])
dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el. 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/]) [https://www.gnu.org/software/emacs/])
if test "$XCONFIGURE" = "android"; then if test "$XCONFIGURE" = "android"; then

2
exec/configure.ac
View file

@ -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 <https://www.gnu.org/licenses/>. dnl along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
AC_PREREQ([2.65]) 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/]) [https://www.gnu.org/software/emacs/])
AH_TOP([/* Copyright (C) 2026 Free Software Foundation, Inc. AH_TOP([/* Copyright (C) 2026 Free Software Foundation, Inc.

2
java/AndroidManifest.xml.in
View file

@ -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. 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. Refer to e.g. https://forum.f-droid.org/t/emacs-packaging/30424/25.
Version-code: 310050000 Version-code: 310060000
--> -->

2
lisp/cus-edit.el
View file

@ -1344,7 +1344,7 @@ Show the buffer in another window, but don't select it."
(unless (eq symbol basevar) (unless (eq symbol basevar)
(message "`%s' is an alias for `%s'" 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.") "Version for `customize-changed' to refer back to by default.")
;; Packages will update this variable, so make it available. ;; Packages will update this variable, so make it available.

2
msdos/sed2v2.inp
View file

@ -66,7 +66,7 @@
/^#undef PACKAGE_NAME/s/^.*$/#define PACKAGE_NAME ""/ /^#undef PACKAGE_NAME/s/^.*$/#define PACKAGE_NAME ""/
/^#undef PACKAGE_STRING/s/^.*$/#define PACKAGE_STRING ""/ /^#undef PACKAGE_STRING/s/^.*$/#define PACKAGE_STRING ""/
/^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/ /^#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 SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/
/^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/ /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/
/^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/ /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/

2
nt/README.W32
View file

@ -1,7 +1,7 @@
Copyright (C) 2001-2026 Free Software Foundation, Inc. Copyright (C) 2001-2026 Free Software Foundation, Inc.
See the end of the file for license conditions. 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 This README file describes how to set up and run a precompiled
distribution of the latest version of GNU Emacs for MS-Windows. You distribution of the latest version of GNU Emacs for MS-Windows. You