From 3f2d84c7597b752e34966d3523d426ab56331566 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Thu, 26 Feb 2009 01:06:51 +0000 Subject: [PATCH] Bump version to 23.0.91. --- README | 2 +- 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 ++-- .../Contents/Resources/English.lproj/InfoPlist.strings | 4 ++-- nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop | 2 +- nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist | 4 ++-- nt/emacs.rc | 8 ++++---- nt/emacsclient.rc | 8 ++++---- src/config.in | 5 ++++- 18 files changed, 30 insertions(+), 27 deletions(-) diff --git a/README b/README index 14667b4f3c0..2538ab548cb 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.90 of GNU Emacs, the extensible, +This directory tree holds version 23.0.91 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.in b/configure.in index 0cb19a44956..b29d2de2073 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.90) +AC_INIT(emacs, 23.0.91) 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 b19d4ff33ab..87ce82d2071 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.90 +@set EMACSVER 23.0.91 @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 f82c9d74f58..031a7e632ff 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.90 +@center Emacs Version 23.0.91 @center for Unix Users @sp 5 diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index f0346a82ef8..d2a1535be0d 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.90 +@set EMACSVER 23.0.91 @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 bb418f6df39..7bc50b31ce7 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.90 +@set EMACSVER 23.0.91 @dircategory Emacs @direntry diff --git a/doc/lispref/vol2.texi b/doc/lispref/vol2.texi index 8a78943ba27..e9def156935 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.90 +@set EMACSVER 23.0.91 @dircategory Emacs @direntry diff --git a/doc/man/emacs.1 b/doc/man/emacs.1 index 9641a36e35a..8b24f6cd54c 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.90" +.TH EMACS 1 "2007 April 13" "GNU Emacs 23.0.91" . . .SH NAME diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi index 521b282bdeb..4a663682220 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.90 +@set VER 23.0.91 @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 9c1def4e84c..2f10213b1f3 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.90 +VERSION = 23.0.91 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 3b980d64d40..b86bc516144 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.90" "\ +(defconst emacs-version "23.0.91" "\ 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 914ec754fe6..2b517a21f9a 100644 --- a/nextstep/Cocoa/Emacs.base/Contents/Info.plist +++ b/nextstep/Cocoa/Emacs.base/Contents/Info.plist @@ -540,7 +540,7 @@ along with GNU Emacs. If not, see . CFBundleExecutable Emacs CFBundleGetInfoString - Emacs 23.0.90 Copyright (C) 2009 Free Software Foundation, Inc. + Emacs 23.0.91 Copyright (C) 2009 Free Software Foundation, Inc. CFBundleIconFile Emacs.icns CFBundleIdentifier @@ -553,7 +553,7 @@ along with GNU Emacs. If not, see . APPL CFBundleShortVersionString - 23.0.90 + 23.0.91 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 6031c48de78..ffb532466b4 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.90"; -CFBundleGetInfoString = "Emacs version 23.0.90, NS Windowing"; +CFBundleShortVersionString = "Version 23.0.91"; +CFBundleGetInfoString = "Emacs version 23.0.91, 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 ce293b6ee8c..1a65ada9cbb 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.90 +Version=23.0.91 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 3811be52844..2001c9e38b3 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.90"; + ApplicationRelease = "23.0.91"; 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.90, NS Windowing"; + FullVersionID = "Emacs 23.0.91, NS Windowing"; NSExecutable = Emacs; NSIcon = emacs.tiff; NSPrincipalClass = NSApplication; diff --git a/nt/emacs.rc b/nt/emacs.rc index a737b9bdb6f..b58702921f6 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,90,0 - PRODUCTVERSION 23,0,90,0 + FILEVERSION 23,0,91,0 + PRODUCTVERSION 23,0,91,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, 90, 0\0" + VALUE "FileVersion", "23, 0, 91, 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, 90, 0\0" + VALUE "ProductVersion", "23, 0, 91, 0\0" VALUE "OLESelfRegister", "\0" END END diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc index a724023b33f..c1cf7f6d58f 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,90,0 - PRODUCTVERSION 23,0,90,0 + FILEVERSION 23,0,91,0 + PRODUCTVERSION 23,0,91,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, 90, 0\0" + VALUE "FileVersion", "23, 0, 91, 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, 90, 0\0" + VALUE "ProductVersion", "23, 0, 91, 0\0" VALUE "OLESelfRegister", "\0" END END diff --git a/src/config.in b/src/config.in index cf3fada3e4a..d71cf9eb31f 100644 --- a/src/config.in +++ b/src/config.in @@ -479,6 +479,9 @@ along with GNU Emacs. If not, see . */ Mac OS X. */ #undef HAVE_NS +/* Define to 1 if libotf has OTF_get_variation_glyphs. */ +#undef HAVE_OTF_GET_VARIATION_GLYPHS + /* Define to 1 if personality LINUX32 can be set. */ #undef HAVE_PERSONALITY_LINUX32 @@ -1048,7 +1051,7 @@ along with GNU Emacs. If not, see . */ /* See also .m.o rule in Makefile.in */ /* FIXME: are all these flags really needed? Document here why. */ # define C_SWITCH_X_SYSTEM -D_REENTRANT -fPIC -fno-strict-aliasing -/* GNUStep needs a bit more pure memory. Of the existing knobs, +/* GNUstep needs a bit more pure memory. Of the existing knobs, SYSTEM_PURESIZE_EXTRA seems like the least likely to cause problems. */ # define SYSTEM_PURESIZE_EXTRA 30000 # endif /* NS_IMPL_GNUSTEP */ -- 2.39.2