Bump trunk version to 24.1.50.

* README, configure.in (AC_INIT): Bump version to 24.1.50.

* doc/emacs/emacsver.texi (EMACSVER): Bump version to 24.1.50.

* doc/man/emacs.1: Bump version to 24.1.50.

* msdos/sed2v2.inp: Bump version to 24.1.50.

* nextstep/Cocoa/Emacs.base/Contents/Info.plist:
* nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:
* nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist:
* nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop:
Bump version to 24.1.50.

* nt/config.nt, nt/makefile.w32-in, nt/emacs.rc, nt/emacsclient.rc:
Bump version to 24.1.50.

diff --git a/ChangeLog b/ChangeLog
index 8c0e8104c4c4f65af980624d1d2d19f26b994bec..c39032582001eb06357c779b8f2f461b8a36b7bf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-07  Glenn Morris  <rgm@gnu.org>
+
+       * README, configure.in (AC_INIT): Bump version to 24.1.50.
+
 2012-04-07  Eli Zaretskii  <eliz@gnu.org>
 
        * lib/makefile.w32-in (gnulib, all): Don't depend on stamp_BLD.

diff --git a/README b/README
index 8710ad438aa1c70e06428ad9ea0f35a38a49fcf2..4e1a4c4556ff58dc5ecca9d47f3e74d455cc43ea 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.0.95 of GNU Emacs, the extensible,
+This directory tree holds version 24.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.in b/configure.in
index 78d811154436c3a3e5e15a530dc25f0da1227c51..20b6de07246dbec0504c7dfb723d8295bf57770f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl     autoconf
 dnl in the directory containing this script.
 dnl If you changed any AC_DEFINES, also run autoheader.
 dnl
-dnl Copyright (C) 1994-1996, 1999-2012  Free Software Foundation, Inc.
+dnl Copyright (C) 1994-1996, 1999-2012 Free Software Foundation, Inc.
 dnl
 dnl  This file is part of GNU Emacs.
 dnl
