[Emacs-diffs] feature/aptel/dynamic-modules-rc5 bdd314d 02/20: Increment Emacs version on master branch

[Teodor Zlatanov]

branch: feature/aptel/dynamic-modules-rc5
commit bdd314db6fabdae35e9b14100e823738f9aae66c
Author: Eli Zaretskii <address@hidden>
Commit: Ted Zlatanov <address@hidden>

    Increment Emacs version on master branch
    
    * lisp/cus-edit.el (customize-changed-options-previous-release):
    Increase previous version to 24.5.
    
    * configure.ac:
    * msdos/sed2v2.inp: Bump version to 25.1.50.
---
 README           |    2 +-
 configure.ac     |    2 +-
 lisp/cus-edit.el |    2 +-
 msdos/sed2v2.inp |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README b/README
index 1f3de15..82a5a8f 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ Copyright (C) 2001-2015 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
-This directory tree holds version 25.0.50 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 cfd591c..639cbd1 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.0.50, 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/lisp/cus-edit.el b/lisp/cus-edit.el
index aa26ac3..22f12ba 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1164,7 +1164,7 @@ Show the buffer in another window, but don't select it."
     (unless (eq symbol basevar)
       (message "`%s' is an alias for `%s'" symbol basevar))))
 
-(defvar customize-changed-options-previous-release "24.1"
+(defvar customize-changed-options-previous-release "24.5"
   "Version for `customize-changed-options' to refer back to by default.")
 
 ;; Packages will update this variable, so make it available.
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index e1609f2..c82b27a 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 ""/
 /^#undef PENDING_OUTPUT_COUNT/s/^.*$/#define PENDING_OUTPUT_COUNT(FILE) 
((FILE)->_ptr - (FILE)->_base)/
-/^#undef VERSION/s/^.*$/#define VERSION "25.0.50"/
+/^#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/