Mercurial > emacs

changeset 107367:b4d27afff1bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bump version to 24.0.50.
author Chong Yidong <cyd@stupidchicken.com>
date Wed, 10 Mar 2010 10:17:13 -0500
parents 14ff9accfbd3
children 3067c2b8b6a6
files ChangeLog README admin/ChangeLog configure.in doc/emacs/ChangeLog doc/emacs/emacs.texi doc/lispintro/ChangeLog doc/lispref/ChangeLog doc/lispref/book-spine.texinfo doc/lispref/elisp.texi doc/lispref/vol1.texi doc/lispref/vol2.texi doc/man/ChangeLog doc/man/emacs.1 doc/misc/ChangeLog doc/misc/faq.texi etc/ChangeLog leim/ChangeLog lib-src/ChangeLog lib-src/makefile.w32-in lisp/ChangeLog lisp/erc/ChangeLog lisp/mh-e/ChangeLog lisp/org/ChangeLog lisp/url/ChangeLog lisp/version.el lwlib/ChangeLog msdos/ChangeLog nextstep/ChangeLog nextstep/Cocoa/Emacs.base/Contents/Info.plist nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist nt/ChangeLog nt/emacs.rc nt/emacsclient.rc oldXMenu/ChangeLog src/ChangeLog test/ChangeLog
diffstat 39 files changed, 114 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Mar 10 09:45:21 2010 -0500
+++ b/ChangeLog	Wed Mar 10 10:17:13 2010 -0500
@@ -1,3 +1,7 @@
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+	* Branch for 23.2.
+
 2010-01-31  Juri Linkov  <juri@jurta.org>
 
 	* .bzrignore: Add TAGS-LISP.
--- a/README	Wed Mar 10 09:45:21 2010 -0500
+++ b/README	Wed Mar 10 10:17:13 2010 -0500
@@ -3,7 +3,7 @@
 See the end of the file for license conditions.
 
 
-This directory tree holds version 23.1.93 of GNU Emacs, the extensible,
+This directory tree holds version 24.0.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
--- a/admin/ChangeLog	Wed Mar 10 09:45:21 2010 -0500
+++ b/admin/ChangeLog	Wed Mar 10 10:17:13 2010 -0500
@@ -1,3 +1,7 @@
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+	* Branch for 23.2.
+
 2010-03-10  Miles Bader  <miles@gnu.org>
 
 	* quick-install-emacs: Use more portable shell syntax.
--- a/configure.in	Wed Mar 10 09:45:21 2010 -0500
+++ b/configure.in	Wed Mar 10 10:17:13 2010 -0500
@@ -22,7 +22,7 @@
 dnl  along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.62)
-AC_INIT(emacs, 23.1.93)
+AC_INIT(emacs, 24.0.50)
 AC_CONFIG_HEADER(src/config.h:src/config.in)
 AC_CONFIG_SRCDIR(src/lisp.h)
 
--- a/doc/emacs/ChangeLog	Wed Mar 10 09:45:21 2010 -0500
+++ b/doc/emacs/ChangeLog	Wed Mar 10 10:17:13 2010 -0500
@@ -1,3 +1,7 @@
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+	* Branch for 23.2.
+
 2010-03-06  Chong Yidong  <cyd@stupidchicken.com>
 
 	* custom.texi (Init Examples): Add xref to Locals.
--- a/doc/emacs/emacs.texi	Wed Mar 10 09:45:21 2010 -0500
+++ b/doc/emacs/emacs.texi	Wed Mar 10 10:17:13 2010 -0500
@@ -5,7 +5,7 @@
 
 @c The edition number appears in several places in this file
 @set EDITION   Sixteenth
-@set EMACSVER  23.1.93
+@set EMACSVER  24.0.50
 
 @copying
 This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@*
