summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2007-05-17 18:55:36 +0000
committerChong Yidong <cyd@stupidchicken.com>2007-05-17 18:55:36 +0000
commitab43d1e484120a22b5dea36d0abd8be999cd7380 (patch)
tree76cd46acd679c2d6bf662c88dddd15e10f923fcf
parentc5efc23b31d40ec96d2d1b2e448a2c799d8545a0 (diff)
downloademacs-ab43d1e484120a22b5dea36d0abd8be999cd7380.tar.gz
Bump version to 22.0.990emacs-pretest-22.0.990
-rw-r--r--README2
-rwxr-xr-xconfigure8
-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.r6
-rw-r--r--man/emacs.texi2
-rw-r--r--nt/emacs.rc8
9 files changed, 18 insertions, 18 deletions
diff --git a/README b/README
index 333cabef409..1effe4f61c5 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.99 of GNU Emacs, the extensible,
+This directory tree holds version 22.0.990 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 b/configure
index 4e2af0b1e38..9dd401b4d12 100755
--- a/configure
+++ b/configure
@@ -412,10 +412,10 @@ else
fi
test \$exitcode = 0") || {
- echo Please tell bug-autoconf@gnu.org about your system,
- echo including any error possibly output before this message.
- echo This can help us improve future autoconf versions.
- echo Configuration will now proceed without shell functions.
+ echo No shell found that supports shell functions.
+ echo Please tell autoconf@gnu.org about your system,
+ echo including any error possibly output before this
+ echo message
}
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index ceba5c6f6d1..c1e7b70e5bf 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
.PHONY: $(ALL)
-VERSION = 22.0.99
+VERSION = 22.0.990
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 91feeff5cea..de2cfccf7cf 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -27,7 +27,7 @@
;;; Code:
-(defconst emacs-version "22.0.99" "\
+(defconst emacs-version "22.0.990" "\
Version numbers of this version of Emacs.")
(defconst emacs-major-version
diff --git a/lispref/elisp.texi b/lispref/elisp.texi
index 3ece3c53d0a..2a3a0eb1a7e 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.99
+@set EMACSVER 22.0.990
@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 1140b7efa4c..231d088e802 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.99";
-CFBundleGetInfoString = "22.0.99, Copyright (C) 2007 Free Software Foundation, Inc.";
+CFBundleShortVersionString = "22.0.990";
+CFBundleGetInfoString = "22.0.990, Copyright (C) 2007 Free Software Foundation, Inc.";
diff --git a/mac/src/Emacs.r b/mac/src/Emacs.r
index 5c7dd9cc6f1..efdb6e757f1 100644
--- a/mac/src/Emacs.r
+++ b/mac/src/Emacs.r
@@ -221,10 +221,10 @@ resource 'vers' (1) {
0x22, /* Major revision in BCD */
0x0, /* Minor revision in BCD */
alpha, /* development, alpha, beta, or final (release) */
- 99, /* Non-final release # */
+ 990, /* Non-final release # */
0, /* Region code */
- "22.0.99", /* Short version number */
- "22.0.99, Copyright \0xa9 2007 "
+ "22.0.990", /* Short version number */
+ "22.0.990, Copyright \0xa9 2007 "
"Free Software Foundation, Inc." /* Long version number */
};
diff --git a/man/emacs.texi b/man/emacs.texi
index d264a67f29a..fc055adfd6f 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.99
+@set EMACSVER 22.0.990
@copying
This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@*
diff --git a/nt/emacs.rc b/nt/emacs.rc
index 0b358494bbc..55220b16b2e 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,99,0
- PRODUCTVERSION 22,0,99,0
+ FILEVERSION 22,0,990,0
+ PRODUCTVERSION 22,0,990,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, 99, 0\0"
+ VALUE "FileVersion", "22, 0, 990, 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, 99, 0\0"
+ VALUE "ProductVersion", "22, 0, 990, 0\0"
VALUE "OLESelfRegister", "\0"
END
END