aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-02-06 22:15:20 -0800
committerGlenn Morris2013-02-06 22:15:20 -0800
commit4e0b84797f9b80b883e09065d49654f68f72e4b5 (patch)
tree6e4af938b43a32290012545d6447fc030897304c
parent17d14f7e299c440ba171626ae52b2f11d85c68f1 (diff)
downloademacs-4e0b84797f9b80b883e09065d49654f68f72e4b5.tar.gz
emacs-4e0b84797f9b80b883e09065d49654f68f72e4b5.zip
Bump version number to 24.2.93
-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 5366b2d014d..cfd9a220944 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ Copyright (C) 2001-2013 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.92 of GNU Emacs, the extensible, 5This directory tree holds version 24.2.93 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 f03d7781671..c163ecee3fe 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.92) 25AC_INIT(emacs, 24.2.93)
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 c896ee07c75..310caade050 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.92 4@set EMACSVER 24.2.93
diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index a81f6a1ce41..6db2bfe2d1c 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.92" 2.TH EMACS 1 "2007 April 13" "GNU Emacs 24.2.93"
3. 3.
4. 4.
5.SH NAME 5.SH NAME
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index 1dd35cc021a..1237fd16aaa 100644
--- a/msdos/sed2v2.inp
+++ b/msdos/sed2v2.inp
@@ -71,7 +71,7 @@
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 PENDING_OUTPUT_COUNT/s/^.*$/#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base)/ 73/^#undef PENDING_OUTPUT_COUNT/s/^.*$/#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base)/
74/^#undef VERSION/s/^.*$/#define VERSION "24.2.92"/ 74/^#undef VERSION/s/^.*$/#define VERSION "24.2.93"/
75/^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/ 75/^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/
76/^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/ 76/^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/
77/^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/ 77/^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/
diff --git a/nt/config.nt b/nt/config.nt
index 9aac142bc62..c1125466926 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.92" 1402#define VERSION "24.2.93"
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 cdbb7937770..76d8530915e 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,92,0 14 FILEVERSION 24,2,93,0
15 PRODUCTVERSION 24,2,92,0 15 PRODUCTVERSION 24,2,93,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, 92, 0\0" 32 VALUE "FileVersion", "24, 2, 93, 0\0"
33 VALUE "InternalName", "Emacs\0" 33 VALUE "InternalName", "Emacs\0"
34 VALUE "LegalCopyright", "Copyright (C) 2001-2013\0" 34 VALUE "LegalCopyright", "Copyright (C) 2001-2013\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, 92, 0\0" 37 VALUE "ProductVersion", "24, 2, 93, 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 a23d56a12c2..f31b1314b75 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,92,0 8 FILEVERSION 24,2,93,0
9 PRODUCTVERSION 24,2,92,0 9 PRODUCTVERSION 24,2,93,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, 92, 0\0" 26 VALUE "FileVersion", "24, 2, 93, 0\0"
27 VALUE "InternalName", "EmacsClient\0" 27 VALUE "InternalName", "EmacsClient\0"
28 VALUE "LegalCopyright", "Copyright (C) 2001-2013\0" 28 VALUE "LegalCopyright", "Copyright (C) 2001-2013\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, 92, 0\0" 31 VALUE "ProductVersion", "24, 2, 93, 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 6483090b583..4a3dc09074e 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.92 25VERSION = 24.2.93
26 26
27TMP_DIST_DIR = emacs-$(VERSION) 27TMP_DIST_DIR = emacs-$(VERSION)
28 28