aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2007-02-23 17:37:28 +0000
committerChong Yidong2007-02-23 17:37:28 +0000
commit38008dcd924d42aeac69d0fa27034b80bc6687fe (patch)
tree48b1549319bacd4a0c330115eca86065e07a3cbd
parentfc858181de5a588dfcdde19c1158ee8bdc2a2eb7 (diff)
downloademacs-38008dcd924d42aeac69d0fa27034b80bc6687fe.tar.gz
emacs-38008dcd924d42aeac69d0fa27034b80bc6687fe.zip
Bump to version 22.0.94.emacs-pretest-22.0.94
-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.r6
-rw-r--r--man/emacs.texi2
-rw-r--r--nt/emacs.rc8
8 files changed, 14 insertions, 14 deletions
diff --git a/README b/README
index 7eef4b8e2ed..4f8c6d6bb49 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.93 of GNU Emacs, the extensible, 6This directory tree holds version 22.0.94 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 3cb0c264a23..5eac02c9e30 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.0.93 27VERSION = 22.0.94
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 f6ab6c4c913..fce42b67f06 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.93" "\ 30(defconst emacs-version "22.0.94" "\
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 3d1c9134a92..14aaf477b68 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.93 10@set EMACSVER 22.0.94
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 fec519b516e..fd6d57b84b5 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.93"; 4CFBundleShortVersionString = "22.0.94";
5CFBundleGetInfoString = "22.0.93, Copyright (C) 2007 Free Software Foundation, Inc."; 5CFBundleGetInfoString = "22.0.94, Copyright (C) 2007 Free Software Foundation, Inc.";
diff --git a/mac/src/Emacs.r b/mac/src/Emacs.r
index a1a11abef06..abda6f631c7 100644
--- a/mac/src/Emacs.r
+++ b/mac/src/Emacs.r
@@ -221,10 +221,10 @@ resource 'vers' (1) {
221 0x22, /* Major revision in BCD */ 221 0x22, /* Major revision in BCD */
222 0x0, /* Minor revision in BCD */ 222 0x0, /* Minor revision in BCD */
223 alpha, /* development, alpha, beta, or final (release) */ 223 alpha, /* development, alpha, beta, or final (release) */
224 93, /* Non-final release # */ 224 94, /* Non-final release # */
225 0, /* Region code */ 225 0, /* Region code */
226 "22.0.93", /* Short version number */ 226 "22.0.94", /* Short version number */
227 "22.0.93, Copyright \0xa9 2007 " 227 "22.0.94, 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 801a713eb0f..4a6b13efd98 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.93 8@set EMACSVER 22.0.94
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 1879a8655d2..85e74c7a9d6 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,93,0 9 FILEVERSION 22,0,94,0
10 PRODUCTVERSION 22,0,93,0 10 PRODUCTVERSION 22,0,94,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, 93, 0\0" 27 VALUE "FileVersion", "22, 0, 94, 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, 93, 0\0" 32 VALUE "ProductVersion", "22, 0, 94, 0\0"
33 VALUE "OLESelfRegister", "\0" 33 VALUE "OLESelfRegister", "\0"
34 END 34 END
35 END 35 END