diff options
| author | Eli Zaretskii | 2016-09-23 10:46:26 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2016-09-23 10:46:26 +0300 |
| commit | 0d016ca1164463320a77482df88ef81cc34056d1 (patch) | |
| tree | f9aaa5db7c3ebd655b0202b5ff0d565287157cc0 | |
| parent | cf9e174ae1d3b1428982204b0786a7db13d94ab7 (diff) | |
| download | emacs-0d016ca1164463320a77482df88ef81cc34056d1.tar.gz emacs-0d016ca1164463320a77482df88ef81cc34056d1.zip | |
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. | |||
| 2 | See the end of the file for license conditions. | 2 | See the end of the file for license conditions. |
| 3 | 3 | ||
| 4 | 4 | ||
| 5 | This directory tree holds version 25.1 of GNU Emacs, the extensible, | 5 | This directory tree holds version 25.1.50 of GNU Emacs, the extensible, |
| 6 | customizable, self-documenting real-time display editor. | 6 | customizable, self-documenting real-time display editor. |
| 7 | 7 | ||
| 8 | The file INSTALL in this directory says how to build and install GNU | 8 | 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/>. | |||
| 23 | 23 | ||
| 24 | AC_PREREQ(2.65) | 24 | AC_PREREQ(2.65) |
| 25 | dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el. | 25 | dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el. |
| 26 | AC_INIT(GNU Emacs, 25.1, bug-gnu-emacs@gnu.org) | 26 | AC_INIT(GNU Emacs, 25.1.50, bug-gnu-emacs@gnu.org) |
| 27 | 27 | ||
| 28 | dnl Set emacs_config_options to the options of 'configure', quoted for the shell, | 28 | dnl Set emacs_config_options to the options of 'configure', quoted for the shell, |
| 29 | dnl and then quoted again for a C string. Separate options with spaces. | 29 | 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' | |||
| 16 | with a prefix argument or by typing C-u C-h C-n. | 16 | with a prefix argument or by typing C-u C-h C-n. |
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | * Changes in Emacs 25.2 | ||
| 20 | This is a bug-fix release with no new features. | ||
| 21 | |||
| 22 | |||
| 19 | * Installation Changes in Emacs 25.1 | 23 | * Installation Changes in Emacs 25.1 |
| 20 | 24 | ||
| 21 | ** Building Emacs now requires C99 or later. | 25 | ** 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 @@ | |||
| 66 | /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/ | 66 | /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/ |
| 67 | /^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION VERSION/ | 67 | /^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION VERSION/ |
| 68 | /^#undef PENDING_OUTPUT_COUNT/s/^.*$/#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base)/ | 68 | /^#undef PENDING_OUTPUT_COUNT/s/^.*$/#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base)/ |
| 69 | /^#undef VERSION/s/^.*$/#define VERSION "25.1"/ | 69 | /^#undef VERSION/s/^.*$/#define VERSION "25.1.50"/ |
| 70 | /^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/ | 70 | /^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/ |
| 71 | /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/ | 71 | /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/ |
| 72 | /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/ | 72 | /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/ |