diff options
author | Eli Zaretskii <eliz@gnu.org> | 2016-09-23 10:46:26 +0300 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2016-09-23 10:46:26 +0300 |
commit | 0d016ca1164463320a77482df88ef81cc34056d1 (patch) | |
tree | f9aaa5db7c3ebd655b0202b5ff0d565287157cc0 | |
parent | cf9e174ae1d3b1428982204b0786a7db13d94ab7 (diff) | |
download | emacs-0d016ca1164463320a77482df88ef81cc34056d1.tar.gz |
Increment Emacs version to 25.1.50
* README:
* configure.ac:
* etc/NEWS:
* msdos/sed2v2.inp: Bump the version to 25.1.50.
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | etc/NEWS | 4 | ||||
-rw-r--r-- | msdos/sed2v2.inp | 2 |
4 files changed, 7 insertions, 3 deletions
@@ -2,7 +2,7 @@ Copyright (C) 2001-2016 Free Software Foundation, Inc. See the end of the file for license conditions. -This directory tree holds version 25.1 of GNU Emacs, the extensible, +This directory tree holds version 25.1.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 cd4d1c0f8e0..7a697ec3d06 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ dnl along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. 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.1, bug-gnu-emacs@gnu.org) +AC_INIT(GNU Emacs, 25.1.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. @@ -16,6 +16,10 @@ 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.2 +This is a bug-fix release with no new features. + + * Installation Changes in Emacs 25.1 ** Building Emacs now requires C99 or later. diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index 118e63451f5..d1a6eaba5de 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.1"/ +/^#undef VERSION/s/^.*$/#define VERSION "25.1.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/ |