@@ -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.0.95)
+AC_INIT(emacs, 24.1.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/ChangeLog b/doc/emacs/ChangeLog
index 8b50579ba107e610be8cee2d9b7f97a0d05bb8cf..549b677c4f291a94653b17110cf78fa22e5543a8 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-07  Glenn Morris  <rgm@gnu.org>
+
+       * emacsver.texi (EMACSVER): Bump version to 24.1.50.
+
 2012-04-05  Glenn Morris  <rgm@gnu.org>
 
        * glossary.texi (Glossary): Use anchors for internal cross-references.

diff --git a/doc/emacs/emacsver.texi b/doc/emacs/emacsver.texi
index 809fbcb6442757d4f3bc4d456ae78879930dff72..88c6f2c6045b082359bcdb6f5950569a943042c2 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.0.95
+@set EMACSVER 24.1.50

diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index b6def1a7d8ce06d25e0d766916ab7b6c104465f1..cf7e1a50c9f3a3d989f89a79b29cf55d89069fa7 100644 (file)
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-07  Glenn Morris  <rgm@gnu.org>
+
+       * emacs.1: Bump version to 24.1.50.
+
 2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
 
        * etags.1: Fix typo.

diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index 94d2a0c35bffbc05ed8916474afdafda6c4f197b..ff67324568065c3004c101138e80b211e0663d0c 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.0.95"
+.TH EMACS 1 "2007 April 13" "GNU Emacs 24.1.50"
 .
 .
 .SH NAME

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index b057a06bbd6752d1a1a5d176a678440696b53605..0c00364d6fa7c5449a35750694ba4d5b4a766efb 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-07  Glenn Morris  <rgm@gnu.org>
+
+       * sed2v2.inp: Bump version to 24.1.50.
+
 2012-02-04  Eli Zaretskii  <eliz@gnu.org>
 
        * sed3v2.inp (insrcdir): Use $(<F) rather than $<, as

diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index b96b1000c49668f2ad9fb3f087d067e4108d2e9a..7c7a4ad6271279410dfc80a01ff583ad9715ac6a 100644 (file)
--- a/msdos/sed2v2.inp
+++ b/msdos/sed2v2.inp
@@ -59,7 +59,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.0.95"/
+/^#undef VERSION/s/^.*$/#define VERSION "24.1.50"/
 /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/
 /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/
 /^#undef HAVE_DIRENT_H/s/^.*$/#define HAVE_DIRENT_H 1/

diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog
index 6a080ac2e316d1ed6680505eea250f05f244fa5d..6451f7a73226088df297482927a1f7af29d5bc5b 100644 (file)
--- a/nextstep/ChangeLog
+++ b/nextstep/ChangeLog
@@ -1,3 +1,11 @@
+2012-04-07  Glenn Morris  <rgm@gnu.org>
+
+       * Cocoa/Emacs.base/Contents/Info.plist:
+       * Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:
+       * GNUstep/Emacs.base/Resources/Info-gnustep.plist:
+       * GNUstep/Emacs.base/Resources/Emacs.desktop:
+       Bump version to 24.1.50.
+
 2012-01-05  Glenn Morris  <rgm@gnu.org>
 
        * Cocoa/Emacs.base/Contents/Info.plist:

diff --git a/nextstep/Cocoa/Emacs.base/Contents/Info.plist b/nextstep/Cocoa/Emacs.base/Contents/Info.plist
index 8fa9d4a125b454d962b71415b13cd706f1397ff0..31100020cc3df40312049ba763029b7affb85c1d 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.0.95 Copyright (C) 2012 Free Software Foundation, Inc.</string>
+       <string>Emacs 24.1.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.0.95</string>
+       <string>24.1.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 4be577ecc14f6cfdc8ea94e1fc9a1f48c9517744..cd1920317b045f94b9e17b816caf1cd37c1b28cd 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.0.95";
-CFBundleGetInfoString = "Emacs version 24.0.95, NS Windowing";
+CFBundleShortVersionString = "Version 24.1.50";
+CFBundleGetInfoString = "Emacs version 24.1.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 add1a608a5eb4acc545de8d7d974d77b625a3f0f..4e79b4f380ede716ef194bc7cfa4692f9a5fde6c 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.0.95
+Version=24.1.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 86e3897421c1871d4e22c8021235dd2dc3802a7b..e22b9daa373713331abea9fde629da6f1f9ee74c 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.0.95";
+    ApplicationRelease = "24.1.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.0.95, NS Windowing";
+    FullVersionID = "Emacs 24.1.50, NS Windowing";
     NSExecutable = Emacs;
     NSIcon = emacs.tiff;
     NSPrincipalClass = NSApplication;

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 88cafb5985958422ff67151a81507b74ef7d98e1..349a43fe692f84dae499b6e4d7e4037d23d5ee77 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-07  Glenn Morris  <rgm@gnu.org>
+
+       * config.nt, makefile.w32-in, emacs.rc, emacsclient.rc:
+       Bump version to 24.1.50.
+
 2012-04-07  Eli Zaretskii  <eliz@gnu.org>
 
        * configure.bat: Support building with libxml2.

diff --git a/nt/config.nt b/nt/config.nt
index 2e8215b3488a5d5d5804db5b46fb58e1f72e7a25..8aadf2c150d09486ea825617e47dbcb116cc19c0 100644 (file)
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -331,7 +331,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define PACKAGE "emacs"
 
 /* Version number of package */
-#define VERSION "24.0.95"
+#define VERSION "24.1.50"
 
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */

diff --git a/nt/emacs.rc b/nt/emacs.rc
index a5fd0e3163b4e2ee4a04c881edcdc4f0243e3ece..7a6b00ef2a8f8c2195db1a9104b2d11f7a99ea55 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,0,95,0
- PRODUCTVERSION 24,0,95,0
+ FILEVERSION 24,1,50,0
+ PRODUCTVERSION 24,1,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, 0, 95, 0\0"
+           VALUE "FileVersion", "24, 1, 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, 0, 95, 0\0"
+           VALUE "ProductVersion", "24, 1, 50, 0\0"
            VALUE "OLESelfRegister", "\0"
         END
      END

diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc
index f0543ea1a6e74030362b6c44c5a1b4c995a83937..d99b2fcd8faf36c1d7204c6dc1654956f9c64ad0 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,0,95,0
- PRODUCTVERSION 24,0,95,0
+ FILEVERSION 24,1,50,0
+ PRODUCTVERSION 24,1,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, 0, 95, 0\0"
+           VALUE "FileVersion", "24, 1, 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, 0, 95, 0\0"
+           VALUE "ProductVersion", "24, 1, 50, 0\0"
            VALUE "OLESelfRegister", "\0"
         END
      END

diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 48f4e299fc698bb6675febdabb420c67c989253c..f090849e6a90e555a4835825694fa77f23b03f6f 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.0.95
+VERSION                = 24.1.50
 
 TMP_DIST_DIR   = emacs-$(VERSION)