aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2017-05-12 11:05:03 +0300
committerEli Zaretskii2017-05-12 11:05:03 +0300
commit50b4f85720a69fcff416a6772beda6a4027d3b52 (patch)
treeb1838d90a05ce1aadaab3179a3b04db30af12845
parenteaa00584ceb30fd1170bf06f2514f3b6e4192329 (diff)
downloademacs-50b4f85720a69fcff416a6772beda6a4027d3b52.tar.gz
emacs-50b4f85720a69fcff416a6772beda6a4027d3b52.zip
; Bump Emacs version past 25.2
* configure.ac: * README: * nt/README.W32: * msdos/sed2v2.inp: Increment version to 25.2.50.
-rw-r--r--README2
-rw-r--r--configure.ac2
-rw-r--r--msdos/sed2v2.inp2
-rw-r--r--nt/README.W322
4 files changed, 4 insertions, 4 deletions
diff --git a/README b/README
index a2b00470340..3224d6daf73 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ Copyright (C) 2001-2017 Free Software Foundation, Inc.
2See the end of the file for license conditions. 2See the end of the file for license conditions.
3 3
4 4
5This directory tree holds version 25.2 of GNU Emacs, the extensible, 5This directory tree holds version 25.2.50 of GNU Emacs, the extensible,
6customizable, self-documenting real-time display editor. 6customizable, self-documenting real-time display editor.
7 7
8The file INSTALL in this directory says how to build and install GNU 8The file INSTALL in this directory says how to build and install GNU
diff --git a/configure.ac b/configure.ac
index 5853cbbac85..4beda6530e5 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
24AC_PREREQ(2.65) 24AC_PREREQ(2.65)
25dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el. 25dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el.
26AC_INIT(GNU Emacs, 25.2, bug-gnu-emacs@gnu.org) 26AC_INIT(GNU Emacs, 25.2.50, bug-gnu-emacs@gnu.org)
27 27
28dnl Set emacs_config_options to the options of 'configure', quoted for the shell, 28dnl Set emacs_config_options to the options of 'configure', quoted for the shell,
29dnl and then quoted again for a C string. Separate options with spaces. 29dnl and then quoted again for a C string. Separate options with spaces.
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index cbe5bad384c..d490017c5e1 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.2"/ 69/^#undef VERSION/s/^.*$/#define VERSION "25.2.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/
diff --git a/nt/README.W32 b/nt/README.W32
index 7f929384ade..74caf3978e5 100644
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -1,7 +1,7 @@
1Copyright (C) 2001-2017 Free Software Foundation, Inc. 1Copyright (C) 2001-2017 Free Software Foundation, Inc.
2See the end of the file for license conditions. 2See the end of the file for license conditions.
3 3
4 Emacs version 25.2 for MS-Windows 4 Emacs version 25.2.50 for MS-Windows
5 5
6 This README file describes how to set up and run a precompiled 6 This README file describes how to set up and run a precompiled
7 distribution of the latest version of GNU Emacs for MS-Windows. You 7 distribution of the latest version of GNU Emacs for MS-Windows. You