--- a/doc/lispintro/ChangeLog	Wed Mar 10 09:45:21 2010 -0500
+++ b/doc/lispintro/ChangeLog	Wed Mar 10 10:17:13 2010 -0500
@@ -1,3 +1,7 @@
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+	* Branch for 23.2.
+
 2010-02-16  Glenn Morris  <rgm@gnu.org>
 
 	* emacs-lisp-intro.texi: Fix typo in name of `find-tag' command.
--- a/doc/lispref/ChangeLog	Wed Mar 10 09:45:21 2010 -0500
+++ b/doc/lispref/ChangeLog	Wed Mar 10 10:17:13 2010 -0500
@@ -1,3 +1,7 @@
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+	* Branch for 23.2.
+
 2010-03-06  Chong Yidong  <cyd@stupidchicken.com>
 
 	* objects.texi (Integer Type): Take note of the read syntax
--- a/doc/lispref/book-spine.texinfo	Wed Mar 10 09:45:21 2010 -0500
+++ b/doc/lispref/book-spine.texinfo	Wed Mar 10 10:17:13 2010 -0500
@@ -11,7 +11,7 @@
 @center @titlefont{GNU Emacs Lisp Reference Manual}
 @sp 5
 @center GNU
-@center Emacs Version 23.1.93
+@center Emacs Version 24.0.50
 @center for Unix Users
 @sp 5
 
--- a/doc/lispref/elisp.texi	Wed Mar 10 09:45:21 2010 -0500
+++ b/doc/lispref/elisp.texi	Wed Mar 10 10:17:13 2010 -0500
@@ -8,7 +8,7 @@
 @c Please remember to update the edition number in README as well.
 @c And also the copies in vol1.texi and vol2.texi.
 @set VERSION  3.0
-@set EMACSVER 23.1.93
+@set EMACSVER 24.0.50
 @set DATE July 2009
 
 @c in general, keep the following line commented out, unless doing a
--- a/doc/lispref/vol1.texi	Wed Mar 10 09:45:21 2010 -0500
+++ b/doc/lispref/vol1.texi	Wed Mar 10 10:17:13 2010 -0500
@@ -27,7 +27,7 @@
 @c Version of the manual and of Emacs.
 @c Please remember to update the edition number in README as well.
 @set VERSION  3.0
-@set EMACSVER 23.1.93
+@set EMACSVER 24.0.50
 @set DATE July 2009
 
 @dircategory Emacs
--- a/doc/lispref/vol2.texi	Wed Mar 10 09:45:21 2010 -0500
+++ b/doc/lispref/vol2.texi	Wed Mar 10 10:17:13 2010 -0500
@@ -27,7 +27,7 @@
 @c Version of the manual and of Emacs.
 @c Please remember to update the edition number in README as well.
 @set VERSION  3.0
-@set EMACSVER 23.1.93
+@set EMACSVER 24.0.50
 @set DATE July 2009
 
 @dircategory Emacs
--- a/doc/man/ChangeLog	Wed Mar 10 09:45:21 2010 -0500
+++ b/doc/man/ChangeLog	Wed Mar 10 10:17:13 2010 -0500
@@ -1,3 +1,7 @@
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+	* Branch for 23.2.
+
 2010-01-09  Chong Yidong  <cyd@stupidchicken.com>
 
 	* emacs.1: Copyedits.  Update options -Q, -mm and --daemon.  Remove
--- a/doc/man/emacs.1	Wed Mar 10 09:45:21 2010 -0500
+++ b/doc/man/emacs.1	Wed Mar 10 10:17:13 2010 -0500
@@ -1,5 +1,5 @@
 .\" See section COPYING for copyright and redistribution information.
-.TH EMACS 1 "2007 April 13" "GNU Emacs 23.1.93"
+.TH EMACS 1 "2007 April 13" "GNU Emacs 24.0.50"
 .
 .
 .SH NAME
--- a/doc/misc/ChangeLog	Wed Mar 10 09:45:21 2010 -0500
+++ b/doc/misc/ChangeLog	Wed Mar 10 10:17:13 2010 -0500
@@ -1,3 +1,7 @@
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+	* Branch for 23.2.
+
 2010-03-03  Chong Yidong  <cyd@stupidchicken.com>
 
 	* faq.texi (Escape sequences in shell output): Note that ansi-color is
--- a/doc/misc/faq.texi	Wed Mar 10 09:45:21 2010 -0500
+++ b/doc/misc/faq.texi	Wed Mar 10 10:17:13 2010 -0500
@@ -5,7 +5,7 @@
 @c %**end of header
 
 @c This is used in many places
-@set VER 23.1.93
+@set VER 24.0.50
 
 @c This file is maintained by Romain Francoise <rfrancoise@gnu.org>.
 @c Feel free to install changes without prior permission (but I'd
--- a/etc/ChangeLog	Wed Mar 10 09:45:21 2010 -0500
+++ b/etc/ChangeLog	Wed Mar 10 10:17:13 2010 -0500
@@ -1,3 +1,7 @@
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+	* Branch for 23.2.
+
 2010-03-06  Glenn Morris  <rgm@gnu.org>
 
 	* srecode/default.srt (COPYRIGHT): Update template copyright to GPLv3+.
--- a/leim/ChangeLog	Wed Mar 10 09:45:21 2010 -0500
+++ b/leim/ChangeLog	Wed Mar 10 10:17:13 2010 -0500
@@ -1,3 +1,7 @@
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+	* Branch for 23.2.
+
 2010-02-16  Kenichi Handa  <handa@m17n.org>
 
 	* SKK-DIC/SKK-JISYO.L: Updated to the latest version.
--- a/lib-src/ChangeLog	Wed Mar 10 09:45:21 2010 -0500
+++ b/lib-src/ChangeLog	Wed Mar 10 10:17:13 2010 -0500
@@ -1,3 +1,7 @@
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+	* Branch for 23.2.
+
 2010-02-20  Kevin Ryde  <user42@zip.com.au>
 
 	* etags.c (Scheme_functions): Don't loop past a null character
--- a/lib-src/makefile.w32-in	Wed Mar 10 09:45:21 2010 -0500
+++ b/lib-src/makefile.w32-in	Wed Mar 10 10:17:13 2010 -0500
@@ -22,7 +22,7 @@
 
 .PHONY: $(ALL)
 
-VERSION		= 23.1.93
+VERSION		= 24.0.50
 
 LOCAL_FLAGS	= -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
 		  -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \
--- a/lisp/ChangeLog	Wed Mar 10 09:45:21 2010 -0500
+++ b/lisp/ChangeLog	Wed Mar 10 10:17:13 2010 -0500
@@ -1,3 +1,7 @@
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+	* Branch for 23.2.
+
 2010-03-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* vc-git.el (vc-git-revision-table): Include remote branches.
--- a/lisp/erc/ChangeLog	Wed Mar 10 09:45:21 2010 -0500
+++ b/lisp/erc/ChangeLog	Wed Mar 10 10:17:13 2010 -0500
@@ -1,3 +1,7 @@
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+	* Branch for 23.2.
+
 2010-02-07  Vivek Dasmohapatra  <vivek@etla.org>
 
 	* erc-services.el (erc-nickserv-alist): Fix defcustom type (Bug#5520).
--- a/lisp/mh-e/ChangeLog	Wed Mar 10 09:45:21 2010 -0500
+++ b/lisp/mh-e/ChangeLog	Wed Mar 10 10:17:13 2010 -0500
@@ -1,3 +1,7 @@
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+	* Branch for 23.2.
+
 2009-12-01  Bill Wohler  <wohler@newt.com>
 
 	* mh-search.el (mh-mairix-execute-search): Use mh vfolder_format.
--- a/lisp/org/ChangeLog	Wed Mar 10 09:45:21 2010 -0500
+++ b/lisp/org/ChangeLog	Wed Mar 10 10:17:13 2010 -0500
@@ -1,3 +1,7 @@
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+	* Branch for 23.2.
+
 2010-02-15  Chong Yidong  <cyd@stupidchicken.com>
 
 	* org-freemind.el (org-freemind-from-org-mode-node)
--- a/lisp/url/ChangeLog	Wed Mar 10 09:45:21 2010 -0500
+++ b/lisp/url/ChangeLog	Wed Mar 10 10:17:13 2010 -0500
@@ -1,3 +1,7 @@
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+	* Branch for 23.2.
+
 2010-01-23  Chong Yidong  <cyd@stupidchicken.com>
 
 	* url-util.el: Require url-vars (Bug#5459).
--- a/lisp/version.el	Wed Mar 10 09:45:21 2010 -0500
+++ b/lisp/version.el	Wed Mar 10 10:17:13 2010 -0500
@@ -32,7 +32,7 @@
 (defconst emacs-copyright "Copyright (C) 2010 Free Software Foundation, Inc." "\
 Short copyright string for this version of Emacs.")
 
-(defconst emacs-version "23.1.93" "\
+(defconst emacs-version "24.0.50" "\
 Version numbers of this version of Emacs.")
 
 (defconst emacs-major-version (progn (string-match "^[0-9]+" emacs-version) (string-to-number (match-string 0 emacs-version))) "\
--- a/lwlib/ChangeLog	Wed Mar 10 09:45:21 2010 -0500
+++ b/lwlib/ChangeLog	Wed Mar 10 10:17:13 2010 -0500
@@ -1,3 +1,7 @@
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+	* Branch for 23.2.
+
 2009-10-19  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* xlwmenu.c:
--- a/msdos/ChangeLog	Wed Mar 10 09:45:21 2010 -0500
+++ b/msdos/ChangeLog	Wed Mar 10 10:17:13 2010 -0500
@@ -1,3 +1,7 @@
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+	* Branch for 23.2.
+
 2010-02-19  Eli Zaretskii  <eliz@gnu.org>
 
 	* INSTALL: Remove a CVS-specific note.  Update for latest versions
--- a/nextstep/ChangeLog	Wed Mar 10 09:45:21 2010 -0500
+++ b/nextstep/ChangeLog	Wed Mar 10 10:17:13 2010 -0500
@@ -1,3 +1,7 @@
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+	* Branch for 23.2.
+
 2010-01-11  Glenn Morris  <rgm@gnu.org>
 
 	* Cocoa/Emacs.base/Contents/Info.plist:
--- a/nextstep/Cocoa/Emacs.base/Contents/Info.plist	Wed Mar 10 09:45:21 2010 -0500
+++ b/nextstep/Cocoa/Emacs.base/Contents/Info.plist	Wed Mar 10 10:17:13 2010 -0500
@@ -553,7 +553,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Emacs</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Emacs 23.1.93 Copyright (C) 2010 Free Software Foundation, Inc.</string>
+	<string>Emacs 24.0.50 Copyright (C) 2010 Free Software Foundation, Inc.</string>
 	<key>CFBundleIconFile</key>
 	<string>Emacs.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -566,7 +566,7 @@
 	<string>APPL</string>
 	<!-- This should be the emacs version number. -->
 	<key>CFBundleShortVersionString</key>
-	<string>23.1.93</string>
+	<string>24.0.50</string>
 	<key>CFBundleSignature</key>
 	<string>EMAx</string>
 	<!-- This SHOULD be a build number. -->
--- a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings	Wed Mar 10 09:45:21 2010 -0500
+++ b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings	Wed Mar 10 10:17:13 2010 -0500
@@ -1,6 +1,6 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Emacs";
-CFBundleShortVersionString = "Version 23.1.93";
-CFBundleGetInfoString = "Emacs version 23.1.93, NS Windowing";
+CFBundleShortVersionString = "Version 24.0.50";
+CFBundleGetInfoString = "Emacs version 24.0.50, NS Windowing";
 NSHumanReadableCopyright = "Copyright (C) 2010 Free Software Foundation, Inc.";
--- a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop	Wed Mar 10 09:45:21 2010 -0500
+++ b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop	Wed Mar 10 10:17:13 2010 -0500
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Application
-Version=23.1.93
+Version=24.0.50
 Categories=GNUstep
 Name=Emacs
 Comment=GNU Emacs for NeXT/Open/GNUstep and OS X
--- a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist	Wed Mar 10 09:45:21 2010 -0500
+++ b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist	Wed Mar 10 10:17:13 2010 -0500
@@ -2,7 +2,7 @@
     ApplicationDescription = "GNU Emacs for GNUstep / OS X";
     ApplicationIcon = emacs.tiff;
     ApplicationName = Emacs;
-    ApplicationRelease = "23.1.93";
+    ApplicationRelease = "24.0.50";
     Authors = (
 	"Adrian Robert (GNUstep)",
 	"Christophe de Dinechin (MacOS X)",
@@ -13,7 +13,7 @@
     );
     Copyright = "Copyright (C) 2010 Free Software Foundation, Inc.";
     CopyrightDescription = "Released under the GNU General Public License Version 3 or later";
-    FullVersionID = "Emacs 23.1.93, NS Windowing";
+    FullVersionID = "Emacs 24.0.50, NS Windowing";
     NSExecutable = Emacs;
     NSIcon = emacs.tiff;
     NSPrincipalClass = NSApplication;
--- a/nt/ChangeLog	Wed Mar 10 09:45:21 2010 -0500
+++ b/nt/ChangeLog	Wed Mar 10 10:17:13 2010 -0500
@@ -1,3 +1,7 @@
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+	* Branch for 23.2.
+
 2010-01-13  Martin Rudalics  <rudalics@gmx.at>
 
 	* emacsclient.rc: Fix format of "LegalCopyright" value.
--- a/nt/emacs.rc	Wed Mar 10 09:45:21 2010 -0500
+++ b/nt/emacs.rc	Wed Mar 10 10:17:13 2010 -0500
@@ -7,8 +7,8 @@
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 23,1,93,0
- PRODUCTVERSION 23,1,93,0
+ FILEVERSION 24,0,50,0
+ PRODUCTVERSION 24,0,50,0
  FILEFLAGSMASK 0x3FL
 #ifdef EMACSDEBUG
  FILEFLAGS 0x1L
@@ -25,12 +25,12 @@
 	BEGIN
 	    VALUE "CompanyName", "Free Software Foundation\0"
 	    VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0"
-	    VALUE "FileVersion", "23, 1, 93, 0\0"
+	    VALUE "FileVersion", "24, 0, 50, 0\0"
 	    VALUE "InternalName", "Emacs\0"
 	    VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010\0"
 	    VALUE "OriginalFilename", "emacs.exe"
 	    VALUE "ProductName", "Emacs\0"
-	    VALUE "ProductVersion", "23, 1, 93, 0\0"
+	    VALUE "ProductVersion", "24, 0, 50, 0\0"
 	    VALUE "OLESelfRegister", "\0"
 	 END
      END
--- a/nt/emacsclient.rc	Wed Mar 10 09:45:21 2010 -0500
+++ b/nt/emacsclient.rc	Wed Mar 10 10:17:13 2010 -0500
@@ -5,8 +5,8 @@
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 23,1,93,0
- PRODUCTVERSION 23,1,93,0
+ FILEVERSION 24,0,50,0
+ PRODUCTVERSION 24,0,50,0
  FILEFLAGSMASK 0x3FL
 #ifdef EMACSDEBUG
  FILEFLAGS 0x1L
@@ -23,12 +23,12 @@
 	BEGIN
 	    VALUE "CompanyName", "Free Software Foundation\0"
 	    VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0"
-	    VALUE "FileVersion", "23, 1, 93, 0\0"
+	    VALUE "FileVersion", "24, 0, 50, 0\0"
 	    VALUE "InternalName", "EmacsClient\0"
 	    VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010\0"
 	    VALUE "OriginalFilename", "emacsclientw.exe"
 	    VALUE "ProductName", "EmacsClient\0"
-	    VALUE "ProductVersion", "23, 1, 93, 0\0"
+	    VALUE "ProductVersion", "24, 0, 50, 0\0"
 	    VALUE "OLESelfRegister", "\0"
 	 END
      END
--- a/oldXMenu/ChangeLog	Wed Mar 10 09:45:21 2010 -0500
+++ b/oldXMenu/ChangeLog	Wed Mar 10 10:17:13 2010 -0500
@@ -1,3 +1,7 @@
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+	* Branch for 23.2.
+
 2009-06-21  Chong Yidong  <cyd@stupidchicken.com>
 
 	* Branch for 23.1.
--- a/src/ChangeLog	Wed Mar 10 09:45:21 2010 -0500
+++ b/src/ChangeLog	Wed Mar 10 10:17:13 2010 -0500
@@ -1,3 +1,7 @@
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+	* Branch for 23.2.
+
 2010-03-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	Cleanup setup of gl_state in various parts of the code.
--- a/test/ChangeLog	Wed Mar 10 09:45:21 2010 -0500
+++ b/test/ChangeLog	Wed Mar 10 10:17:13 2010 -0500
@@ -1,3 +1,7 @@
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+	* Branch for 23.2.
+
 2010-02-19  Ulf Jasper  <ulf.jasper@web.de>
 
 	* icalendar-testsuite.el