From ddf0e868c2461257cb922f415dea8d713400c1f8 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Thu, 16 Aug 2012 00:12:37 +0800 Subject: [PATCH] Bump version to 24.2 --- ChangeLog | 4 ++++ README | 2 +- admin/ChangeLog | 4 ++++ configure.in | 2 +- doc/emacs/ChangeLog | 4 ++++ doc/emacs/emacsver.texi | 2 +- doc/lispintro/ChangeLog | 4 ++++ doc/lispref/ChangeLog | 4 ++++ doc/man/ChangeLog | 4 ++++ doc/man/emacs.1 | 2 +- doc/misc/ChangeLog | 4 ++++ etc/ChangeLog | 4 ++++ leim/ChangeLog | 4 ++++ lib-src/ChangeLog | 4 ++++ lisp/ChangeLog | 4 ++++ lisp/cedet/ChangeLog | 4 ++++ lisp/erc/ChangeLog | 4 ++++ lisp/mh-e/ChangeLog | 4 ++++ lisp/org/ChangeLog | 4 ++++ lisp/url/ChangeLog | 4 ++++ lwlib/ChangeLog | 4 ++++ msdos/ChangeLog | 4 ++++ msdos/sed2v2.inp | 2 +- nextstep/ChangeLog | 4 ++++ nextstep/Cocoa/Emacs.base/Contents/Info.plist | 4 ++-- .../Contents/Resources/English.lproj/InfoPlist.strings | 4 ++-- nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop | 2 +- nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist | 4 ++-- nt/ChangeLog | 4 ++++ nt/config.nt | 2 +- nt/emacs.rc | 8 ++++---- nt/emacsclient.rc | 8 ++++---- nt/makefile.w32-in | 2 +- oldXMenu/ChangeLog | 4 ++++ src/ChangeLog | 4 ++++ test/ChangeLog | 4 ++++ 36 files changed, 114 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6cc23499bb..31091767f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-08-15 Chong Yidong + + * Version 24.2 released. + 2012-08-14 Ulrich Mueller * lib/gnulib.mk: diff --git a/README b/README index 4226721862..590296461d 100644 --- 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 abe759dc53..57b5ac0bd2 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,7 @@ +2012-08-15 Chong Yidong + + * Version 24.2 released. + 2012-08-10 Glenn Morris * bzrmerge.el (bzrmerge-resolve): Disable local eval:. diff --git a/configure.in b/configure.in index f9aef8195c..2b0b2f7e9b 100644 --- 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 . 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 1253a7cec6..bb3863858a 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2012-08-15 Chong Yidong + + * Version 24.2 released. + 2012-07-31 Chong Yidong * emacs.texi: Fix ISBN (Bug#12080). diff --git a/doc/emacs/emacsver.texi b/doc/emacs/emacsver.texi index 1c12f47497..7313b62c25 100644 --- 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 0cf74ae587..9a5f0a43fc 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -1,3 +1,7 @@ +2012-08-15 Chong Yidong + + * Version 24.2 released. + 2012-06-19 Glenn Morris * Makefile.in: Rename infodir to buildinfodir throughout. (Bug#11737) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index f91f99d9c3..8acf76c93b 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2012-08-15 Chong Yidong + + * Version 24.2 released. + 2012-08-06 Eli Zaretskii * functions.texi (Closures): Put the main index entry for diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog index 8355e67421..07504ebaf6 100644 --- a/doc/man/ChangeLog +++ b/doc/man/ChangeLog @@ -1,3 +1,7 @@ +2012-08-15 Chong Yidong + + * Version 24.2 released. + 2012-06-01 Chong Yidong * Version 24.1 released. diff --git a/doc/man/emacs.1 b/doc/man/emacs.1 index 6dd8c55b01..c6caebf890 100644 --- 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 5a414e66f9..33118558cb 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2012-08-15 Chong Yidong + + * Version 24.2 released. + 2012-08-06 Aurélien Aptel * url.texi (Parsed URLs): Adjust to the code's use of defstruct diff --git a/etc/ChangeLog b/etc/ChangeLog index 903407e47d..af72e050e4 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2012-08-15 Chong Yidong + + * Version 24.2 released. + 2012-06-01 Chong Yidong * Version 24.1 released. diff --git a/leim/ChangeLog b/leim/ChangeLog index 2d062f6e54..c30e0fc787 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,3 +1,7 @@ +2012-08-15 Chong Yidong + + * Version 24.2 released. + 2012-06-01 Chong Yidong * Version 24.1 released. diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index bdb6058c09..6ae19d1fdf 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2012-08-15 Chong Yidong + + * Version 24.2 released. + 2012-06-01 Chong Yidong * Version 24.1 released. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 143c255136..7293a4626f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2012-08-15 Chong Yidong + + * Version 24.2 released. + 2012-08-15 Leo Liu * net/rcirc.el (rcirc-split-message): Fix for buffer-local diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog index 9d7da3430a..59b1b480d4 100644 --- a/lisp/cedet/ChangeLog +++ b/lisp/cedet/ChangeLog @@ -1,3 +1,7 @@ +2012-08-15 Chong Yidong + + * Version 24.2 released. + 2012-06-01 Chong Yidong * Version 24.1 released. diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index b4d4586b6f..37ef37f1ed 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,7 @@ +2012-08-15 Chong Yidong + + * Version 24.2 released. + 2012-06-01 Chong Yidong * Version 24.1 released. diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index 0a15a65dc7..6e431cb809 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,3 +1,7 @@ +2012-08-15 Chong Yidong + + * Version 24.2 released. + 2012-06-01 Chong Yidong * Version 24.1 released. diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index dc3b532b53..8c588c4d55 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -1,3 +1,7 @@ +2012-08-15 Chong Yidong + + * Version 24.2 released. + 2012-06-01 Chong Yidong * Version 24.1 released. diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 685f32505b..e71f266c54 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,3 +1,7 @@ +2012-08-15 Chong Yidong + + * Version 24.2 released. + 2012-06-23 Leo Liu * url-http.el (url-http-codes): Fix mal-formed defconst. diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index 4b07b7927a..8b8b3418c7 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -1,3 +1,7 @@ +2012-08-15 Chong Yidong + + * Version 24.2 released. + 2012-06-01 Chong Yidong * Version 24.1 released. diff --git a/msdos/ChangeLog b/msdos/ChangeLog index de20128d88..e7113ce266 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,7 @@ +2012-08-15 Chong Yidong + + * Version 24.2 released. + 2012-06-01 Chong Yidong * Version 24.1 released. diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index 2e215bfd4e..48ab482f7f 100644 --- 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 f5cbdc3384..07dc3d1bb4 100644 --- a/nextstep/ChangeLog +++ b/nextstep/ChangeLog @@ -1,3 +1,7 @@ +2012-08-15 Chong Yidong + + * Version 24.2 released. + 2012-06-01 Chong Yidong * Version 24.1 released. diff --git a/nextstep/Cocoa/Emacs.base/Contents/Info.plist b/nextstep/Cocoa/Emacs.base/Contents/Info.plist index 793e022f86..34af9f34c4 100644 --- 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 . CFBundleExecutable Emacs CFBundleGetInfoString - Emacs 24.1 Copyright (C) 2012 Free Software Foundation, Inc. + Emacs 24.2 Copyright (C) 2012 Free Software Foundation, Inc. CFBundleIconFile Emacs.icns CFBundleIdentifier @@ -566,7 +566,7 @@ along with GNU Emacs. If not, see . APPL CFBundleShortVersionString - 24.1 + 24.2 CFBundleSignature EMAx 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 19cdba8a0d..02baa7ba6c 100644 --- 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 da1a3be2f8..fe8702a490 100644 --- 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 2c95656af5..cfbf09c9ef 100644 --- 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 f27b4867eb..abc71a1bb1 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2012-08-15 Chong Yidong + + * Version 24.2 released. + 2012-06-01 Chong Yidong * Version 24.1 released. diff --git a/nt/config.nt b/nt/config.nt index 94cb607260..d44df3c21f 100644 --- a/nt/config.nt +++ b/nt/config.nt @@ -331,7 +331,7 @@ along with GNU Emacs. If not, see . */ #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 e9d472de79..e92b665ef4 100644 --- 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 0af025c6c0..5c905a8c53 100644 --- 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 cb15178588..161fc8fd70 100644 --- 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 +VERSION = 24.2 TMP_DIST_DIR = emacs-$(VERSION) diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog index 2d42a65356..338f9e7542 100644 --- a/oldXMenu/ChangeLog +++ b/oldXMenu/ChangeLog @@ -1,3 +1,7 @@ +2012-08-15 Chong Yidong + + * Version 24.2 released. + 2012-06-01 Chong Yidong * Version 24.1 released. diff --git a/src/ChangeLog b/src/ChangeLog index 26369903c3..7da25a856e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-08-15 Chong Yidong + + * Version 24.2 released. + 2012-08-14 Glenn Morris * eval.c (Fcalled_interactively_p): Doc fix. (Bug#11747) diff --git a/test/ChangeLog b/test/ChangeLog index 1cdd054da3..4f707a4e74 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,7 @@ +2012-08-15 Chong Yidong + + * Version 24.2 released. + 2012-08-14 Chong Yidong * automated/files.el: Test every combination of values for -- 2.20.1