Bump version number to 23.4

43 files changed, 130 insertions, 38 deletions

diff --git a/ChangeLog b/ChangeLog
index 29788ed8802..8b24c5afda2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-19  Chong Yidong  <cyd@gnu.org>
+
+        * Version 23.4 released.
+
 2012-01-15  Chong Yidong  <cyd@gnu.org>
 
         * make-dist: Distribute the etc/grammars subdirectory.
diff --git a/README b/README
index b2026082b7f..3d0a40fb125 100644
--- 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.3.90 of GNU Emacs, the extensible,
+This directory tree holds version 23.4 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 1ff29e58254..af28f372509 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-19  Chong Yidong  <cyd@gnu.org>
+
+        * Version 23.4 released.
+
 2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
         * Version 23.3 released.
diff --git a/configure b/configure
index 716b064b389..d894fe6a5b9 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for emacs 23.3.90.
+# Generated by GNU Autoconf 2.67 for emacs 23.4.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -549,8 +549,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='emacs'
 PACKAGE_TARNAME='emacs'
-PACKAGE_VERSION='23.3.90'
-PACKAGE_STRING='emacs 23.3.90'
+PACKAGE_VERSION='23.4'
+PACKAGE_STRING='emacs 23.4'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1320,7 +1320,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures emacs 23.3.90 to adapt to many kinds of systems.
+\`configure' configures emacs 23.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1394,7 +1394,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of emacs 23.3.90:";;
+     short | recursive ) echo "Configuration of emacs 23.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1540,7 +1540,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-emacs configure 23.3.90
+emacs configure 23.4
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2091,7 +2091,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by emacs $as_me 23.3.90, which was
+It was created by emacs $as_me 23.4, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -14151,7 +14151,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by emacs $as_me 23.3.90, which was
+This file was extended by emacs $as_me 23.4, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14217,7 +14217,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-emacs config.status 23.3.90
+emacs config.status 23.4
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.in b/configure.in
index 054d3694585..05b724f6421 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 <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.62)
-AC_INIT(emacs, 23.3.90)
+AC_INIT(emacs, 23.4)
 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 a19a2e6c63e..f4c7d3c4761 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-19  Chong Yidong  <cyd@gnu.org>
+
+        * Version 23.4 released.
+
 2011-05-15  Chong Yidong  <cyd@stupidchicken.com>
 
         Fixes for fitting text into 7x9 printed manual.
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 90e14d310eb..a78f3773d03 100644
--- 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.3.90
+@set EMACSVER  23.4
 
 @copying
 This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@*
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index ae8b91c1be7..e62286ffb3c 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-19  Chong Yidong  <cyd@gnu.org>
+
+        * Version 23.4 released.
+
 2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
         * Version 23.3 released.
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 6e9f849714e..f20930280dd 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-19  Chong Yidong  <cyd@gnu.org>
+
+        * Version 23.4 released.
+
 2011-12-27  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * variables.texi (Creating Buffer-Local): Warn against misuses of
diff --git a/doc/lispref/book-spine.texinfo b/doc/lispref/book-spine.texinfo
index 3a097a03510..e4e9bca7909 100644
--- 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.3.90
+@center Emacs Version 23.4
 @center for Unix Users
 @sp 5
 
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index c2799d1b2e7..3c86d503096 100644
--- 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.3.90
+@set EMACSVER 23.4
 @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 e6eaa702e1d..beb224e7aaf 100644
--- 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.3.90
+@set EMACSVER 23.4
 @set DATE July 2009
 
 @dircategory Emacs
diff --git a/doc/lispref/vol2.texi b/doc/lispref/vol2.texi
index 3975f0c1a31..68a313de336 100644
--- 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.3.90
+@set EMACSVER 23.4
 @set DATE July 2009
 
 @dircategory Emacs
diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index 82afe511cf3..ab75a0ee102 100644
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-19  Chong Yidong  <cyd@gnu.org>
+
+        * Version 23.4 released.
+
 2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
         * Version 23.3 released.
diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index e19a3d32189..3fef9b6d3fb 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 23.3.90"
+.TH EMACS 1 "2007 April 13" "GNU Emacs 23.4"
 .
 .
 .SH NAME
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 90ee930650d..e266246d473 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-19  Chong Yidong  <cyd@gnu.org>
+
+        * Version 23.4 released.
+
 2011-03-12  Michael Albinus  <michael.albinus@gmx.de>
 
         * trampver.texi: Update release number.
diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi
index 1e07e9a3166..232f90545d9 100644
--- 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.3.90
+@set VER 23.4
 
 @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/AUTHORS b/etc/AUTHORS
index 3d5cdf2e849..0578133efb2 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -3445,7 +3445,7 @@ Yoni Rabkin: changed faces.el net-utils.el artist.el bs.el cmacexp.el
   ediff.el files.el hilit19.el ps-mode.el simula.el vera-mode.el
   verilog-mode.el vhdl-mode.el viper.el whitespace.el
 
-Yoshiaki Kasahara: changed term.c
+Yoshiaki Kasahara: changed buffer.c term.c
 
 Yoshiki Hayashi: changed texinfmt.el nnheader.el
 
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 8854fea58b8..ca9404bb70e 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-19  Chong Yidong  <cyd@gnu.org>
+
+        * Version 23.4 released.
+
 2012-01-10  Glenn Morris  <rgm@gnu.org>
 
         * refcards/calccard.tex, refcards/cs-dired-ref.tex:
diff --git a/leim/ChangeLog b/leim/ChangeLog
index 9692825ce90..1a8c37a41d6 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-19  Chong Yidong  <cyd@gnu.org>
+
+        * Version 23.4 released.
+
 2011-04-28  Eli Zaretskii  <eliz@gnu.org>
 
         * quail/latin-ltx.el <\beth, \gimel, \daleth>: Produce
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 5983d57c652..b9c08db724c 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-19  Chong Yidong  <cyd@gnu.org>
+
+        * Version 23.4 released.
+
 2012-01-10  Glenn Morris  <rgm@gnu.org>
 
         * ebrowse.c (version) <emacs_copyright>:
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 5140bf9037c..8e331eb68f0 100644
--- 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.3.90
+VERSION         = 23.4
 
 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 f8070b2b93e..db7a717ba73 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-19  Chong Yidong  <cyd@gnu.org>
+
+        * Version 23.4 released.
+
 2012-01-10  Glenn Morris  <rgm@gnu.org>
 
         * version.el (emacs-copyright): Update year to 2012.
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 96e3316a948..ca7b5d78930 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-19  Chong Yidong  <cyd@gnu.org>
+
+        * Version 23.4 released.
+
 2012-01-09  Eric Ludlam  <zappo@gnu.org>
 
         * ede.el (ede-project-directories): New option.
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index b16a85e6883..38a8adbbbb7 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-19  Chong Yidong  <cyd@gnu.org>
+
+        * Version 23.4 released.
+
 2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
         * Version 23.3 released.
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index 907c077699f..b2a2956b95a 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -32020,8 +32020,8 @@ Zone out, completely.
 ;;;;;;  "url/url-expand.el" "url/url-ftp.el" "url/url-history.el"
 ;;;;;;  "url/url-imap.el" "url/url-methods.el" "url/url-nfs.el" "url/url-proxy.el"
 ;;;;;;  "url/url-vars.el" "vc-dav.el" "vcursor.el" "vt-control.el"
-;;;;;;  "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (20242
-;;;;;;  16893 165147))
+;;;;;;  "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (20248
+;;;;;;  12518 696676))
 
 ;;;***
 
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 36c9374ca14..435a4e002bf 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-19  Chong Yidong  <cyd@gnu.org>
+
+        * Version 23.4 released.
+
 2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
         * Version 23.3 released.
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 7526d9ff18d..abf5a987272 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-19  Chong Yidong  <cyd@gnu.org>
+
+        * Version 23.4 released.
+
 2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
         * Version 23.3 released.
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index d94defec484..474f35bb1c9 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-19  Chong Yidong  <cyd@gnu.org>
+
+        * Version 23.4 released.
+
 2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
         * Version 23.3 released.
diff --git a/lisp/version.el b/lisp/version.el
index 2886b0d9c6e..ebd4feae2af 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -32,7 +32,7 @@
 (defconst emacs-copyright "Copyright (C) 2012 Free Software Foundation, Inc." "\
 Short copyright string for this version of Emacs.")
 
-(defconst emacs-version "23.3.90" "\
+(defconst emacs-version "23.4" "\
 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 a3abaf15968..89d5cdedeb6 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-19  Chong Yidong  <cyd@gnu.org>
+
+        * Version 23.4 released.
+
 2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
         * Version 23.3 released.
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index ceeed26cbe5..e1ac3ef4e07 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-19  Chong Yidong  <cyd@gnu.org>
+
+        * Version 23.4 released.
+
 2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
         * Version 23.3 released.
diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog
index b7fe8527ff6..c8a55f01e5d 100644
--- a/nextstep/ChangeLog
+++ b/nextstep/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-19  Chong Yidong  <cyd@gnu.org>
+
+        * Version 23.4 released.
+
 2012-01-10  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 ef43ad61e73..8ffd19fa833 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 <http://www.gnu.org/licenses/>.
         <key>CFBundleExecutable</key>
         <string>Emacs</string>
         <key>CFBundleGetInfoString</key>
-        <string>Emacs 23.3.90 Copyright (C) 2012 Free Software Foundation, Inc.</string>
+        <string>Emacs 23.4 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>23.3.90</string>
+        <string>23.4</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 1c0e07a7380..ff6da4e71e5 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 23.3.90";
-CFBundleGetInfoString = "Emacs version 23.3.90, NS Windowing";
+CFBundleShortVersionString = "Version 23.4";
+CFBundleGetInfoString = "Emacs version 23.4, 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 5d67455578c..6ee4a3114aa 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=23.3.90
+Version=23.4
 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 2f8518a1855..bff9253a45f 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 = "23.3.90";
+    ApplicationRelease = "23.4";
     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 23.3.90, NS Windowing";
+    FullVersionID = "Emacs 23.4, NS Windowing";
     NSExecutable = Emacs;
     NSIcon = emacs.tiff;
     NSPrincipalClass = NSApplication;
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 52aec95b3c7..c7029fdb302 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-19  Chong Yidong  <cyd@gnu.org>
+
+        * Version 23.4 released.
+
 2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
         * Version 23.3 released.
diff --git a/nt/emacs.rc b/nt/emacs.rc
index 5643dc88fc2..0bdf6cd4ab4 100644
--- a/nt/emacs.rc
+++ b/nt/emacs.rc
@@ -7,8 +7,8 @@ Emacs ICON   icons\emacs.ico
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 23,3,90,0
- PRODUCTVERSION 23,3,90,0
+ FILEVERSION 23,4,0,0
+ PRODUCTVERSION 23,4,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", "23, 3, 90, 0\0"
+            VALUE "FileVersion", "23, 4, 0, 0\0"
             VALUE "InternalName", "Emacs\0"
             VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012\0"
             VALUE "OriginalFilename", "emacs.exe"
             VALUE "ProductName", "Emacs\0"
-            VALUE "ProductVersion", "23, 3, 90, 0\0"
+            VALUE "ProductVersion", "23, 4, 0, 0\0"
             VALUE "OLESelfRegister", "\0"
          END
      END
diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc
index 4ea2526eb94..377c2a33d9f 100644
--- a/nt/emacsclient.rc
+++ b/nt/emacsclient.rc
@@ -5,8 +5,8 @@ Emacs ICON   icons\emacs.ico
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 23,3,90,0
- PRODUCTVERSION 23,3,90,0
+ FILEVERSION 23,4,0,0
+ PRODUCTVERSION 23,4,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", "23, 3, 90, 0\0"
+            VALUE "FileVersion", "23, 4, 0, 0\0"
             VALUE "InternalName", "EmacsClient\0"
             VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012\0"
             VALUE "OriginalFilename", "emacsclientw.exe"
             VALUE "ProductName", "EmacsClient\0"
-            VALUE "ProductVersion", "23, 3, 90, 0\0"
+            VALUE "ProductVersion", "23, 4, 0, 0\0"
             VALUE "OLESelfRegister", "\0"
          END
      END
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index 844cfc92bee..e599a1102d7 100644
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-19  Chong Yidong  <cyd@gnu.org>
+
+        * Version 23.4 released.
+
 2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
         * Version 23.3 released.
diff --git a/src/ChangeLog b/src/ChangeLog
index 4af3a5aa40a..2331a30cd79 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-19  Chong Yidong  <cyd@gnu.org>
+
+        * Version 23.4 released.
+
 2012-01-19  Paul Eggert  <eggert@cs.ucla.edu>
 
         * coding.c (encode_designation_at_bol): Don't use uninitialized
diff --git a/test/ChangeLog b/test/ChangeLog
index d76bbadab3d..b2d2a65d3b8 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-19  Chong Yidong  <cyd@gnu.org>
+
+        * Version 23.4 released.
+
 2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
         * Version 23.3 released.