[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 938e316 1/2: ; Revert "Bump Emacs version"
From: |
Nicolas Petton |
Subject: |
[Emacs-diffs] emacs-25 938e316 1/2: ; Revert "Bump Emacs version" |
Date: |
Sun, 27 Nov 2016 23:02:25 +0000 (UTC) |
branch: emacs-25
commit 938e3166942da1ed0ca265cb7bbcebf44c588c44
Author: Nicolas Petton <address@hidden>
Commit: Nicolas Petton <address@hidden>
; Revert "Bump Emacs version"
The version should be 25.1.90, not 25.2.90.
This reverts commit 596289bc8d2c4dfb51e32cde3df4350855c5c084.
---
README | 2 +-
configure.ac | 2 +-
etc/NEWS | 27 ---------------------------
msdos/sed2v2.inp | 2 +-
nt/README.W32 | 2 +-
5 files changed, 4 insertions(+), 31 deletions(-)
diff --git a/README b/README
index 84ff1db..d227ec5 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.2.90 of GNU Emacs, the extensible,
+This directory tree holds version 25.1.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 767e046..9f12a2b 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.2.90, address@hidden)
+AC_INIT(GNU Emacs, 25.1.50, address@hidden)
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 c914413..f679243 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -16,33 +16,6 @@ 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 2e3132f..d1a6eab 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.2.90"/
+/^#undef VERSION/s/^.*$/#define VERSION "25.1.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/
diff --git a/nt/README.W32 b/nt/README.W32
index 7192ff0..9bc8f87 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.2.90 for MS-Windows
+ Emacs version 25.1.50 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