summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2016-09-23 10:40:47 +0300
committerEli Zaretskii <eliz@gnu.org>2016-09-23 10:40:47 +0300
commit65dc67c87553bec4c8b36432246b13f09d653118 (patch)
treee602f8ff3d708762d58bb1a7160ad98a275adcf6
parent87925f1125acf95439e4563f9a30864cadf7cafb (diff)
downloademacs-65dc67c87553bec4c8b36432246b13f09d653118.tar.gz
Bump the version to 25.2.50
* README: * configure.ac: * etc/NEWS: * msdos/sed2v2.inp: Increment the Emacs version to 25.2.50.
-rw-r--r--README2
-rw-r--r--configure.ac2
-rw-r--r--etc/NEWS19
-rw-r--r--msdos/sed2v2.inp2
4 files changed, 12 insertions, 13 deletions
diff --git a/README b/README
index 35a31dbd31e..ffa92c6546d 100644
--- a/README
+++ b/README
@@ -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.50 of GNU Emacs, the extensible,
+This directory tree holds version 25.2.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 6488f901e33..8479b0708f8 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.50, bug-gnu-emacs@gnu.org)
+AC_INIT(GNU Emacs, 25.2.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 9b992d0fa6c..3149d918b56 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -21,9 +21,8 @@ Temporary note:
--- means no change in the manuals is needed.
When you add a new item, use the appropriate mark if you are sure it applies,
otherwise leave it unmarked.
-
-* Installation Changes in Emacs 25.2
+* Installation Changes in Emacs 25.3
** By default libgnutls is now required when building Emacs.
Use 'configure --with-gnutls=no' to build even when GnuTLS is missing.
@@ -57,10 +56,10 @@ erc-emacs-build-time.
affected by this, as SGI stopped supporting IRIX in December 2013.
-* Startup Changes in Emacs 25.2
+* Startup Changes in Emacs 25.3
-* Changes in Emacs 25.2
+* Changes in Emacs 25.3
+++
** The new function 'call-shell-region' executes a command in an
@@ -207,7 +206,7 @@ questions, with a handy way to display help texts.
** 'switch-to-buffer-preserve-window-point' now defaults to t.
-* Editing Changes in Emacs 25.2
+* Editing Changes in Emacs 25.3
+++
** New bindings for 'query-replace-map'.
@@ -225,7 +224,7 @@ Instead of only checking the modification time, Emacs now also checks
the file's actual content before prompting the user.
-* Changes in Specialized Modes and Packages in Emacs 25.2
+* Changes in Specialized Modes and Packages in Emacs 25.3
** Ibuffer
@@ -450,12 +449,12 @@ contents of the buffer to determine whether it's a C or C++ source
file.
-* New Modes and Packages in Emacs 25.2
+* New Modes and Packages in Emacs 25.3
** New Elisp data-structure library 'radix-tree'.
-* Incompatible Lisp Changes in Emacs 25.2
+* Incompatible Lisp Changes in Emacs 25.3
+++
** Resizing a frame no longer runs 'window-configuration-change-hook'.
@@ -484,7 +483,7 @@ now generate less chatter and more-compact diagnostics. The auxiliary
function 'check-declare-errmsg' has been removed.
-* Lisp Changes in Emacs 25.2
+* Lisp Changes in Emacs 25.3
** New function undo-amalgamate-change-group to get rid of undo-boundaries
between two states.
@@ -599,7 +598,7 @@ collection).
can be used for creation of temporary files of remote or mounted directories.
-* Changes in Emacs 25.2 on Non-Free Operating Systems
+* Changes in Emacs 25.3 on Non-Free Operating Systems
** Intercepting hotkeys on Windows 7 and later now works better.
The new keyboard hooking code properly grabs system hotkeys such as
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index d1a6eaba5de..2c1855aa8b0 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.50"/
+/^#undef VERSION/s/^.*$/#define VERSION "25.2.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/