summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2007-06-02 11:09:25 +0000
committerChong Yidong <cyd@stupidchicken.com>2007-06-02 11:09:25 +0000
commit0d9acfe90fa6092cef3797a44558a6d9da0c1615 (patch)
tree09efb3f7a5cda1af467dd10391d56ea91eb806d7
parent7dfc4cda5df5732cc79ad4739bac13b55baae873 (diff)
downloademacs-0d9acfe90fa6092cef3797a44558a6d9da0c1615.tar.gz
Increment version to 22.1.
-rw-r--r--README2
-rw-r--r--lisp/version.el2
-rw-r--r--lispref/elisp.texi2
-rw-r--r--mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings4
-rw-r--r--mac/src/Emacs.r10
-rw-r--r--man/emacs.texi2
-rw-r--r--nt/emacs.rc8
7 files changed, 15 insertions, 15 deletions
diff --git a/README b/README
index 1effe4f61c5..80cc1a50326 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
See the end of the file for license conditions.
-This directory tree holds version 22.0.990 of GNU Emacs, the extensible,
+This directory tree holds version 22.1 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/lisp/version.el b/lisp/version.el
index de2cfccf7cf..9e5ec6544d4 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -27,7 +27,7 @@
;;; Code:
-(defconst emacs-version "22.0.990" "\
+(defconst emacs-version "22.1" "\
Version numbers of this version of Emacs.")
(defconst emacs-major-version
diff --git a/lispref/elisp.texi b/lispref/elisp.texi
index 2a3a0eb1a7e..f6e91bb187a 100644
--- a/lispref/elisp.texi
+++ b/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 2.9
-@set EMACSVER 22.0.990
+@set EMACSVER 22.1
@dircategory Emacs
@direntry
diff --git a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings
index 231d088e802..9718e10da68 100644
--- a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings
+++ b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
/* Localized versions of Info.plist keys */
CFBundleName = "Emacs";
-CFBundleShortVersionString = "22.0.990";
-CFBundleGetInfoString = "22.0.990, Copyright (C) 2007 Free Software Foundation, Inc.";
+CFBundleShortVersionString = "22.1";
+CFBundleGetInfoString = "22.1, Copyright (C) 2007 Free Software Foundation, Inc.";
diff --git a/mac/src/Emacs.r b/mac/src/Emacs.r
index efdb6e757f1..e35a898ae28 100644
--- a/mac/src/Emacs.r
+++ b/mac/src/Emacs.r
@@ -219,12 +219,12 @@ resource 'FREF' (129) {
resource 'vers' (1) {
0x22, /* Major revision in BCD */
- 0x0, /* Minor revision in BCD */
- alpha, /* development, alpha, beta, or final (release) */
- 990, /* Non-final release # */
+ 0x1, /* Minor revision in BCD */
+ final, /* development, alpha, beta, or final (release) */
+ 0, /* Non-final release # */
0, /* Region code */
- "22.0.990", /* Short version number */
- "22.0.990, Copyright \0xa9 2007 "
+ "22.1", /* Short version number */
+ "22.1, Copyright \0xa9 2007 "
"Free Software Foundation, Inc." /* Long version number */
};
diff --git a/man/emacs.texi b/man/emacs.texi
index fc055adfd6f..c54808e3417 100644
--- a/man/emacs.texi
+++ b/man/emacs.texi
@@ -5,7 +5,7 @@
@c The edition number appears in several places in this file
@set EDITION Sixteenth
-@set EMACSVER 22.0.990
+@set EMACSVER 22.1
@copying
This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@*
diff --git a/nt/emacs.rc b/nt/emacs.rc
index 55220b16b2e..053ce2d0e41 100644
--- a/nt/emacs.rc
+++ b/nt/emacs.rc
@@ -6,8 +6,8 @@ Emacs ICON icons\emacs.ico
#endif
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 22,0,990,0
- PRODUCTVERSION 22,0,990,0
+ FILEVERSION 22,1,0,0
+ PRODUCTVERSION 22,1,0,0
FILEFLAGSMASK 0x3FL
#ifdef EMACSDEBUG
FILEFLAGS 0x1L
@@ -24,12 +24,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Free Software Foundation\0"
VALUE "FileDescription", "GNU Emacs for Windows NT/95/98/2000/ME/XP\0"
- VALUE "FileVersion", "22, 0, 990, 0\0"
+ VALUE "FileVersion", "22, 1, 0, 0\0"
VALUE "InternalName", "Emacs\0"
VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007\0"
VALUE "OriginalFilename", "emacs.exe"
VALUE "ProductName", "Emacs: The extensible self-documenting text editor\0"
- VALUE "ProductVersion", "22, 0, 990, 0\0"
+ VALUE "ProductVersion", "22, 1, 0, 0\0"
VALUE "OLESelfRegister", "\0"
END
END