mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

Start emacs-26 release branch

Browse source 
* configure.ac:
* nt/README.W32:
* README:
* msdos/sed2v2.inp: Increment Emacs version to 26.0.60.

* lisp/cus-edit.el (customize-changed-options-previous-release):
Update value to "25.3".
This commit is contained in:
Eli Zaretskii 2017-09-16 15:34:15 +03:00
parent 4ea37c2b8b
commit 625cee5316
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README
View file

@ -2,7 +2,7 @@ Copyright (C) 2001-2017 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 26.0.50 of GNU Emacs, the extensible, This directory tree holds version 26.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, 26.0.50, bug-gnu-emacs@gnu.org) AC_INIT(GNU Emacs, 26.0.60, bug-gnu-emacs@gnu.org)
dnl Set emacs_config_options to the options of 'configure', quoted for the shell, 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. dnl and then quoted again for a C string. Separate options with spaces.

2
lisp/cus-edit.el
View file

@ -1159,7 +1159,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 "24.5" (defvar customize-changed-options-previous-release "25.3"
"Version for `customize-changed-options' to refer back to by default.") "Version for `customize-changed-options' 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_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/ /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/
/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION VERSION/ /^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION VERSION/
/^#undef PENDING_OUTPUT_COUNT/s/^.*$/#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base)/ /^#undef PENDING_OUTPUT_COUNT/s/^.*$/#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base)/
/^#undef VERSION/s/^.*$/#define VERSION "26.0.50"/ /^#undef VERSION/s/^.*$/#define VERSION "26.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-2017 Free Software Foundation, Inc. Copyright (C) 2001-2017 Free Software Foundation, Inc.
See the end of the file for license conditions. See the end of the file for license conditions.
Emacs version 25.1.50 for MS-Windows Emacs version 26.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