aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2008-09-02 22:25:20 +0000
committerChong Yidong2008-09-02 22:25:20 +0000
commit3604d9bde1ae7dd531dc97a646b49618e28e5702 (patch)
tree9ea0381149b95d30181494dda8ebef437cbf1ec2
parent935d4a636647778e596de3b309a0af4c64159124 (diff)
downloademacs-3604d9bde1ae7dd531dc97a646b49618e28e5702.tar.gz
emacs-3604d9bde1ae7dd531dc97a646b49618e28e5702.zip
Bump version to 22.2.92.
-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
-rw-r--r--nt/emacsclient.rc8
9 files changed, 18 insertions, 18 deletions
diff --git a/README b/README
index ff9dbc3334a..151fdfecee1 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.91 of GNU Emacs, the extensible, 6This directory tree holds version 22.2.92 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 b750b7576fa..4b3cf080964 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.91 27VERSION = 22.2.92
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 920cefe354a..3706d006bd7 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.91" "\ 33(defconst emacs-version "22.2.92" "\
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 1062e170dd6..e671b39b2ba 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.91 10@set EMACSVER 22.2.92
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 97bd9b05c19..a104fb09216 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.91"; 4CFBundleShortVersionString = "22.2.92";
5CFBundleGetInfoString = "22.2.91, Copyright (C) 2008 Free Software Foundation, Inc."; 5CFBundleGetInfoString = "22.2.92, Copyright (C) 2008 Free Software Foundation, Inc.";
diff --git a/mac/src/Emacs.r b/mac/src/Emacs.r
index 3cf8390b21c..2b7360d429b 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 0x2, /* Minor revision in BCD */ 222 0x2, /* Minor revision in BCD */
223 alpha, /* development, alpha, beta, or final (release) */ 223 alpha, /* development, alpha, beta, or final (release) */
224 91, /* Non-final release # */ 224 92, /* Non-final release # */
225 0, /* Region code */ 225 0, /* Region code */
226 "22.2.91", /* Short version number */ 226 "22.2.92", /* Short version number */
227 "22.2.91, Copyright \0xa9 2008 " 227 "22.2.92, 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 42722462799..3e16427da0a 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.91 8@set EMACSVER 22.2.92
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 bbf0b6448d3..b87fb05cd18 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,91,0 10 FILEVERSION 22,2,92,0
11 PRODUCTVERSION 22,2,91,0 11 PRODUCTVERSION 22,2,92,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, 91, 0\0" 28 VALUE "FileVersion", "22, 2, 92, 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, 91, 0\0" 33 VALUE "ProductVersion", "22, 2, 92, 0\0"
34 VALUE "OLESelfRegister", "\0" 34 VALUE "OLESelfRegister", "\0"
35 END 35 END
36 END 36 END
diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc
index 3bb65b5f5f2..606f357e63d 100644
--- a/nt/emacsclient.rc
+++ b/nt/emacsclient.rc
@@ -5,8 +5,8 @@ Emacs ICON icons\emacs.ico
5#endif 5#endif
6 6
7VS_VERSION_INFO VERSIONINFO 7VS_VERSION_INFO VERSIONINFO
8 FILEVERSION 22,2,91,0 8 FILEVERSION 22,2,92,0
9 PRODUCTVERSION 22,2,91,0 9 PRODUCTVERSION 22,2,92,0
10 FILEFLAGSMASK 0x3FL 10 FILEFLAGSMASK 0x3FL
11#ifdef EMACSDEBUG 11#ifdef EMACSDEBUG
12 FILEFLAGS 0x1L 12 FILEFLAGS 0x1L
@@ -23,12 +23,12 @@ BEGIN
23 BEGIN 23 BEGIN
24 VALUE "CompanyName", "Free Software Foundation\0" 24 VALUE "CompanyName", "Free Software Foundation\0"
25 VALUE "FileDescription", "GNU EmacsClient for Windows NT/95/98/2000/ME/XP\0" 25 VALUE "FileDescription", "GNU EmacsClient for Windows NT/95/98/2000/ME/XP\0"
26 VALUE "FileVersion", "22, 2, 91, 0\0" 26 VALUE "FileVersion", "22, 2, 92, 0\0"
27 VALUE "InternalName", "EmacsClient\0" 27 VALUE "InternalName", "EmacsClient\0"
28 VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008\0" 28 VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008\0"
29 VALUE "OriginalFilename", "emacsclientw.exe" 29 VALUE "OriginalFilename", "emacsclientw.exe"
30 VALUE "ProductName", "EmacsClient: Client for the extensible self-documenting text editor\0" 30 VALUE "ProductName", "EmacsClient: Client for the extensible self-documenting text editor\0"
31 VALUE "ProductVersion", "22, 2, 91, 0\0" 31 VALUE "ProductVersion", "22, 2, 92, 0\0"
32 VALUE "OLESelfRegister", "\0" 32 VALUE "OLESelfRegister", "\0"
33 END 33 END
34 END 34 END