summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Petton <nicolas@petton.fr>2016-11-27 20:44:43 +0100
committerNicolas Petton <nicolas@petton.fr>2016-11-27 20:44:43 +0100
commit596289bc8d2c4dfb51e32cde3df4350855c5c084 (patch)
tree230fec0a30c5f4500769150c8ce3f901f87cc724
parentdcfe4d113ae784103dd033dcab2ba81adbaa4030 (diff)
downloademacs-596289bc8d2c4dfb51e32cde3df4350855c5c084.tar.gz
Bump Emacs version
* README: * configure.ac: * etc/NEWS: * msdos/sed2v2.inp: * nt/README.W32: Bump Emacs version to 25.2.90
-rw-r--r--README2
-rw-r--r--configure.ac2
-rw-r--r--etc/NEWS27
-rw-r--r--msdos/sed2v2.inp2
-rw-r--r--nt/README.W322
5 files changed, 31 insertions, 4 deletions
diff --git a/README b/README
index d227ec59cc7..84ff1db22c5 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.90 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 9f12a2b7331..767e0462c88 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.90, 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 f6792431907..c9144130452 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -16,6 +16,33 @@ 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.
+* Installation Changes in Emacs 25.3
+
+
+* Startup Changes in Emacs 25.3
+
+
+* Changes in Emacs 25.3
+
+
+* Editing Changes in Emacs 25.3
+
+
+* Changes in Specialized Modes and Packages in Emacs 25.3
+
+
+* New Modes and Packages in Emacs 25.3
+
+
+* Incompatible Lisp Changes in Emacs 25.3
+
+
+* Lisp Changes in Emacs 25.3
+
+
+* Changes in Emacs 25.3 on Non-Free Operating Systems
+
+
* Changes in Emacs 25.2
This is a bug-fix release with (almost) no new features.
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index d1a6eaba5de..2e3132f6a03 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.90"/
/^#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 9bc8f87496e..7192ff0b011 100644
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -1,7 +1,7 @@
Copyright (C) 2001-2016 Free Software Foundation, Inc.
See the end of the file for license conditions.
- Emacs version 25.1.50 for MS-Windows
+ Emacs version 25.2.90 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