aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2012-11-02 08:48:12 +0800
committerChong Yidong2012-11-02 08:48:12 +0800
commit052f924a01f8a65ca0bfc9e6584302613e019489 (patch)
tree59f6ac18d3ad32e38ddbc3033181a3323dc6dd73
parent7e8b50d9e556b1c8b393199995ef3ea85b9f4525 (diff)
downloademacs-052f924a01f8a65ca0bfc9e6584302613e019489.tar.gz
emacs-052f924a01f8a65ca0bfc9e6584302613e019489.zip
Bump version to 24.3.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--nt/config.nt2
-rw-r--r--nt/emacs.rc8
-rw-r--r--nt/emacsclient.rc8
-rw-r--r--nt/makefile.w32-in2
9 files changed, 15 insertions, 15 deletions
diff --git a/README b/README
index 2c50c5bbb91..9153c656dbe 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.2.50 of GNU Emacs, the extensible, 5This directory tree holds version 24.3.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 4564bc3085e..b0711923e1a 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.2.50) 25AC_INIT(emacs, 24.3.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 3b54719ad77..408d6612d58 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.2.50 4@set EMACSVER 24.3.50
diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index a3d73800503..46bda023b5a 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.2.50" 2.TH EMACS 1 "2007 April 13" "GNU Emacs 24.3.50"
3. 3.
4. 4.
5.SH NAME 5.SH NAME
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index 25bc5ed12fd..916c49dd1b5 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.2.50"/ 73/^#undef VERSION/s/^.*$/#define VERSION "24.3.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/nt/config.nt b/nt/config.nt
index ed1cddf1e12..f690b126b77 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -1399,7 +1399,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
1399#undef USG_SUBTTY_WORKS 1399#undef USG_SUBTTY_WORKS
1400 1400
1401/* Version number of package */ 1401/* Version number of package */
1402#define VERSION "24.2.50" 1402#define VERSION "24.3.50"
1403 1403
1404/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type 1404/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
1405 'wchar_t'. */ 1405 'wchar_t'. */
diff --git a/nt/emacs.rc b/nt/emacs.rc
index 63ed75490f9..72aa47212ac 100644
--- a/nt/emacs.rc
+++ b/nt/emacs.rc
@@ -11,8 +11,8 @@ Emacs ICON icons\emacs.ico
11#endif 11#endif
12 12
13VS_VERSION_INFO VERSIONINFO 13VS_VERSION_INFO VERSIONINFO
14 FILEVERSION 24,2,50,0 14 FILEVERSION 24,3,50,0
15 PRODUCTVERSION 24,2,50,0 15 PRODUCTVERSION 24,3,50,0
16 FILEFLAGSMASK 0x3FL 16 FILEFLAGSMASK 0x3FL
17#ifdef EMACSDEBUG 17#ifdef EMACSDEBUG
18 FILEFLAGS 0x1L 18 FILEFLAGS 0x1L
@@ -29,12 +29,12 @@ BEGIN
29 BEGIN 29 BEGIN
30 VALUE "CompanyName", "Free Software Foundation\0" 30 VALUE "CompanyName", "Free Software Foundation\0"
31 VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0" 31 VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0"
32 VALUE "FileVersion", "24, 2, 50, 0\0" 32 VALUE "FileVersion", "24, 3, 50, 0\0"
33 VALUE "InternalName", "Emacs\0" 33 VALUE "InternalName", "Emacs\0"
34 VALUE "LegalCopyright", "Copyright (C) 2001-2012\0" 34 VALUE "LegalCopyright", "Copyright (C) 2001-2012\0"
35 VALUE "OriginalFilename", "emacs.exe" 35 VALUE "OriginalFilename", "emacs.exe"
36 VALUE "ProductName", "Emacs\0" 36 VALUE "ProductName", "Emacs\0"
37 VALUE "ProductVersion", "24, 2, 50, 0\0" 37 VALUE "ProductVersion", "24, 3, 50, 0\0"
38 VALUE "OLESelfRegister", "\0" 38 VALUE "OLESelfRegister", "\0"
39 END 39 END
40 END 40 END
diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc
index e79f1fa4aaa..59dd7b09f8a 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,2,50,0 8 FILEVERSION 24,3,50,0
9 PRODUCTVERSION 24,2,50,0 9 PRODUCTVERSION 24,3,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, 2, 50, 0\0" 26 VALUE "FileVersion", "24, 3, 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, 2, 50, 0\0" 31 VALUE "ProductVersion", "24, 3, 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 82bd829492d..7377d7e33b9 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.2.50 25VERSION = 24.3.50
26 26
27TMP_DIST_DIR = emacs-$(VERSION) 27TMP_DIST_DIR = emacs-$(VERSION)
28 28