aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2008-03-26 16:49:50 +0000
committerChong Yidong2008-03-26 16:49:50 +0000
commita8da49fb71368e5069302bca516d429ba6c57d78 (patch)
tree2940a09cb03e5d2b125a19108e914ab889df7633
parenta7efa41c937eacbc0e9d87d114828f3c3f232836 (diff)
downloademacs-a8da49fb71368e5069302bca516d429ba6c57d78.tar.gz
emacs-a8da49fb71368e5069302bca516d429ba6c57d78.zip
Bump version to 22.2.50.
-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 89921961c92..413607aac03 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.2 of GNU Emacs, the extensible, 6This directory tree holds version 22.2.50 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 a8e478875dc..02f877581c8 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.2 27VERSION = 22.2.50
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 2a72c6e16b7..b74d897a0b6 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.2" "\ 33(defconst emacs-version "22.2.50" "\
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 e41f5a9786b..8a43847890b 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.2 10@set EMACSVER 22.2.50
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 638f127a8a7..f367328295e 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.2"; 4CFBundleShortVersionString = "22.2.50";
5CFBundleGetInfoString = "22.2, Copyright (C) 2008 Free Software Foundation, Inc."; 5CFBundleGetInfoString = "22.2.50, Copyright (C) 2008 Free Software Foundation, Inc.";
diff --git a/mac/src/Emacs.r b/mac/src/Emacs.r
index d7b4b5a34e1..25172ae43b1 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 0x2, /* Minor revision in BCD */ 222 0x2, /* Minor revision in BCD */
223 final, /* development, alpha, beta, or final (release) */ 223 development, /* development, alpha, beta, or final (release) */
224 0, /* Non-final release # */ 224 50, /* Non-final release # */
225 0, /* Region code */ 225 0, /* Region code */
226 "22.2", /* Short version number */ 226 "22.2.50", /* Short version number */
227 "22.2, Copyright \0xa9 2008 " 227 "22.2.50, 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 d2638528eef..485aa640e2a 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.2 8@set EMACSVER 22.2.50
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 d474b32cadc..881023e54d8 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,2,0,0 10 FILEVERSION 22,2,50,0
11 PRODUCTVERSION 22,2,0,0 11 PRODUCTVERSION 22,2,50,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, 2, 0, 0\0" 28 VALUE "FileVersion", "22, 2, 50, 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, 2, 0, 0\0" 33 VALUE "ProductVersion", "22, 2, 50, 0\0"
34 VALUE "OLESelfRegister", "\0" 34 VALUE "OLESelfRegister", "\0"
35 END 35 END
36 END 36 END