Bump version to 24.2.50

diff --git a/README b/README
index de4ee24fc5eb324178f9bade07c62fb987d06a04..a11935ee3e8948ebb26f6092bd6b594635ac6959 100644 (file)
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ Copyright (C) 2001-2012  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 
-This directory tree holds version 24.1.50 of GNU Emacs, the extensible,
+This directory tree holds version 24.2.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 408413f2c07c8f1f127c5ab0c0fdfe1425753a3f..92fb5f8413b85191561b715ab4da5839ec6d75ea 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.1.50)
+AC_INIT(emacs, 24.2.50)
 AC_CONFIG_HEADER(src/config.h:src/config.in)
 AC_CONFIG_SRCDIR(src/lisp.h)
 AC_CONFIG_AUX_DIR(build-aux)

diff --git a/doc/emacs/emacsver.texi b/doc/emacs/emacsver.texi
index 88c6f2c6045b082359bcdb6f5950569a943042c2..3b54719ad77d7766a81d7538524c3206eb172b12 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.1.50
+@set EMACSVER 24.2.50

diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index d3d8a0095b88cef707424bea1c1ea739a4ab41ac..a3d738005030005108eb37197acf8aa7c67fd167 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.1.50"
+.TH EMACS 1 "2007 April 13" "GNU Emacs 24.2.50"
 .
 .
 .SH NAME

diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index ae0db1339c9a2091ab7abe83055de576b54fcfd6..25bc5ed12fdf84c2ab3bf7e4c98bc3a67e52d5e5 100644 (file)
--- a/msdos/sed2v2.inp
+++ b/msdos/sed2v2.inp
@@ -70,7 +70,7 @@
 /^#undef PACKAGE_STRING/s/^.*$/#define PACKAGE_STRING ""/
 /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/
 /^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION ""/
-/^#undef VERSION/s/^.*$/#define VERSION "24.1.50"/
+/^#undef VERSION/s/^.*$/#define VERSION "24.2.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/nextstep/Cocoa/Emacs.base/Contents/Info.plist b/nextstep/Cocoa/Emacs.base/Contents/Info.plist
index 31100020cc3df40312049ba763029b7affb85c1d..f5490f613fd1a72230a12f057489231f04207339 100644 (file)
--- a/nextstep/Cocoa/Emacs.base/Contents/Info.plist
+++ b/nextstep/Cocoa/Emacs.base/Contents/Info.plist
@@ -553,7 +553,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
        <key>CFBundleExecutable</key>
        <string>Emacs</string>
        <key>CFBundleGetInfoString</key>
-       <string>Emacs 24.1.50 Copyright (C) 2012 Free Software Foundation, Inc.</string>
+       <string>Emacs 24.2.50 Copyright (C) 2012 Free Software Foundation, Inc.</string>
        <key>CFBundleIconFile</key>
        <string>Emacs.icns</string>
        <key>CFBundleIdentifier</key>
@@ -566,7 +566,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
        <string>APPL</string>
        <!-- This should be the emacs version number. -->
        <key>CFBundleShortVersionString</key>
-       <string>24.1.50</string>
+       <string>24.2.50</string>
        <key>CFBundleSignature</key>
        <string>EMAx</string>
        <!-- This SHOULD be a build number. -->

diff --git a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
index cd1920317b045f94b9e17b816caf1cd37c1b28cd..7655c0ca8ec7565aa2969965560334ad852e2446 100644 (file)
--- a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
+++ b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
@@ -1,6 +1,6 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Emacs";
-CFBundleShortVersionString = "Version 24.1.50";
-CFBundleGetInfoString = "Emacs version 24.1.50, NS Windowing";
+CFBundleShortVersionString = "Version 24.2.50";
+CFBundleGetInfoString = "Emacs version 24.2.50, NS Windowing";
 NSHumanReadableCopyright = "Copyright (C) 2012 Free Software Foundation, Inc.";

diff --git a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop
index 4e79b4f380ede716ef194bc7cfa4692f9a5fde6c..a36eafaadb0ba6eda4734e2452e8adce22aaf12c 100644 (file)
--- a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop
+++ b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Application
-Version=24.1.50
+Version=24.2.50
 Categories=GNUstep
 Name=Emacs
 Comment=GNU Emacs for NeXT/Open/GNUstep and OS X

diff --git a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
index e22b9daa373713331abea9fde629da6f1f9ee74c..6cde01b0d05f143448392c26e1b8a47da3e09eb8 100644 (file)
--- a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
+++ b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
@@ -2,7 +2,7 @@
     ApplicationDescription = "GNU Emacs for GNUstep / OS X";
     ApplicationIcon = emacs.tiff;
     ApplicationName = Emacs;
-    ApplicationRelease = "24.1.50";
+    ApplicationRelease = "24.2.50";
     Authors = (
        "Adrian Robert (GNUstep)",
        "Christophe de Dinechin (MacOS X)",
@@ -13,7 +13,7 @@
     );
     Copyright = "Copyright (C) 2012 Free Software Foundation, Inc.";
     CopyrightDescription = "Released under the GNU General Public License Version 3 or later";
-    FullVersionID = "Emacs 24.1.50, NS Windowing";
+    FullVersionID = "Emacs 24.2.50, NS Windowing";
     NSExecutable = Emacs;
     NSIcon = emacs.tiff;
     NSPrincipalClass = NSApplication;

diff --git a/nt/config.nt b/nt/config.nt
index 8c0a1ff99e00521fca276cddc0f52f720ae74097..b07c04d92e211742da752cf9dc5002bfed0fee1f 100644 (file)
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -1413,7 +1413,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef USG_SUBTTY_WORKS
 
 /* Version number of package */
-#define VERSION "24.1.50"
+#define VERSION "24.2.50"
 
 /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
    'wchar_t'. */

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

diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc
index d99b2fcd8faf36c1d7204c6dc1654956f9c64ad0..e79f1fa4aaae69c05d98b453608b7a9bf8d20a8c 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,1,50,0
- PRODUCTVERSION 24,1,50,0
+ FILEVERSION 24,2,50,0
+ PRODUCTVERSION 24,2,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, 1, 50, 0\0"
+           VALUE "FileVersion", "24, 2, 50, 0\0"
            VALUE "InternalName", "EmacsClient\0"
            VALUE "LegalCopyright", "Copyright (C) 2001-2012\0"
            VALUE "OriginalFilename", "emacsclientw.exe"
            VALUE "ProductName", "EmacsClient\0"
-           VALUE "ProductVersion", "24, 1, 50, 0\0"
+           VALUE "ProductVersion", "24, 2, 50, 0\0"
            VALUE "OLESelfRegister", "\0"
         END
      END

diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index fc5ecefd173c21fcc12e8e86c07b771b21b86219..cf4af2b14cd401d03f840609dbf9b4a275178051 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.1.50
+VERSION                = 24.2.50
 
 TMP_DIST_DIR   = emacs-$(VERSION)