From: Chong Yidong Date: Thu, 9 Jul 2009 00:14:10 +0000 (+0000) Subject: Bump version to 23.0.96. X-Git-Tag: emacs-pretest-23.0.96~1 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f0212c9355e244712025ce90a0bcff41222e57ee;p=emacs.git Bump version to 23.0.96. --- diff --git a/README b/README index fe53036a19c..e6ea15e3c38 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.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 1250e663344..33da639c4c7 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.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 ." _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 17e154a94a3..7d4845cf459 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.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 7966765bab9..78bbc1b97c9 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.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 6b07b8681dd..305adec53a0 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.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 bcd04a7f046..930654d94a7 100644 --- 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 bc975e63d5a..27cde5f7ca3 100644 --- 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 738bd0f3981..f03a87ebeed 100644 --- 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 0727c834b2f..36cb22ba1bc 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.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 fe5a59a2704..ffd65cb773f 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.0.95 +@set VER 23.0.96 @c This file is maintained by Romain Francoise . @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 3c807f4d9f5..aee652964a3 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.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 82de8a86205..7259a880760 100644 --- 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 3c6252fc9ed..6a2d43ee04b 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 23.0.95 Copyright (C) 2009 Free Software Foundation, Inc. + Emacs 23.0.96 Copyright (C) 2009 Free Software Foundation, Inc. CFBundleIconFile Emacs.icns CFBundleIdentifier @@ -566,7 +566,7 @@ along with GNU Emacs. If not, see . APPL CFBundleShortVersionString - 23.0.95 + 23.0.96 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 a742b1fb325..47bb44bfc88 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.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 8ddaa037efc..7073c1ca972 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.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 fc4e2300c1a..d0f4e2cc6bb 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.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 bd9d20caf70..dd8ae4d4871 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,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 76312a5a265..2c8abd9e725 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,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