Bump Emacs version to 24.5.50.

diff --git a/README b/README
index 51fb00015ad0b5892166df04f9dd031e98d373d8..191eefde61e37a416b02b22b0dcddc83d07cd048 100644 (file)
--- 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 24.5 of GNU Emacs, the extensible,
+This directory tree holds version 24.5.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 4291453535b4b9fdf871821d1cedc02c2999ee98..faa2b6d316729c54806adfb933812a74968f8c23 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl  You should have received a copy of the GNU General Public License
 dnl  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.65)
-AC_INIT(emacs, 24.5)
+AC_INIT(emacs, 24.5.50)
 
 dnl We get MINGW64 with MSYS2
 if test "x$MSYSTEM" = "xMINGW32" -o "x$MSYSTEM" = "xMINGW64"

diff --git a/doc/emacs/emacsver.texi b/doc/emacs/emacsver.texi
index bdc3c03b8505bcd6292c4b82f058a7c91d1be19c..1697a82fbd57e4f5f28b74d8f7212554f4833742 100644 (file)
--- a/doc/emacs/emacsver.texi
+++ b/doc/emacs/emacsver.texi
@@ -1,4 +1,4 @@
 @c It would be nicer to generate this using configure and @version@.
 @c However, that would mean emacsver.texi would always be newer
 @c then the info files in release tarfiles.
-@set EMACSVER 24.5
+@set EMACSVER 24.5.50

diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index 3fcec6bfbcd1c14a61ee04d7201dff6b5bc8b38e..f9978752a64c73f98d1082b7cc649dd2756d0eab 100644 (file)
--- a/doc/man/emacs.1
+++ b/doc/man/emacs.1
@@ -1,5 +1,5 @@
 .\" See section COPYING for copyright and redistribution information.
-.TH EMACS 1 "2007 April 13" "GNU Emacs 24.5"
+.TH EMACS 1 "2007 April 13" "GNU Emacs 24.5.50"
 .
 .
 .SH NAME

diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index f931afb48d1ac4516603c22090f93a08e34ba95e..20399f116ca1681619dc19447849033fcb163de0 100644 (file)
--- a/msdos/sed2v2.inp
+++ b/msdos/sed2v2.inp
@@ -70,7 +70,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 "24.5"/
+/^#undef VERSION/s/^.*$/#define VERSION "24.5.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/config.nt b/nt/config.nt
index 7827b15d2ef2ca5342a4204a4a2ead035440d981..c06270cff27edd3d26966d8a00f4aeed174b8676 100644 (file)
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -1576,7 +1576,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef USG_SUBTTY_WORKS
 
 /* Version number of package */
-#define VERSION "24.5"
+#define VERSION "24.5.50"
 
 /* Define to 1 if unsetenv returns void instead of int. */
 #undef VOID_UNSETENV

diff --git a/nt/emacs.rc b/nt/emacs.rc
index e0077864cc8cb845634813a0dbba45963a45343d..942620216cf3a7a224deb0b43f68646fab11a1c4 100644 (file)
--- a/nt/emacs.rc
+++ b/nt/emacs.rc
@@ -11,8 +11,8 @@ Emacs ICON   icons/emacs.ico
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 24,5,0,0
- PRODUCTVERSION 24,5,0,0
+ FILEVERSION 24,5,50,0
+ PRODUCTVERSION 24,5,50,0
  FILEFLAGSMASK 0x3FL
 #ifdef EMACSDEBUG
  FILEFLAGS 0x1L
@@ -29,12 +29,12 @@ BEGIN
        BEGIN
            VALUE "CompanyName", "Free Software Foundation\0"
            VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0"
-           VALUE "FileVersion", "24, 5, 0, 0\0"
+           VALUE "FileVersion", "24, 5, 50, 0\0"
            VALUE "InternalName", "Emacs\0"
            VALUE "LegalCopyright", "Copyright (C) 2001-2015\0"
            VALUE "OriginalFilename", "emacs.exe"
            VALUE "ProductName", "Emacs\0"
-           VALUE "ProductVersion", "24, 5, 0, 0\0"
+           VALUE "ProductVersion", "24, 5, 50, 0\0"
            VALUE "OLESelfRegister", "\0"
         END
      END

diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc
index 15bdda1db890425137e5ef6946753fc9ecdb723f..9df550a90bdaa01d354a341718ea624a209996f4 100644 (file)
--- a/nt/emacsclient.rc
+++ b/nt/emacsclient.rc
@@ -5,8 +5,8 @@ Emacs ICON   icons\emacs.ico
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 24,5,0,0
- PRODUCTVERSION 24,5,0,0
+ FILEVERSION 24,5,50,0
+ PRODUCTVERSION 24,5,50,0
  FILEFLAGSMASK 0x3FL
 #ifdef EMACSDEBUG
  FILEFLAGS 0x1L
@@ -23,12 +23,12 @@ BEGIN
        BEGIN
            VALUE "CompanyName", "Free Software Foundation\0"
            VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0"
-           VALUE "FileVersion", "24, 5, 0, 0\0"
+           VALUE "FileVersion", "24, 5, 50, 0\0"
            VALUE "InternalName", "EmacsClient\0"
            VALUE "LegalCopyright", "Copyright (C) 2001-2015\0"
            VALUE "OriginalFilename", "emacsclientw.exe"
            VALUE "ProductName", "EmacsClient\0"
-           VALUE "ProductVersion", "24, 5, 0, 0\0"
+           VALUE "ProductVersion", "24, 5, 50, 0\0"
            VALUE "OLESelfRegister", "\0"
         END
      END

diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index b374dc305122ad67adafa0008812dfc7bde320ab..f0099abde2dccb3f2111e3d53793191c1a0eadad 100644 (file)
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -22,7 +22,7 @@
 # FIXME: This file uses DOS EOLs.  Convert to Unix after 22.1 is out
 #        (and remove or replace this comment).
 
-VERSION                = 24.5
+VERSION                = 24.5.50
 
 TMP_DIST_DIR   = emacs-$(VERSION)