Bump version to 24.2

diff --git a/ChangeLog b/ChangeLog
index 6cc2349..3109176 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <cyd@gnu.org>
+
+       * Version 24.2 released.
+
 2012-08-14  Ulrich Mueller  <ulm@gentoo.org>
 
        * lib/gnulib.mk:

diff --git a/README b/README
index 4226721..5902964 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 of GNU Emacs, the extensible,
+This directory tree holds version 24.2 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/admin/ChangeLog b/admin/ChangeLog
index abe759d..57b5ac0 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <cyd@gnu.org>
+
+       * Version 24.2 released.
+
 2012-08-10  Glenn Morris  <rgm@gnu.org>
 
        * bzrmerge.el (bzrmerge-resolve): Disable local eval:.

diff --git a/configure.in b/configure.in
index f9aef81..2b0b2f7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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)
+AC_INIT(emacs, 24.2)
 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 1253a7c..bb38638 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <cyd@gnu.org>
+
+       * Version 24.2 released.
+
 2012-07-31  Chong Yidong  <cyd@gnu.org>
 
        * emacs.texi: Fix ISBN (Bug#12080).

diff --git a/doc/emacs/emacsver.texi b/doc/emacs/emacsver.texi
index 1c12f47..7313b62 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
+@set EMACSVER 24.2

diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 0cf74ae..9a5f0a4 100644 (file)
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <cyd@gnu.org>
+
+       * Version 24.2 released.
+
 2012-06-19  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in: Rename infodir to buildinfodir throughout.  (Bug#11737)

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index f91f99d..8acf76c 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <cyd@gnu.org>
+
+       * Version 24.2 released.
+
 2012-08-06  Eli Zaretskii  <eliz@gnu.org>
 
        * functions.texi (Closures): Put the main index entry for

diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index 8355e67..07504eb 100644 (file)
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <cyd@gnu.org>
+
+       * Version 24.2 released.
+
 2012-06-01  Chong Yidong  <cyd@gnu.org>
 
        * Version 24.1 released.

diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index 6dd8c55..c6caebf 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"
+.TH EMACS 1 "2007 April 13" "GNU Emacs 24.2"
 .
 .
 .SH NAME

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 5a414e6..3311855 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <cyd@gnu.org>
+
+       * Version 24.2 released.
+
 2012-08-06  Aurélien Aptel  <aurelien.aptel@gmail.com>
 
        * url.texi (Parsed URLs): Adjust to the code's use of defstruct

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 903407e..af72e05 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <cyd@gnu.org>
+
+       * Version 24.2 released.
+
 2012-06-01  Chong Yidong  <cyd@gnu.org>
 
        * Version 24.1 released.

diff --git a/leim/ChangeLog b/leim/ChangeLog
index 2d062f6..c30e0fc 100644 (file)
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <cyd@gnu.org>
+
+       * Version 24.2 released.
+
 2012-06-01  Chong Yidong  <cyd@gnu.org>
 
        * Version 24.1 released.

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index bdb6058..6ae19d1 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <cyd@gnu.org>
+
+       * Version 24.2 released.
+
 2012-06-01  Chong Yidong  <cyd@gnu.org>
 
        * Version 24.1 released.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 143c255..7293a46 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <cyd@gnu.org>
+
+       * Version 24.2 released.
+
 2012-08-15  Leo Liu  <sdl.web@gmail.com>
 
        * net/rcirc.el (rcirc-split-message): Fix for buffer-local

diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 9d7da34..59b1b48 100644 (file)
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <cyd@gnu.org>
+
+       * Version 24.2 released.
+
 2012-06-01  Chong Yidong  <cyd@gnu.org>
 
        * Version 24.1 released.

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index b4d4586..37ef37f 100644 (file)
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <cyd@gnu.org>
+
+       * Version 24.2 released.
+
 2012-06-01  Chong Yidong  <cyd@gnu.org>
 
        * Version 24.1 released.

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 0a15a65..6e431cb 100644 (file)
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <cyd@gnu.org>
+
+       * Version 24.2 released.
+
 2012-06-01  Chong Yidong  <cyd@gnu.org>
 
        * Version 24.1 released.

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index dc3b532..8c588c4 100644 (file)
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <cyd@gnu.org>
+
+       * Version 24.2 released.
+
 2012-06-01  Chong Yidong  <cyd@gnu.org>
 
        * Version 24.1 released.

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 685f325..e71f266 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <cyd@gnu.org>
+
+       * Version 24.2 released.
+
 2012-06-23  Leo Liu  <sdl.web@gmail.com>
 
        * url-http.el (url-http-codes): Fix mal-formed defconst.

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index 4b07b79..8b8b341 100644 (file)
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <cyd@gnu.org>
+
+       * Version 24.2 released.
+
 2012-06-01  Chong Yidong  <cyd@gnu.org>
 
        * Version 24.1 released.

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index de20128..e7113ce 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <cyd@gnu.org>
+
+       * Version 24.2 released.
+
 2012-06-01  Chong Yidong  <cyd@gnu.org>
 
        * Version 24.1 released.

diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index 2e215bf..48ab482 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.1"/
+/^#undef VERSION/s/^.*$/#define VERSION "24.2"/
 /^#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 f5cbdc3..07dc3d1 100644 (file)
--- a/nextstep/ChangeLog
+++ b/nextstep/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <cyd@gnu.org>
+
+       * Version 24.2 released.
+
 2012-06-01  Chong Yidong  <cyd@gnu.org>
 
        * Version 24.1 released.

diff --git a/nextstep/Cocoa/Emacs.base/Contents/Info.plist b/nextstep/Cocoa/Emacs.base/Contents/Info.plist
index 793e022..34af9f3 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 Copyright (C) 2012 Free Software Foundation, Inc.</string>
+       <string>Emacs 24.2 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</string>
+       <string>24.2</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 19cdba8..02baa7b 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";
-CFBundleGetInfoString = "Emacs version 24.1, NS Windowing";
+CFBundleShortVersionString = "Version 24.2";
+CFBundleGetInfoString = "Emacs version 24.2, 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 da1a3be..fe8702a 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
+Version=24.2
 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 2c95656..cfbf09c 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";
+    ApplicationRelease = "24.2";
     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, NS Windowing";
+    FullVersionID = "Emacs 24.2, NS Windowing";
     NSExecutable = Emacs;
     NSIcon = emacs.tiff;
     NSPrincipalClass = NSApplication;

diff --git a/nt/ChangeLog b/nt/ChangeLog
index f27b486..abc71a1 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <cyd@gnu.org>
+
+       * Version 24.2 released.
+
 2012-06-01  Chong Yidong  <cyd@gnu.org>
 
        * Version 24.1 released.

diff --git a/nt/config.nt b/nt/config.nt
index 94cb607..d44df3c 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.1"
+#define VERSION "24.2"
 
 /* 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 e9d472d..e92b665 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,0,0
- PRODUCTVERSION 24,1,0,0
+ FILEVERSION 24,2,0,0
+ PRODUCTVERSION 24,2,0,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, 0, 0\0"
+           VALUE "FileVersion", "24, 2, 0, 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, 0, 0\0"
+           VALUE "ProductVersion", "24, 2, 0, 0\0"
            VALUE "OLESelfRegister", "\0"
         END
      END

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

diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index cb15178..161fc8f 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\r
 #        (and remove or replace this comment).\r
 \r
-VERSION                = 24.1\r
+VERSION                = 24.2\r
 \r
 TMP_DIST_DIR   = emacs-$(VERSION)\r
 \r

diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index 2d42a65..338f9e7 100644 (file)
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <cyd@gnu.org>
+
+       * Version 24.2 released.
+
 2012-06-01  Chong Yidong  <cyd@gnu.org>
 
        * Version 24.1 released.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2636990..7da25a8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <cyd@gnu.org>
+
+       * Version 24.2 released.
+
 2012-08-14  Glenn Morris  <rgm@gnu.org>
 
        * eval.c (Fcalled_interactively_p): Doc fix.  (Bug#11747)

diff --git a/test/ChangeLog b/test/ChangeLog
index 1cdd054..4f707a4 100644 (file)
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-15  Chong Yidong  <cyd@gnu.org>
+
+       * Version 24.2 released.
+
 2012-08-14  Chong Yidong  <cyd@gnu.org>
 
        * automated/files.el: Test every combination of values for