From a3ff15d6fc49d345356489f1aa14830bbb490e92 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Wed, 9 Dec 2009 02:06:16 +0000 Subject: [PATCH] Bump version to 23.1.90. --- README | 2 +- configure | 28 ++++++------------- configure.in | 2 +- doc/emacs/emacs.texi | 2 +- doc/lispref/book-spine.texinfo | 2 +- doc/lispref/elisp.texi | 2 +- doc/lispref/vol1.texi | 2 +- doc/lispref/vol2.texi | 2 +- doc/man/emacs.1 | 2 +- doc/misc/faq.texi | 2 +- lib-src/makefile.w32-in | 2 +- lisp/version.el | 2 +- nextstep/Cocoa/Emacs.base/Contents/Info.plist | 4 +-- .../Resources/English.lproj/InfoPlist.strings | 4 +-- .../Emacs.base/Resources/Emacs.desktop | 2 +- .../Emacs.base/Resources/Info-gnustep.plist | 4 +-- nt/emacs.rc | 8 +++--- nt/emacsclient.rc | 8 +++--- 18 files changed, 35 insertions(+), 45 deletions(-) diff --git a/README b/README index 640afa5bb97..623bf945256 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.1.50 of GNU Emacs, the extensible, +This directory tree holds version 23.1.90 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 f568df05b9e..f3d46f1c06a 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.62 for emacs 23.1.50. +# Generated by GNU Autoconf 2.62 for emacs 23.1.90. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -594,8 +594,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='emacs' PACKAGE_TARNAME='emacs' -PACKAGE_VERSION='23.1.50' -PACKAGE_STRING='emacs 23.1.50' +PACKAGE_VERSION='23.1.90' +PACKAGE_STRING='emacs 23.1.90' PACKAGE_BUGREPORT='' ac_unique_file="src/lisp.h" @@ -1371,7 +1371,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.1.50 to adapt to many kinds of systems. +\`configure' configures emacs 23.1.90 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1445,7 +1445,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of emacs 23.1.50:";; + short | recursive ) echo "Configuration of emacs 23.1.90:";; esac cat <<\_ACEOF @@ -1588,7 +1588,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -emacs configure 23.1.50 +emacs configure 23.1.90 generated by GNU Autoconf 2.62 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1602,7 +1602,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.1.50, which was +It was created by emacs $as_me 23.1.90, which was generated by GNU Autoconf 2.62. Invocation command line was $ $0 $@ @@ -25703,16 +25703,6 @@ fi echo -if test "$USE_X_TOOLKIT" = GTK; then - case "$canonical" in - *cygwin*) - echo "There are known problems with Emacs and Gtk+ on cygwin, so you - will probably get a crash on startup. If this happens, please use another - toolkit for Emacs. See etc/PROBLEMS for more information." - ;; - esac -fi - if test "$HAVE_NS" = "yes"; then echo echo "You must run \"make install\" in order to test the built application. @@ -26195,7 +26185,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.1.50, which was +This file was extended by emacs $as_me 23.1.90, which was generated by GNU Autoconf 2.62. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26248,7 +26238,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -emacs config.status 23.1.50 +emacs config.status 23.1.90 configured by $0, generated by GNU Autoconf 2.62, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.in b/configure.in index 34d5fd5ae42..42cc66045ff 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.62) -AC_INIT(emacs, 23.1.50) +AC_INIT(emacs, 23.1.90) 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 c509457f5d2..e6002292931 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.1.50 +@set EMACSVER 23.1.90 @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 21c23a46d31..a51ac17879d 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.1.50 +@center Emacs Version 23.1.90 @center for Unix Users @sp 5 diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index 6b791a832b4..3dd2174c69f 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.1.50 +@set EMACSVER 23.1.90 @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 d1538b382d1..919e3acf9da 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.1.50 +@set EMACSVER 23.1.90 @set DATE July 2009 @dircategory Emacs diff --git a/doc/lispref/vol2.texi b/doc/lispref/vol2.texi index 8945bc1bfed..e78569eb028 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.1.50 +@set EMACSVER 23.1.90 @set DATE July 2009 @dircategory Emacs diff --git a/doc/man/emacs.1 b/doc/man/emacs.1 index 9d71b94577a..ab02f6e38d7 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.1.50" +.TH EMACS 1 "2007 April 13" "GNU Emacs 23.1.90" . . .SH NAME diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi index 44bb54066da..a9db21e6cd7 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.1.50 +@set VER 23.1.90 @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 7fab27d98a9..17698f3f859 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.1.50 +VERSION = 23.1.90 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 f5109ab6433..41bdf409f0d 100644 --- a/lisp/version.el +++ b/lisp/version.el @@ -32,7 +32,7 @@ (defconst emacs-copyright "Copyright (C) 2009 Free Software Foundation, Inc." "\ Short copyright string for this version of Emacs.") -(defconst emacs-version "23.1.50" "\ +(defconst emacs-version "23.1.90" "\ 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/nextstep/Cocoa/Emacs.base/Contents/Info.plist b/nextstep/Cocoa/Emacs.base/Contents/Info.plist index 085170f2eb1..93965733184 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.1.50 Copyright (C) 2009 Free Software Foundation, Inc. + Emacs 23.1.90 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.1.50 + 23.1.90 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 5934dedb611..4edb9b0f536 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.1.50"; -CFBundleGetInfoString = "Emacs version 23.1.50, NS Windowing"; +CFBundleShortVersionString = "Version 23.1.90"; +CFBundleGetInfoString = "Emacs version 23.1.90, 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 731333ed5fe..eb0622c3ade 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.1.50 +Version=23.1.90 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 164365fcd1a..3ad6bf8d945 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.1.50"; + ApplicationRelease = "23.1.90"; 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.1.50, NS Windowing"; + FullVersionID = "Emacs 23.1.90, NS Windowing"; NSExecutable = Emacs; NSIcon = emacs.tiff; NSPrincipalClass = NSApplication; diff --git a/nt/emacs.rc b/nt/emacs.rc index 29855a9aa5b..60f2be4ea42 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,1,50,0 - PRODUCTVERSION 23,1,50,0 + FILEVERSION 23,1,90,0 + PRODUCTVERSION 23,1,90,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, 50, 0\0" + VALUE "FileVersion", "23, 1, 90, 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, 1, 50, 0\0" + VALUE "ProductVersion", "23, 1, 90, 0\0" VALUE "OLESelfRegister", "\0" END END diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc index 3227753855b..2e1059dff77 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,1,50,0 - PRODUCTVERSION 23,1,50,0 + FILEVERSION 23,1,90,0 + PRODUCTVERSION 23,1,90,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, 50, 0\0" + VALUE "FileVersion", "23, 1, 90, 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, 1, 50, 0\0" + VALUE "ProductVersion", "23, 1, 90, 0\0" VALUE "OLESelfRegister", "\0" END END -- 2.39.2