diff options
| author | Chong Yidong | 2011-03-11 12:17:33 -0500 |
|---|---|---|
| committer | Chong Yidong | 2011-03-11 12:17:33 -0500 |
| commit | 5ef342304deceb61037a9eec17d6b0eb7ac978dd (patch) | |
| tree | c6c6a67ae82b1e9c9ff658409b61d2fb51f20314 | |
| parent | 1e048ad1a60374ff026f021fe836c4f77a3fca60 (diff) | |
| download | emacs-5ef342304deceb61037a9eec17d6b0eb7ac978dd.tar.gz emacs-5ef342304deceb61037a9eec17d6b0eb7ac978dd.zip | |
Bump version to 23.3.50
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | doc/emacs/emacs.texi | 2 | ||||
| -rw-r--r-- | doc/lispref/book-spine.texinfo | 2 | ||||
| -rw-r--r-- | doc/lispref/elisp.texi | 2 | ||||
| -rw-r--r-- | doc/lispref/vol1.texi | 2 | ||||
| -rw-r--r-- | doc/lispref/vol2.texi | 2 | ||||
| -rw-r--r-- | doc/man/emacs.1 | 2 | ||||
| -rw-r--r-- | doc/misc/faq.texi | 2 | ||||
| -rw-r--r-- | lib-src/makefile.w32-in | 2 | ||||
| -rw-r--r-- | lisp/version.el | 2 | ||||
| -rw-r--r-- | nextstep/Cocoa/Emacs.base/Contents/Info.plist | 4 | ||||
| -rw-r--r-- | nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings | 4 | ||||
| -rw-r--r-- | nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop | 2 | ||||
| -rw-r--r-- | nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist | 4 | ||||
| -rw-r--r-- | nt/emacs.rc | 8 | ||||
| -rw-r--r-- | nt/emacsclient.rc | 8 |
17 files changed, 26 insertions, 26 deletions
| @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, | |||
| 3 | See the end of the file for license conditions. | 3 | See the end of the file for license conditions. |
| 4 | 4 | ||
| 5 | 5 | ||
| 6 | This directory tree holds version 23.3 of GNU Emacs, the extensible, | 6 | This directory tree holds version 23.3.50 of GNU Emacs, the extensible, |
| 7 | customizable, self-documenting real-time display editor. | 7 | customizable, self-documenting real-time display editor. |
| 8 | 8 | ||
| 9 | The file INSTALL in this directory says how to build and install GNU | 9 | The file INSTALL in this directory says how to build and install GNU |
diff --git a/configure.in b/configure.in index 275e8125ab3..cfb2a2eb7dc 100644 --- a/configure.in +++ b/configure.in | |||
| @@ -22,7 +22,7 @@ dnl You should have received a copy of the GNU General Public License | |||
| 22 | dnl along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | 22 | dnl along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
| 23 | 23 | ||
| 24 | AC_PREREQ(2.62) | 24 | AC_PREREQ(2.62) |
| 25 | AC_INIT(emacs, 23.3) | 25 | AC_INIT(emacs, 23.3.50) |
| 26 | AC_CONFIG_HEADER(src/config.h:src/config.in) | 26 | AC_CONFIG_HEADER(src/config.h:src/config.in) |
| 27 | AC_CONFIG_SRCDIR(src/lisp.h) | 27 | AC_CONFIG_SRCDIR(src/lisp.h) |
| 28 | 28 | ||
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index 34a604f7654..72483afef1e 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | 5 | ||
| 6 | @c The edition number appears in several places in this file | 6 | @c The edition number appears in several places in this file |
| 7 | @set EDITION Sixteenth | 7 | @set EDITION Sixteenth |
| 8 | @set EMACSVER 23.3 | 8 | @set EMACSVER 23.3.50 |
| 9 | 9 | ||
| 10 | @copying | 10 | @copying |
| 11 | This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@* | 11 | 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 3a8aa1c0705..d5785811dc9 100644 --- a/doc/lispref/book-spine.texinfo +++ b/doc/lispref/book-spine.texinfo | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | @center @titlefont{GNU Emacs Lisp Reference Manual} | 11 | @center @titlefont{GNU Emacs Lisp Reference Manual} |
| 12 | @sp 5 | 12 | @sp 5 |
| 13 | @center GNU | 13 | @center GNU |
| 14 | @center Emacs Version 23.3 | 14 | @center Emacs Version 23.3.50 |
| 15 | @center for Unix Users | 15 | @center for Unix Users |
| 16 | @sp 5 | 16 | @sp 5 |
| 17 | 17 | ||
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index 2093806fa49..9b2b4817e27 100644 --- a/doc/lispref/elisp.texi +++ b/doc/lispref/elisp.texi | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | @c Please remember to update the edition number in README as well. | 8 | @c Please remember to update the edition number in README as well. |
| 9 | @c And also the copies in vol1.texi and vol2.texi. | 9 | @c And also the copies in vol1.texi and vol2.texi. |
| 10 | @set VERSION 3.0 | 10 | @set VERSION 3.0 |
| 11 | @set EMACSVER 23.3 | 11 | @set EMACSVER 23.3.50 |
| 12 | @set DATE July 2009 | 12 | @set DATE July 2009 |
| 13 | 13 | ||
| 14 | @c in general, keep the following line commented out, unless doing a | 14 | @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 392bfc5b5e9..8454e633c78 100644 --- a/doc/lispref/vol1.texi +++ b/doc/lispref/vol1.texi | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | @c Version of the manual and of Emacs. | 27 | @c Version of the manual and of Emacs. |
| 28 | @c Please remember to update the edition number in README as well. | 28 | @c Please remember to update the edition number in README as well. |
| 29 | @set VERSION 3.0 | 29 | @set VERSION 3.0 |
| 30 | @set EMACSVER 23.3 | 30 | @set EMACSVER 23.3.50 |
| 31 | @set DATE July 2009 | 31 | @set DATE July 2009 |
| 32 | 32 | ||
| 33 | @dircategory Emacs | 33 | @dircategory Emacs |
diff --git a/doc/lispref/vol2.texi b/doc/lispref/vol2.texi index 63f35b7e531..f481523b981 100644 --- a/doc/lispref/vol2.texi +++ b/doc/lispref/vol2.texi | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | @c Version of the manual and of Emacs. | 27 | @c Version of the manual and of Emacs. |
| 28 | @c Please remember to update the edition number in README as well. | 28 | @c Please remember to update the edition number in README as well. |
| 29 | @set VERSION 3.0 | 29 | @set VERSION 3.0 |
| 30 | @set EMACSVER 23.3 | 30 | @set EMACSVER 23.3.50 |
| 31 | @set DATE July 2009 | 31 | @set DATE July 2009 |
| 32 | 32 | ||
| 33 | @dircategory Emacs | 33 | @dircategory Emacs |
diff --git a/doc/man/emacs.1 b/doc/man/emacs.1 index 0baf3abe5e3..fddef64571c 100644 --- a/doc/man/emacs.1 +++ b/doc/man/emacs.1 | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | .\" See section COPYING for copyright and redistribution information. | 1 | .\" See section COPYING for copyright and redistribution information. |
| 2 | .TH EMACS 1 "2007 April 13" "GNU Emacs 23.3" | 2 | .TH EMACS 1 "2007 April 13" "GNU Emacs 23.3.50" |
| 3 | . | 3 | . |
| 4 | . | 4 | . |
| 5 | .SH NAME | 5 | .SH NAME |
diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi index d3acccf1693..ae2d0867fd3 100644 --- a/doc/misc/faq.texi +++ b/doc/misc/faq.texi | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | @c %**end of header | 5 | @c %**end of header |
| 6 | 6 | ||
| 7 | @c This is used in many places | 7 | @c This is used in many places |
| 8 | @set VER 23.3 | 8 | @set VER 23.3.50 |
| 9 | 9 | ||
| 10 | @c This file is maintained by Romain Francoise <rfrancoise@gnu.org>. | 10 | @c This file is maintained by Romain Francoise <rfrancoise@gnu.org>. |
| 11 | @c Feel free to install changes without prior permission (but I'd | 11 | @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 396060a3d75..3f74064c785 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 | |||
| 22 | 22 | ||
| 23 | .PHONY: $(ALL) | 23 | .PHONY: $(ALL) |
| 24 | 24 | ||
| 25 | VERSION = 23.3 | 25 | VERSION = 23.3.50 |
| 26 | 26 | ||
| 27 | LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \ | 27 | LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \ |
| 28 | -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \ | 28 | -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \ |
diff --git a/lisp/version.el b/lisp/version.el index 92eb56440aa..424c681c083 100644 --- a/lisp/version.el +++ b/lisp/version.el | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | (defconst emacs-copyright "Copyright (C) 2011 Free Software Foundation, Inc." "\ | 32 | (defconst emacs-copyright "Copyright (C) 2011 Free Software Foundation, Inc." "\ |
| 33 | Short copyright string for this version of Emacs.") | 33 | Short copyright string for this version of Emacs.") |
| 34 | 34 | ||
| 35 | (defconst emacs-version "23.3" "\ | 35 | (defconst emacs-version "23.3.50" "\ |
| 36 | Version numbers of this version of Emacs.") | 36 | Version numbers of this version of Emacs.") |
| 37 | 37 | ||
| 38 | (defconst emacs-major-version (progn (string-match "^[0-9]+" emacs-version) (string-to-number (match-string 0 emacs-version))) "\ | 38 | (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 c18c2267473..14a543bc278 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/>. | |||
| 553 | <key>CFBundleExecutable</key> | 553 | <key>CFBundleExecutable</key> |
| 554 | <string>Emacs</string> | 554 | <string>Emacs</string> |
| 555 | <key>CFBundleGetInfoString</key> | 555 | <key>CFBundleGetInfoString</key> |
| 556 | <string>Emacs 23.3 Copyright (C) 2011 Free Software Foundation, Inc.</string> | 556 | <string>Emacs 23.3.50 Copyright (C) 2011 Free Software Foundation, Inc.</string> |
| 557 | <key>CFBundleIconFile</key> | 557 | <key>CFBundleIconFile</key> |
| 558 | <string>Emacs.icns</string> | 558 | <string>Emacs.icns</string> |
| 559 | <key>CFBundleIdentifier</key> | 559 | <key>CFBundleIdentifier</key> |
| @@ -566,7 +566,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | |||
| 566 | <string>APPL</string> | 566 | <string>APPL</string> |
| 567 | <!-- This should be the emacs version number. --> | 567 | <!-- This should be the emacs version number. --> |
| 568 | <key>CFBundleShortVersionString</key> | 568 | <key>CFBundleShortVersionString</key> |
| 569 | <string>23.3</string> | 569 | <string>23.3.50</string> |
| 570 | <key>CFBundleSignature</key> | 570 | <key>CFBundleSignature</key> |
| 571 | <string>EMAx</string> | 571 | <string>EMAx</string> |
| 572 | <!-- This SHOULD be a build number. --> | 572 | <!-- 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 a2e48d47741..fe99acec153 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 @@ | |||
| 1 | /* Localized versions of Info.plist keys */ | 1 | /* Localized versions of Info.plist keys */ |
| 2 | 2 | ||
| 3 | CFBundleName = "Emacs"; | 3 | CFBundleName = "Emacs"; |
| 4 | CFBundleShortVersionString = "Version 23.3"; | 4 | CFBundleShortVersionString = "Version 23.3.50"; |
| 5 | CFBundleGetInfoString = "Emacs version 23.3, NS Windowing"; | 5 | CFBundleGetInfoString = "Emacs version 23.3.50, NS Windowing"; |
| 6 | NSHumanReadableCopyright = "Copyright (C) 2011 Free Software Foundation, Inc."; | 6 | NSHumanReadableCopyright = "Copyright (C) 2011 Free Software Foundation, Inc."; |
diff --git a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop index 431106a0fa5..32388dd01a8 100644 --- a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop +++ b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | [Desktop Entry] | 1 | [Desktop Entry] |
| 2 | Encoding=UTF-8 | 2 | Encoding=UTF-8 |
| 3 | Type=Application | 3 | Type=Application |
| 4 | Version=23.3 | 4 | Version=23.3.50 |
| 5 | Categories=GNUstep | 5 | Categories=GNUstep |
| 6 | Name=Emacs | 6 | Name=Emacs |
| 7 | Comment=GNU Emacs for NeXT/Open/GNUstep and OS X | 7 | 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 26847cced89..b72854f7600 100644 --- a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist +++ b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | ApplicationDescription = "GNU Emacs for GNUstep / OS X"; | 2 | ApplicationDescription = "GNU Emacs for GNUstep / OS X"; |
| 3 | ApplicationIcon = emacs.tiff; | 3 | ApplicationIcon = emacs.tiff; |
| 4 | ApplicationName = Emacs; | 4 | ApplicationName = Emacs; |
| 5 | ApplicationRelease = "23.3"; | 5 | ApplicationRelease = "23.3.50"; |
| 6 | Authors = ( | 6 | Authors = ( |
| 7 | "Adrian Robert (GNUstep)", | 7 | "Adrian Robert (GNUstep)", |
| 8 | "Christophe de Dinechin (MacOS X)", | 8 | "Christophe de Dinechin (MacOS X)", |
| @@ -13,7 +13,7 @@ | |||
| 13 | ); | 13 | ); |
| 14 | Copyright = "Copyright (C) 2011 Free Software Foundation, Inc."; | 14 | Copyright = "Copyright (C) 2011 Free Software Foundation, Inc."; |
| 15 | CopyrightDescription = "Released under the GNU General Public License Version 3 or later"; | 15 | CopyrightDescription = "Released under the GNU General Public License Version 3 or later"; |
| 16 | FullVersionID = "Emacs 23.3, NS Windowing"; | 16 | FullVersionID = "Emacs 23.3.50, NS Windowing"; |
| 17 | NSExecutable = Emacs; | 17 | NSExecutable = Emacs; |
| 18 | NSIcon = emacs.tiff; | 18 | NSIcon = emacs.tiff; |
| 19 | NSPrincipalClass = NSApplication; | 19 | NSPrincipalClass = NSApplication; |
diff --git a/nt/emacs.rc b/nt/emacs.rc index 540781c2b8e..4c376eca811 100644 --- a/nt/emacs.rc +++ b/nt/emacs.rc | |||
| @@ -7,8 +7,8 @@ Emacs ICON icons\emacs.ico | |||
| 7 | #endif | 7 | #endif |
| 8 | 8 | ||
| 9 | VS_VERSION_INFO VERSIONINFO | 9 | VS_VERSION_INFO VERSIONINFO |
| 10 | FILEVERSION 23,3,0,0 | 10 | FILEVERSION 23,3,50,0 |
| 11 | PRODUCTVERSION 23,3,0,0 | 11 | PRODUCTVERSION 23,3,50,0 |
| 12 | FILEFLAGSMASK 0x3FL | 12 | FILEFLAGSMASK 0x3FL |
| 13 | #ifdef EMACSDEBUG | 13 | #ifdef EMACSDEBUG |
| 14 | FILEFLAGS 0x1L | 14 | FILEFLAGS 0x1L |
| @@ -25,12 +25,12 @@ BEGIN | |||
| 25 | BEGIN | 25 | BEGIN |
| 26 | VALUE "CompanyName", "Free Software Foundation\0" | 26 | VALUE "CompanyName", "Free Software Foundation\0" |
| 27 | VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0" | 27 | VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0" |
| 28 | VALUE "FileVersion", "23, 3, 0, 0\0" | 28 | VALUE "FileVersion", "23, 3, 50, 0\0" |
| 29 | VALUE "InternalName", "Emacs\0" | 29 | VALUE "InternalName", "Emacs\0" |
| 30 | VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011\0" | 30 | VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011\0" |
| 31 | VALUE "OriginalFilename", "emacs.exe" | 31 | VALUE "OriginalFilename", "emacs.exe" |
| 32 | VALUE "ProductName", "Emacs\0" | 32 | VALUE "ProductName", "Emacs\0" |
| 33 | VALUE "ProductVersion", "23, 3, 0, 0\0" | 33 | VALUE "ProductVersion", "23, 3, 50, 0\0" |
| 34 | VALUE "OLESelfRegister", "\0" | 34 | VALUE "OLESelfRegister", "\0" |
| 35 | END | 35 | END |
| 36 | END | 36 | END |
diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc index 42e0d422956..d29a5ce6889 100644 --- a/nt/emacsclient.rc +++ b/nt/emacsclient.rc | |||
| @@ -5,8 +5,8 @@ Emacs ICON icons\emacs.ico | |||
| 5 | #endif | 5 | #endif |
| 6 | 6 | ||
| 7 | VS_VERSION_INFO VERSIONINFO | 7 | VS_VERSION_INFO VERSIONINFO |
| 8 | FILEVERSION 23,3,0,0 | 8 | FILEVERSION 23,3,50,0 |
| 9 | PRODUCTVERSION 23,3,0,0 | 9 | PRODUCTVERSION 23,3,50,0 |
| 10 | FILEFLAGSMASK 0x3FL | 10 | FILEFLAGSMASK 0x3FL |
| 11 | #ifdef EMACSDEBUG | 11 | #ifdef EMACSDEBUG |
| 12 | FILEFLAGS 0x1L | 12 | FILEFLAGS 0x1L |
| @@ -23,12 +23,12 @@ BEGIN | |||
| 23 | BEGIN | 23 | BEGIN |
| 24 | VALUE "CompanyName", "Free Software Foundation\0" | 24 | VALUE "CompanyName", "Free Software Foundation\0" |
| 25 | VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0" | 25 | VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0" |
| 26 | VALUE "FileVersion", "23, 3, 0, 0\0" | 26 | VALUE "FileVersion", "23, 3, 50, 0\0" |
| 27 | VALUE "InternalName", "EmacsClient\0" | 27 | VALUE "InternalName", "EmacsClient\0" |
| 28 | VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011\0" | 28 | VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011\0" |
| 29 | VALUE "OriginalFilename", "emacsclientw.exe" | 29 | VALUE "OriginalFilename", "emacsclientw.exe" |
| 30 | VALUE "ProductName", "EmacsClient\0" | 30 | VALUE "ProductName", "EmacsClient\0" |
| 31 | VALUE "ProductVersion", "23, 3, 0, 0\0" | 31 | VALUE "ProductVersion", "23, 3, 50, 0\0" |
| 32 | VALUE "OLESelfRegister", "\0" | 32 | VALUE "OLESelfRegister", "\0" |
| 33 | END | 33 | END |
| 34 | END | 34 | END |