aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2007-06-02 11:09:25 +0000
committerChong Yidong2007-06-02 11:09:25 +0000
commit0d9acfe90fa6092cef3797a44558a6d9da0c1615 (patch)
tree09efb3f7a5cda1af467dd10391d56ea91eb806d7
parent7dfc4cda5df5732cc79ad4739bac13b55baae873 (diff)
downloademacs-0d9acfe90fa6092cef3797a44558a6d9da0c1615.tar.gz
emacs-0d9acfe90fa6092cef3797a44558a6d9da0c1615.zip
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
3See the end of the file for license conditions. 3See the end of the file for license conditions.
4 4
5 5
6This directory tree holds version 22.0.990 of GNU Emacs, the extensible, 6This directory tree holds version 22.1 of GNU Emacs, the extensible,
7customizable, self-documenting real-time display editor. 7customizable, self-documenting real-time display editor.
8 8
9The file INSTALL in this directory says how to build and install GNU 9The 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 @@
27 27
28;;; Code: 28;;; Code:
29 29
30(defconst emacs-version "22.0.990" "\ 30(defconst emacs-version "22.1" "\
31Version numbers of this version of Emacs.") 31Version numbers of this version of Emacs.")
32 32
33(defconst emacs-major-version 33(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 @@
7@c Version of the manual and of Emacs. 7@c Version of the manual and of Emacs.
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@set VERSION 2.9 9@set VERSION 2.9
10@set EMACSVER 22.0.990 10@set EMACSVER 22.1
11 11
12@dircategory Emacs 12@dircategory Emacs
13@direntry 13@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 @@
1/* Localized versions of Info.plist keys */ 1/* Localized versions of Info.plist keys */
2 2
3CFBundleName = "Emacs"; 3CFBundleName = "Emacs";
4CFBundleShortVersionString = "22.0.990"; 4CFBundleShortVersionString = "22.1";
5CFBundleGetInfoString = "22.0.990, Copyright (C) 2007 Free Software Foundation, Inc."; 5CFBundleGetInfoString = "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) {
219 219
220resource 'vers' (1) { 220resource 'vers' (1) {
221 0x22, /* Major revision in BCD */ 221 0x22, /* Major revision in BCD */
222 0x0, /* Minor revision in BCD */ 222 0x1, /* Minor revision in BCD */
223 alpha, /* development, alpha, beta, or final (release) */ 223 final, /* development, alpha, beta, or final (release) */
224 990, /* Non-final release # */ 224 0, /* Non-final release # */
225 0, /* Region code */ 225 0, /* Region code */
226 "22.0.990", /* Short version number */ 226 "22.1", /* Short version number */
227 "22.0.990, Copyright \0xa9 2007 " 227 "22.1, Copyright \0xa9 2007 "
228 "Free Software Foundation, Inc." /* Long version number */ 228 "Free Software Foundation, Inc." /* Long version number */
229}; 229};
230 230
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 @@
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 22.0.990 8@set EMACSVER 22.1
9 9
10@copying 10@copying
11This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@* 11This 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
6#endif 6#endif
7 7
8VS_VERSION_INFO VERSIONINFO 8VS_VERSION_INFO VERSIONINFO
9 FILEVERSION 22,0,990,0 9 FILEVERSION 22,1,0,0
10 PRODUCTVERSION 22,0,990,0 10 PRODUCTVERSION 22,1,0,0
11 FILEFLAGSMASK 0x3FL 11 FILEFLAGSMASK 0x3FL
12#ifdef EMACSDEBUG 12#ifdef EMACSDEBUG
13 FILEFLAGS 0x1L 13 FILEFLAGS 0x1L
@@ -24,12 +24,12 @@ BEGIN
24 BEGIN 24 BEGIN
25 VALUE "CompanyName", "Free Software Foundation\0" 25 VALUE "CompanyName", "Free Software Foundation\0"
26 VALUE "FileDescription", "GNU Emacs for Windows NT/95/98/2000/ME/XP\0" 26 VALUE "FileDescription", "GNU Emacs for Windows NT/95/98/2000/ME/XP\0"
27 VALUE "FileVersion", "22, 0, 990, 0\0" 27 VALUE "FileVersion", "22, 1, 0, 0\0"
28 VALUE "InternalName", "Emacs\0" 28 VALUE "InternalName", "Emacs\0"
29 VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007\0" 29 VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007\0"
30 VALUE "OriginalFilename", "emacs.exe" 30 VALUE "OriginalFilename", "emacs.exe"
31 VALUE "ProductName", "Emacs: The extensible self-documenting text editor\0" 31 VALUE "ProductName", "Emacs: The extensible self-documenting text editor\0"
32 VALUE "ProductVersion", "22, 0, 990, 0\0" 32 VALUE "ProductVersion", "22, 1, 0, 0\0"
33 VALUE "OLESelfRegister", "\0" 33 VALUE "OLESelfRegister", "\0"
34 END 34 END
35 END 35 END