aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Petton2016-11-27 23:58:31 +0100
committerNicolas Petton2016-11-27 23:59:55 +0100
commit938e3166942da1ed0ca265cb7bbcebf44c588c44 (patch)
tree4ada0372277dd8859fb5c328bd82b6a72aaa7da3
parent596289bc8d2c4dfb51e32cde3df4350855c5c084 (diff)
downloademacs-938e3166942da1ed0ca265cb7bbcebf44c588c44.tar.gz
emacs-938e3166942da1ed0ca265cb7bbcebf44c588c44.zip
; Revert "Bump Emacs version"
The version should be 25.1.90, not 25.2.90. This reverts commit 596289bc8d2c4dfb51e32cde3df4350855c5c084.
-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, 4 insertions, 31 deletions
diff --git a/README b/README
index 84ff1db22c5..d227ec59cc7 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ Copyright (C) 2001-2016 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.90 of GNU Emacs, the extensible, 5This directory tree holds version 25.1.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 767e0462c88..9f12a2b7331 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.90, bug-gnu-emacs@gnu.org) 26AC_INIT(GNU Emacs, 25.1.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/etc/NEWS b/etc/NEWS
index c9144130452..f6792431907 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -16,33 +16,6 @@ You can narrow news to a specific version by calling 'view-emacs-news'
16with a prefix argument or by typing C-u C-h C-n. 16with a prefix argument or by typing C-u C-h C-n.
17 17
18 18
19* Installation Changes in Emacs 25.3
20
21
22* Startup Changes in Emacs 25.3
23
24
25* Changes in Emacs 25.3
26
27
28* Editing Changes in Emacs 25.3
29
30
31* Changes in Specialized Modes and Packages in Emacs 25.3
32
33
34* New Modes and Packages in Emacs 25.3
35
36
37* Incompatible Lisp Changes in Emacs 25.3
38
39
40* Lisp Changes in Emacs 25.3
41
42
43* Changes in Emacs 25.3 on Non-Free Operating Systems
44
45
46* Changes in Emacs 25.2 19* Changes in Emacs 25.2
47This is a bug-fix release with (almost) no new features. 20This is a bug-fix release with (almost) no new features.
48 21
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index 2e3132f6a03..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.2.90"/ 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/
diff --git a/nt/README.W32 b/nt/README.W32
index 7192ff0b011..9bc8f87496e 100644
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -1,7 +1,7 @@
1Copyright (C) 2001-2016 Free Software Foundation, Inc. 1Copyright (C) 2001-2016 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.90 for MS-Windows 4 Emacs version 25.1.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