Bump version to 23.0.96.

diff --git a/README b/README
index fe53036a19ce67d88b150d9cdfb67aaca6c2f693..e6ea15e3c38fa0998d37e1ca93c5547e9d127bf8 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.0.95 of GNU Emacs, the extensible,
+This directory tree holds version 23.0.96 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/configure b/configure
index 1250e6633444858e3d803337da063c3a006e38f7..33da639c4c7e7de813ddfa5d274519870474fa9b 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for emacs 23.0.95.
+# Generated by GNU Autoconf 2.61 for emacs 23.0.96.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -572,8 +572,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='emacs'
 PACKAGE_TARNAME='emacs'
-PACKAGE_VERSION='23.0.95'
-PACKAGE_STRING='emacs 23.0.95'
+PACKAGE_VERSION='23.0.96'
+PACKAGE_STRING='emacs 23.0.96'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="src/lisp.h"
@@ -1256,7 +1256,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.0.95 to adapt to many kinds of systems.
+\`configure' configures emacs 23.0.96 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1330,7 +1330,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of emacs 23.0.95:";;
+     short | recursive ) echo "Configuration of emacs 23.0.96:";;
    esac
   cat <<\_ACEOF
 
@@ -1459,7 +1459,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-emacs configure 23.0.95
+emacs configure 23.0.96
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1473,7 +1473,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.0.95, which was
+It was created by emacs $as_me 23.0.96, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -24899,7 +24899,7 @@ exec 6>&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.0.95, which was
+This file was extended by emacs $as_me 23.0.96, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -24952,7 +24952,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-emacs config.status 23.0.95
+emacs config.status 23.0.96
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

diff --git a/configure.in b/configure.in
index 17e154a94a372fb5dd084b08f692ffb5780f8c7f..7d4845cf45981ccc23ac1a5237104c31dadf7ea9 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.61)
-AC_INIT(emacs, 23.0.95)
+AC_INIT(emacs, 23.0.96)
 AC_CONFIG_HEADER(src/config.h:src/config.in)
 AC_CONFIG_SRCDIR(src/lisp.h)
 

diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 7966765bab9da030f96118ab2516cd666d0d4a9f..78bbc1b97c938c324097bdbc446ee41a699c27bc 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.0.95
+@set EMACSVER  23.0.96
 
 @copying
 This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@*

diff --git a/doc/lispref/book-spine.texinfo b/doc/lispref/book-spine.texinfo
index 6b07b8681dd1243b0ecfc5b903b9c21d96f62beb..305adec53a0289af3920ccba097c61f8507d1e18 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.0.95
+@center Emacs Version 23.0.96
 @center for Unix Users
 @sp 5
 

diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index bcd04a7f046188858587b124d96052e6ebdd9ec8..930654d94a7050e9e3604901510512a270ee35e1 100644 (file)
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -7,7 +7,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.0.95
+@set EMACSVER 23.0.96
 
 @c in general, keep the following line commented out, unless doing a
 @c copy of this manual that will be published.  The manual should go

diff --git a/doc/lispref/vol1.texi b/doc/lispref/vol1.texi
index bc975e63d5a02124fd0adc6893125f9a8bcc68c1..27cde5f7ca3425186add49248d8da110885ea838 100644 (file)
--- a/doc/lispref/vol1.texi
+++ b/doc/lispref/vol1.texi
@@ -26,7 +26,7 @@
 @c Version of the manual and of Emacs.
 @c Please remember to update the edition number in README as well.
 @set VERSION  2.9
-@set EMACSVER 23.0.95
+@set EMACSVER 23.0.96
 
 @dircategory Emacs
 @direntry

diff --git a/doc/lispref/vol2.texi b/doc/lispref/vol2.texi
index 738bd0f3981c67ba1836ae21de86261846e7814a..f03a87ebeed26549591a65ff50007e990c807fad 100644 (file)
--- a/doc/lispref/vol2.texi
+++ b/doc/lispref/vol2.texi
@@ -26,7 +26,7 @@
 @c Version of the manual and of Emacs.
 @c Please remember to update the edition number in README as well.
 @set VERSION  2.9
-@set EMACSVER 23.0.95
+@set EMACSVER 23.0.96
 
 @dircategory Emacs
 @direntry

diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index 0727c834b2fc3802cc98788bad1e5b9079977c30..36cb22ba1bcbe73e5a8bf6d6f0d0b07fa220673a 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.0.95"
+.TH EMACS 1 "2007 April 13" "GNU Emacs 23.0.96"
 .
 .
 .SH NAME

diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi
index fe5a59a2704ade39f0803bee757a67f65cf1450f..ffd65cb773f3ad3523d68af8373e05b50650ea29 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.0.95
+@set VER 23.0.96
 
 @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/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 3c807f4d9f5277736dd0391f1f58ff1adaf793fd..aee652964a323913a81ead4b9b952c1738f1f795 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.0.95
+VERSION                = 23.0.96
 
 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/version.el b/lisp/version.el
index 82de8a8620562097e0c31994c676ba519248c637..7259a8807608c7a8c8544d7ae0feac004d3fc7ed 100644 (file)
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -29,7 +29,7 @@
 (defconst emacs-copyright "Copyright (C) 2009 Free Software Foundation, Inc."
   "Short copyright string for this version of Emacs.")
 
-(defconst emacs-version "23.0.95" "\
+(defconst emacs-version "23.0.96" "\
 Version numbers of this version of Emacs.")
 
 (defconst emacs-major-version

diff --git a/nextstep/Cocoa/Emacs.base/Contents/Info.plist b/nextstep/Cocoa/Emacs.base/Contents/Info.plist
index 3c6252fc9ed9e1bf07aae0c8f0e280f8afb6c4df..6a2d43ee04b2ad1d82b16f7a147359e60ddda229 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.0.95 Copyright (C) 2009 Free Software Foundation, Inc.</string>
+       <string>Emacs 23.0.96 Copyright (C) 2009 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.0.95</string>
+       <string>23.0.96</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 a742b1fb325fb40a15e0644c8f41103c14cda812..47bb44bfc882b6e19145990daaa08ef380bb986a 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.0.95";
-CFBundleGetInfoString = "Emacs version 23.0.95, NS Windowing";
+CFBundleShortVersionString = "Version 23.0.96";
+CFBundleGetInfoString = "Emacs version 23.0.96, NS Windowing";
 NSHumanReadableCopyright = "Copyright (C) 2009 Free Software Foundation, Inc.";

diff --git a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop
index 8ddaa037efcee416b7a5168058aff17113f3ecfb..7073c1ca972ac1d52df8e69ca168c56d814b17d2 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.0.95
+Version=23.0.96
 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 fc4e2300c1a60be36191841f3fdb62f3cab6cb69..d0f4e2cc6bbf984dd5bb098f0fa150234f198bc5 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.0.95";
+    ApplicationRelease = "23.0.96";
     Authors = (
        "Adrian Robert (GNUstep)",
        "Christophe de Dinechin (MacOS X)",
@@ -13,7 +13,7 @@
     );
     Copyright = "Copyright (C) 2009 Free Software Foundation, Inc.";
     CopyrightDescription = "Released under the GNU General Public License Version 3 or later";
-    FullVersionID = "Emacs 23.0.95, NS Windowing";
+    FullVersionID = "Emacs 23.0.96, NS Windowing";
     NSExecutable = Emacs;
     NSIcon = emacs.tiff;
     NSPrincipalClass = NSApplication;

diff --git a/nt/emacs.rc b/nt/emacs.rc
index bd9d20caf70cd0b8ecefa1b250ad2e69334f4bec..dd8ae4d48712379de3c5b0a7f11d55ac8571ec36 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,0,95,0
- PRODUCTVERSION 23,0,95,0
+ FILEVERSION 23,0,96,0
+ PRODUCTVERSION 23,0,96,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, 0, 95, 0\0"
+           VALUE "FileVersion", "23, 0, 96, 0\0"
            VALUE "InternalName", "Emacs\0"
            VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009\0"
            VALUE "OriginalFilename", "emacs.exe"
            VALUE "ProductName", "Emacs\0"
-           VALUE "ProductVersion", "23, 0, 95, 0\0"
+           VALUE "ProductVersion", "23, 0, 96, 0\0"
            VALUE "OLESelfRegister", "\0"
         END
      END

diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc
index 76312a5a265a6ed15f8bca2c6e12e1e34dcf2063..2c8abd9e72536144c54146ea570a28730470f8b0 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,0,95,0
- PRODUCTVERSION 23,0,95,0
+ FILEVERSION 23,0,96,0
+ PRODUCTVERSION 23,0,96,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, 0, 95, 0\0"
+           VALUE "FileVersion", "23, 0, 96, 0\0"
            VALUE "InternalName", "EmacsClient\0"
            VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009\0"
            VALUE "OriginalFilename", "emacsclientw.exe"
            VALUE "ProductName", "EmacsClient\0"
-           VALUE "ProductVersion", "23, 0, 95, 0\0"
+           VALUE "ProductVersion", "23, 0, 96, 0\0"
            VALUE "OLESelfRegister", "\0"
         END
      END