From 1d81ac1b38cd36b144b4108e3242dbb028fd9c5f Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 13 Sep 2017 21:38:36 +0300 Subject: [PATCH] Increment Emacs version on emacs-25 branch * etc/NEWS: * configure.ac: * README: * nt/README.W32: * msdos/sed2v2.inp: Increment Emacs version to 25.3.50. --- README | 2 +- configure.ac | 2 +- etc/NEWS | 3 +++ msdos/sed2v2.inp | 2 +- nt/README.W32 | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/README b/README index 8c68e30d578..900aeec3580 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ Copyright (C) 2001-2017 Free Software Foundation, Inc. See the end of the file for license conditions. -This directory tree holds version 25.3 of GNU Emacs, the extensible, +This directory tree holds version 25.3.50 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 b0d3be77270..d385a9bdfa4 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, 25.3, bug-gnu-emacs@gnu.org) +AC_INIT(GNU Emacs, 25.3.50, bug-gnu-emacs@gnu.org) 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/etc/NEWS b/etc/NEWS index be04b5fcdc3..5570e9c6245 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -15,6 +15,9 @@ and NEWS.1-17 for changes in older Emacs versions. You can narrow news to a specific version by calling 'view-emacs-news' with a prefix argument or by typing C-u C-h C-n. + +* Changes in Emacs 25.4 + * Changes in Emacs 25.3 diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index b4a04d3f4db..85fe5b3a2f4 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp @@ -66,7 +66,7 @@ /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/ /^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION VERSION/ /^#undef PENDING_OUTPUT_COUNT/s/^.*$/#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base)/ -/^#undef VERSION/s/^.*$/#define VERSION "25.3"/ +/^#undef VERSION/s/^.*$/#define VERSION "25.3.50"/ /^#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 1f97ea8dffd..284183c05cf 100644 --- a/nt/README.W32 +++ b/nt/README.W32 @@ -1,7 +1,7 @@ Copyright (C) 2001-2017 Free Software Foundation, Inc. See the end of the file for license conditions. - Emacs version 25.3 for MS-Windows + Emacs version 25.3.50 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.5