From: Eli Zaretskii Date: Mon, 23 Dec 2019 15:41:17 +0000 (+0200) Subject: Cut the emacs-27 release branch X-Git-Tag: emacs-27.0.90~299 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9eb871c8d102c548a53ab9a5fe212067863f5bff;p=emacs.git Cut the emacs-27 release branch * lisp/cus-edit.el (customize-changed-options-previous-release): Change the value to 26.3. * README: * configure.ac: * nt/README.W32: * msdos/sed2v2.inp: Bump Emacs version to 27.0.60. --- diff --git a/README b/README index 723681607ce..5038995c5a1 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ Copyright (C) 2001-2019 Free Software Foundation, Inc. See the end of the file for license conditions. -This directory tree holds version 27.0.50 of GNU Emacs, the extensible, +This directory tree holds version 27.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 3b6a2a6d167..1c3fe7853e5 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, 27.0.50, bug-gnu-emacs@gnu.org, , https://www.gnu.org/software/emacs/) +AC_INIT(GNU Emacs, 27.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, dnl and then quoted again for a C string. Separate options with spaces. diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 081d4c9213e..439667a578c 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -1163,7 +1163,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 "25.3" +(defvar customize-changed-options-previous-release "26.3" "Version for `customize-changed-options' 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 39cffdb6f3b..eebf1679472 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 "27.0.50"/ +/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION "27.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 64b35f68eb5..196122ecf71 100644 --- a/nt/README.W32 +++ b/nt/README.W32 @@ -1,7 +1,7 @@ Copyright (C) 2001-2019 Free Software Foundation, Inc. See the end of the file for license conditions. - Emacs version 27.0.50 for MS-Windows + Emacs version 27.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