aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2012-08-15 21:26:30 +0800
committerChong Yidong2012-08-15 21:26:30 +0800
commitb6928595db69a78f1cc9a69ae5ba1238b38c0d43 (patch)
tree5ade7fb83a4b6217e10e0804e71c26e5d42b1743
parent5bf192caba07684c4fda7a230e4d1afb5ed49664 (diff)
downloademacs-b6928595db69a78f1cc9a69ae5ba1238b38c0d43.tar.gz
emacs-b6928595db69a78f1cc9a69ae5ba1238b38c0d43.zip
Bump version to 24.2.50
-rw-r--r--README2
-rw-r--r--configure.ac2
-rw-r--r--doc/emacs/emacsver.texi2
-rw-r--r--doc/man/emacs.12
-rw-r--r--msdos/sed2v2.inp2
-rw-r--r--nextstep/Cocoa/Emacs.base/Contents/Info.plist4
-rw-r--r--nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings4
-rw-r--r--nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop2
-rw-r--r--nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist4
-rw-r--r--nt/config.nt2
-rw-r--r--nt/emacs.rc8
-rw-r--r--nt/emacsclient.rc8
-rw-r--r--nt/makefile.w32-in2
13 files changed, 22 insertions, 22 deletions
diff --git a/README b/README
index de4ee24fc5e..a11935ee3e8 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ Copyright (C) 2001-2012 Free Software Foundation, Inc.
2See the end of the file for license conditions. 2See the end of the file for license conditions.
3 3
4 4
5This directory tree holds version 24.1.50 of GNU Emacs, the extensible, 5This directory tree holds version 24.2.50 of GNU Emacs, the extensible,
6customizable, self-documenting real-time display editor. 6customizable, self-documenting real-time display editor.
7 7
8The file INSTALL in this directory says how to build and install GNU 8The file INSTALL in this directory says how to build and install GNU
diff --git a/configure.ac b/configure.ac
index 408413f2c07..92fb5f8413b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl You should have received a copy of the GNU General Public License
22dnl along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. 22dnl along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
23 23
24AC_PREREQ(2.65) 24AC_PREREQ(2.65)
25AC_INIT(emacs, 24.1.50) 25AC_INIT(emacs, 24.2.50)
26AC_CONFIG_HEADER(src/config.h:src/config.in) 26AC_CONFIG_HEADER(src/config.h:src/config.in)
27AC_CONFIG_SRCDIR(src/lisp.h) 27AC_CONFIG_SRCDIR(src/lisp.h)
28AC_CONFIG_AUX_DIR(build-aux) 28AC_CONFIG_AUX_DIR(build-aux)
diff --git a/doc/emacs/emacsver.texi b/doc/emacs/emacsver.texi
index 88c6f2c6045..3b54719ad77 100644
--- a/doc/emacs/emacsver.texi
+++ b/doc/emacs/emacsver.texi
@@ -1,4 +1,4 @@
1@c It would be nicer to generate this using configure and @version@. 1@c It would be nicer to generate this using configure and @version@.
2@c However, that would mean emacsver.texi would always be newer 2@c However, that would mean emacsver.texi would always be newer
3@c then the info files in release tarfiles. 3@c then the info files in release tarfiles.
4@set EMACSVER 24.1.50 4@set EMACSVER 24.2.50
diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index d3d8a0095b8..a3d73800503 100644
--- a/doc/man/emacs.1
+++ b/doc/man/emacs.1
@@ -1,5 +1,5 @@
1.\" See section COPYING for copyright and redistribution information. 1.\" See section COPYING for copyright and redistribution information.
2.TH EMACS 1 "2007 April 13" "GNU Emacs 24.1.50" 2.TH EMACS 1 "2007 April 13" "GNU Emacs 24.2.50"
3. 3.
4. 4.
5.SH NAME 5.SH NAME
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index ae0db1339c9..25bc5ed12fd 100644
--- a/msdos/sed2v2.inp
+++ b/msdos/sed2v2.inp
@@ -70,7 +70,7 @@
70/^#undef PACKAGE_STRING/s/^.*$/#define PACKAGE_STRING ""/ 70/^#undef PACKAGE_STRING/s/^.*$/#define PACKAGE_STRING ""/
71/^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/ 71/^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/
72/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION ""/ 72/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION ""/
73/^#undef VERSION/s/^.*$/#define VERSION "24.1.50"/ 73/^#undef VERSION/s/^.*$/#define VERSION "24.2.50"/
74/^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/ 74/^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/
75/^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/ 75/^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/
76/^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/ 76/^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/
diff --git a/nextstep/Cocoa/Emacs.base/Contents/Info.plist b/nextstep/Cocoa/Emacs.base/Contents/Info.plist
index 31100020cc3..f5490f613fd 100644
--- a/nextstep/Cocoa/Emacs.base/Contents/Info.plist
+++ b/nextstep/Cocoa/Emacs.base/Contents/Info.plist
@@ -553,7 +553,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
553 <key>CFBundleExecutable</key> 553 <key>CFBundleExecutable</key>
554 <string>Emacs</string> 554 <string>Emacs</string>
555 <key>CFBundleGetInfoString</key> 555 <key>CFBundleGetInfoString</key>
556 <string>Emacs 24.1.50 Copyright (C) 2012 Free Software Foundation, Inc.</string> 556 <string>Emacs 24.2.50 Copyright (C) 2012 Free Software Foundation, Inc.</string>
557 <key>CFBundleIconFile</key> 557 <key>CFBundleIconFile</key>
558 <string>Emacs.icns</string> 558 <string>Emacs.icns</string>
559 <key>CFBundleIdentifier</key> 559 <key>CFBundleIdentifier</key>
@@ -566,7 +566,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
566 <string>APPL</string> 566 <string>APPL</string>
567 <!-- This should be the emacs version number. --> 567 <!-- This should be the emacs version number. -->
568 <key>CFBundleShortVersionString</key> 568 <key>CFBundleShortVersionString</key>
569 <string>24.1.50</string> 569 <string>24.2.50</string>
570 <key>CFBundleSignature</key> 570 <key>CFBundleSignature</key>
571 <string>EMAx</string> 571 <string>EMAx</string>
572 <!-- This SHOULD be a build number. --> 572 <!-- This SHOULD be a build number. -->
diff --git a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
index cd1920317b0..7655c0ca8ec 100644
--- a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
+++ b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
@@ -1,6 +1,6 @@
1/* Localized versions of Info.plist keys */ 1/* Localized versions of Info.plist keys */
2 2
3CFBundleName = "Emacs"; 3CFBundleName = "Emacs";
4CFBundleShortVersionString = "Version 24.1.50"; 4CFBundleShortVersionString = "Version 24.2.50";
5CFBundleGetInfoString = "Emacs version 24.1.50, NS Windowing"; 5CFBundleGetInfoString = "Emacs version 24.2.50, NS Windowing";
6NSHumanReadableCopyright = "Copyright (C) 2012 Free Software Foundation, Inc."; 6NSHumanReadableCopyright = "Copyright (C) 2012 Free Software Foundation, Inc.";
diff --git a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop
index 4e79b4f380e..a36eafaadb0 100644
--- a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop
+++ b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop
@@ -1,7 +1,7 @@
1[Desktop Entry] 1[Desktop Entry]
2Encoding=UTF-8 2Encoding=UTF-8
3Type=Application 3Type=Application
4Version=24.1.50 4Version=24.2.50
5Categories=GNUstep 5Categories=GNUstep
6Name=Emacs 6Name=Emacs
7Comment=GNU Emacs for NeXT/Open/GNUstep and OS X 7Comment=GNU Emacs for NeXT/Open/GNUstep and OS X
diff --git a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
index e22b9daa373..6cde01b0d05 100644
--- a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
+++ b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
@@ -2,7 +2,7 @@
2 ApplicationDescription = "GNU Emacs for GNUstep / OS X"; 2 ApplicationDescription = "GNU Emacs for GNUstep / OS X";
3 ApplicationIcon = emacs.tiff; 3 ApplicationIcon = emacs.tiff;
4 ApplicationName = Emacs; 4 ApplicationName = Emacs;
5 ApplicationRelease = "24.1.50"; 5 ApplicationRelease = "24.2.50";
6 Authors = ( 6 Authors = (
7 "Adrian Robert (GNUstep)", 7 "Adrian Robert (GNUstep)",
8 "Christophe de Dinechin (MacOS X)", 8 "Christophe de Dinechin (MacOS X)",
@@ -13,7 +13,7 @@
13 ); 13 );
14 Copyright = "Copyright (C) 2012 Free Software Foundation, Inc."; 14 Copyright = "Copyright (C) 2012 Free Software Foundation, Inc.";
15 CopyrightDescription = "Released under the GNU General Public License Version 3 or later"; 15 CopyrightDescription = "Released under the GNU General Public License Version 3 or later";
16 FullVersionID = "Emacs 24.1.50, NS Windowing"; 16 FullVersionID = "Emacs 24.2.50, NS Windowing";
17 NSExecutable = Emacs; 17 NSExecutable = Emacs;
18 NSIcon = emacs.tiff; 18 NSIcon = emacs.tiff;
19 NSPrincipalClass = NSApplication; 19 NSPrincipalClass = NSApplication;
diff --git a/nt/config.nt b/nt/config.nt
index 8c0a1ff99e0..b07c04d92e2 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -1413,7 +1413,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
1413#undef USG_SUBTTY_WORKS 1413#undef USG_SUBTTY_WORKS
1414 1414
1415/* Version number of package */ 1415/* Version number of package */
1416#define VERSION "24.1.50" 1416#define VERSION "24.2.50"
1417 1417
1418/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type 1418/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
1419 'wchar_t'. */ 1419 'wchar_t'. */
diff --git a/nt/emacs.rc b/nt/emacs.rc
index 7a6b00ef2a8..b45c57bf60b 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 24,1,50,0 10 FILEVERSION 24,2,50,0
11 PRODUCTVERSION 24,1,50,0 11 PRODUCTVERSION 24,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: The extensible self-documenting text editor\0" 27 VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0"
28 VALUE "FileVersion", "24, 1, 50, 0\0" 28 VALUE "FileVersion", "24, 2, 50, 0\0"
29 VALUE "InternalName", "Emacs\0" 29 VALUE "InternalName", "Emacs\0"
30 VALUE "LegalCopyright", "Copyright (C) 2001-2012\0" 30 VALUE "LegalCopyright", "Copyright (C) 2001-2012\0"
31 VALUE "OriginalFilename", "emacs.exe" 31 VALUE "OriginalFilename", "emacs.exe"
32 VALUE "ProductName", "Emacs\0" 32 VALUE "ProductName", "Emacs\0"
33 VALUE "ProductVersion", "24, 1, 50, 0\0" 33 VALUE "ProductVersion", "24, 2, 50, 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 d99b2fcd8fa..e79f1fa4aaa 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 24,1,50,0 8 FILEVERSION 24,2,50,0
9 PRODUCTVERSION 24,1,50,0 9 PRODUCTVERSION 24,2,50,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: Client for the extensible self-documenting text editor\0" 25 VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0"
26 VALUE "FileVersion", "24, 1, 50, 0\0" 26 VALUE "FileVersion", "24, 2, 50, 0\0"
27 VALUE "InternalName", "EmacsClient\0" 27 VALUE "InternalName", "EmacsClient\0"
28 VALUE "LegalCopyright", "Copyright (C) 2001-2012\0" 28 VALUE "LegalCopyright", "Copyright (C) 2001-2012\0"
29 VALUE "OriginalFilename", "emacsclientw.exe" 29 VALUE "OriginalFilename", "emacsclientw.exe"
30 VALUE "ProductName", "EmacsClient\0" 30 VALUE "ProductName", "EmacsClient\0"
31 VALUE "ProductVersion", "24, 1, 50, 0\0" 31 VALUE "ProductVersion", "24, 2, 50, 0\0"
32 VALUE "OLESelfRegister", "\0" 32 VALUE "OLESelfRegister", "\0"
33 END 33 END
34 END 34 END
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index fc5ecefd173..cf4af2b14cd 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -22,7 +22,7 @@
22# FIXME: This file uses DOS EOLs. Convert to Unix after 22.1 is out 22# FIXME: This file uses DOS EOLs. Convert to Unix after 22.1 is out
23# (and remove or replace this comment). 23# (and remove or replace this comment).
24 24
25VERSION = 24.1.50 25VERSION = 24.2.50
26 26
27TMP_DIST_DIR = emacs-$(VERSION) 27TMP_DIST_DIR = emacs-$(VERSION)
28 28