From d31d4d386bd743627c38ac53003f756f99406a53 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 23 Jun 2024 06:48:54 -0400 Subject: [PATCH] New branch emacs-30 * README: * configure.ac: * nt/README.W32: * etc/refcards/ru-refcard.tex: * msdos/sed2v2.inp: * lisp/cus-edit.el (customize-changed-options-previous-release): Cut the emacs-30 release branch. (cherry picked from commit dd0fc6aff602447d3e62d52a2a3b45b1a5733f28) --- README | 2 +- configure.ac | 3 ++- etc/refcards/ru-refcard.tex | 2 +- lisp/cus-edit.el | 2 +- msdos/sed2v2.inp | 2 +- nt/README.W32 | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README b/README index c0b4df650e1..54da3587754 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ Copyright (C) 2001-2024 Free Software Foundation, Inc. See the end of the file for license conditions. -This directory tree holds version 30.0.50 of GNU Emacs, the extensible, +This directory tree holds version 30.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 48140f5d71b..04be504681f 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,8 @@ 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([GNU Emacs], [30.0.50], [bug-gnu-emacs@gnu.org], [], +dnl Note this is parsed by (at least) make-dist. +AC_INIT([GNU Emacs], [30.0.60], [bug-gnu-emacs@gnu.org], [], [https://www.gnu.org/software/emacs/]) if test "$XCONFIGURE" = "android"; then diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex index 0fc4363ec05..a394688a8a0 100644 --- a/etc/refcards/ru-refcard.tex +++ b/etc/refcards/ru-refcard.tex @@ -40,7 +40,7 @@ \newlength{\ColThreeWidth} \setlength{\ColThreeWidth}{25mm} -\newcommand{\versionemacs}[0]{29} % version of Emacs this is for +\newcommand{\versionemacs}[0]{30} % version of Emacs this is for \newcommand{\cyear}[0]{2024} % copyright year \newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index ea59650fa87..185d8ecfc29 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -1311,7 +1311,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 "29.1" +(defvar customize-changed-options-previous-release "29.4" "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 9f8bca1a987..3c719e3f9ac 100644 --- 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 "30.0.50"/ +/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION "30.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 1d63dc69086..3c916b4f24b 100644 --- a/nt/README.W32 +++ b/nt/README.W32 @@ -1,7 +1,7 @@ Copyright (C) 2001-2024 Free Software Foundation, Inc. See the end of the file for license conditions. - Emacs version 30.0.50 for MS-Windows + Emacs version 30.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 -- 2.39.2