aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2008-01-30 21:51:43 +0000
committerChong Yidong2008-01-30 21:51:43 +0000
commit772964f93a1e19099aa24ac2453240d4f729ccab (patch)
treea32728631ef0eb225aa715f854d8948723b783d6
parentb874d2a75fc3715d810b13085cadce1145a921c9 (diff)
downloademacs-772964f93a1e19099aa24ac2453240d4f729ccab.tar.gz
emacs-772964f93a1e19099aa24ac2453240d4f729ccab.zip
Bump version number to 22.1.90.
-rw-r--r--README2
-rw-r--r--lib-src/makefile.w32-in2
-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.r8
-rw-r--r--man/emacs.texi2
-rw-r--r--nt/emacs.rc8
8 files changed, 15 insertions, 15 deletions
diff --git a/README b/README
index 1e1aa9ee7a7..1b536fbd0bf 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
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.1.50 of GNU Emacs, the extensible, 6This directory tree holds version 22.1.90 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/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index b30240fc895..37e2e555742 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -24,7 +24,7 @@ ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacs
24 24
25.PHONY: $(ALL) 25.PHONY: $(ALL)
26 26
27VERSION = 22.1.50 27VERSION = 22.1.90
28 28
29LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \ 29LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
30 -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \ 30 -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \
diff --git a/lisp/version.el b/lisp/version.el
index 1d2cc4fabcf..0d4ddb7c09a 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -30,7 +30,7 @@
30(defconst emacs-copyright "Copyright (C) 2008 Free Software Foundation, Inc." 30(defconst emacs-copyright "Copyright (C) 2008 Free Software Foundation, Inc."
31 "Short copyright string for this version of Emacs.") 31 "Short copyright string for this version of Emacs.")
32 32
33(defconst emacs-version "22.1.50" "\ 33(defconst emacs-version "22.1.90" "\
34Version numbers of this version of Emacs.") 34Version numbers of this version of Emacs.")
35 35
36(defconst emacs-major-version 36(defconst emacs-major-version
diff --git a/lispref/elisp.texi b/lispref/elisp.texi
index 72ffac92f4b..8d168e13bca 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.1.50 10@set EMACSVER 22.1.90
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 50ce2a05798..03caff39496 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.1.50"; 4CFBundleShortVersionString = "22.1.90";
5CFBundleGetInfoString = "22.1.50, Copyright (C) 2008 Free Software Foundation, Inc."; 5CFBundleGetInfoString = "22.1.90, Copyright (C) 2008 Free Software Foundation, Inc.";
diff --git a/mac/src/Emacs.r b/mac/src/Emacs.r
index cbc8bd73a1e..e5275d1b301 100644
--- a/mac/src/Emacs.r
+++ b/mac/src/Emacs.r
@@ -220,11 +220,11 @@ resource 'FREF' (129) {
220resource 'vers' (1) { 220resource 'vers' (1) {
221 0x22, /* Major revision in BCD */ 221 0x22, /* Major revision in BCD */
222 0x1, /* Minor revision in BCD */ 222 0x1, /* Minor revision in BCD */
223 development, /* development, alpha, beta, or final (release) */ 223 alpha, /* development, alpha, beta, or final (release) */
224 50, /* Non-final release # */ 224 90, /* Non-final release # */
225 0, /* Region code */ 225 0, /* Region code */
226 "22.1.50", /* Short version number */ 226 "22.1.90", /* Short version number */
227 "22.1.50, Copyright \0xa9 2008 " 227 "22.1.90, Copyright \0xa9 2008 "
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 7addd7f83a7..70a1c014a9d 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.1.50 8@set EMACSVER 22.1.90
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 460527167c7..235e6d082e7 100644
--- a/nt/emacs.rc
+++ b/nt/emacs.rc
@@ -7,8 +7,8 @@ Emacs ICON icons\emacs.ico
7#endif 7#endif
8 8
9VS_VERSION_INFO VERSIONINFO 9VS_VERSION_INFO VERSIONINFO
10 FILEVERSION 22,1,50,0 10 FILEVERSION 22,1,90,0
11 PRODUCTVERSION 22,1,50,0 11 PRODUCTVERSION 22,1,90,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 for Windows NT/95/98/2000/ME/XP\0" 27 VALUE "FileDescription", "GNU Emacs for Windows NT/95/98/2000/ME/XP\0"
28 VALUE "FileVersion", "22, 1, 50, 0\0" 28 VALUE "FileVersion", "22, 1, 90, 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\0" 30 VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008\0"
31 VALUE "OriginalFilename", "emacs.exe" 31 VALUE "OriginalFilename", "emacs.exe"
32 VALUE "ProductName", "Emacs: The extensible self-documenting text editor\0" 32 VALUE "ProductName", "Emacs: The extensible self-documenting text editor\0"
33 VALUE "ProductVersion", "22, 1, 50, 0\0" 33 VALUE "ProductVersion", "22, 1, 90, 0\0"
34 VALUE "OLESelfRegister", "\0" 34 VALUE "OLESelfRegister", "\0"
35 END 35 END
36 END 36 END