Bump version to 24.0.50.

diff --git a/ChangeLog b/ChangeLog
index 413c239..d630d26 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/README b/README
index 707033c..2ccd5d7 100644 (file)
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
 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

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 1f2b4c5..90ba61f 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -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.

diff --git a/configure.in b/configure.in
index da15b64..d600657 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.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)
 

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 55ae088..78dc33a 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -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.

diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index ff152fd..846359a 100644 (file)
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -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},@*

diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index e683cc1..23e5a69 100644 (file)
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -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.

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 1b9e028..c78a7ee 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -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

diff --git a/doc/lispref/book-spine.texinfo b/doc/lispref/book-spine.texinfo
index 9291d99..732df50 100644 (file)
--- a/doc/lispref/book-spine.texinfo
+++ b/doc/lispref/book-spine.texinfo
@@ -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
 

diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index 576737e..8d20ed6 100644 (file)
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -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

diff --git a/doc/lispref/vol1.texi b/doc/lispref/vol1.texi
index 9144adf..a0590c3 100644 (file)
--- a/doc/lispref/vol1.texi
+++ b/doc/lispref/vol1.texi
@@ -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

diff --git a/doc/lispref/vol2.texi b/doc/lispref/vol2.texi
index 64a4113..ad4c746 100644 (file)
--- a/doc/lispref/vol2.texi
+++ b/doc/lispref/vol2.texi
@@ -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

diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index 84ce004..e931397 100644 (file)
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -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

diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index 1c93f9e..15b7a73 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 23.1.93"
+.TH EMACS 1 "2007 April 13" "GNU Emacs 24.0.50"
 .
 .
 .SH NAME

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 3e491c4..136a1ee 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -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

diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi
index d4c0add..924240a 100644 (file)
--- a/doc/misc/faq.texi
+++ b/doc/misc/faq.texi
@@ -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

diff --git a/etc/ChangeLog b/etc/ChangeLog
index b45e48a..2e28709 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -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+.

diff --git a/leim/ChangeLog b/leim/ChangeLog
index 176db63..a7de27c 100644 (file)
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -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.

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 77b227c..0a05a06 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -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

diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 368e1ac..14130d2 100644 (file)
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -22,7 +22,7 @@ ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacs
 
 .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 \

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d5ce272..634e901 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index c192b34..18fc5f1 100644 (file)
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -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).

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 83d5e39..4405249 100644 (file)
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -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.

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 7ce303b..a760255 100644 (file)
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -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)

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 2a8c6eb..ea44ea5 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -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).

diff --git a/lisp/version.el b/lisp/version.el
index 905733a..5cd0cc8 100644 (file)
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -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))) "\

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index 65ef943..9bea2c1 100644 (file)
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -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:

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 7dd7715..2a2c62e 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -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

diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog
index 6e296cf..f49fa9a 100644 (file)
--- a/nextstep/ChangeLog
+++ b/nextstep/ChangeLog
@@ -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:

diff --git a/nextstep/Cocoa/Emacs.base/Contents/Info.plist b/nextstep/Cocoa/Emacs.base/Contents/Info.plist
index a208344..c32b85f 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 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 @@ 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>23.1.93</string>
+       <string>24.0.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 e0e42c6..197e42c 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 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.";

diff --git a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop
index 588c1b3..0131bec 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=23.1.93
+Version=24.0.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 a314862..ade3f01 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 = "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;

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 624cb96..c4fddfe 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -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.

diff --git a/nt/emacs.rc b/nt/emacs.rc
index ff8cc42..253065b 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 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
        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

diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc
index 479889e..98f0bcd 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 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
        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

diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index bdf0957..e39f931 100644 (file)
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 96c6c66..2430067 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.

diff --git a/test/ChangeLog b/test/ChangeLog
index 85d9d81..b45e2f1 100644 (file)
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -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