aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-08-14 15:56:31 -0400
committerGlenn Morris2014-08-14 15:56:31 -0400
commit64a6f1f30ee1ce0de37ad1010b49ea84dca16853 (patch)
tree31186db90c1bc9f153b323515071b12cf3ecef52
parente131e4ffae3b2b31906c9b73ed5e7a621ccfa7c9 (diff)
downloademacs-64a6f1f30ee1ce0de37ad1010b49ea84dca16853.tar.gz
emacs-64a6f1f30ee1ce0de37ad1010b49ea84dca16853.zip
Bump version number to 24.3.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 2a166ef728a..eb30108ce6c 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ Copyright (C) 2001-2014 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.3.92 of GNU Emacs, the extensible, 5This directory tree holds version 24.3.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 04925d59d22..048728a0c61 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.3.92) 25AC_INIT(emacs, 24.3.93)
26 26
27dnl We get MINGW64 with MSYS2 27dnl We get MINGW64 with MSYS2
28if test "x$MSYSTEM" = "xMINGW32" -o "x$MSYSTEM" = "xMINGW64" 28if test "x$MSYSTEM" = "xMINGW32" -o "x$MSYSTEM" = "xMINGW64"
diff --git a/doc/emacs/emacsver.texi b/doc/emacs/emacsver.texi
index 700cb266ffa..557722b547c 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.3.92 4@set EMACSVER 24.3.93
diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index 30fe5bfd3e9..52a2b34faad 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.3.92" 2.TH EMACS 1 "2007 April 13" "GNU Emacs 24.3.93"
3. 3.
4. 4.
5.SH NAME 5.SH NAME
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index 0ba3ead17a7..d5211fdfdbf 100644
--- a/msdos/sed2v2.inp
+++ b/msdos/sed2v2.inp
@@ -70,7 +70,7 @@
70/^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/ 70/^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/
71/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION ""/ 71/^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION ""/
72/^#undef PENDING_OUTPUT_COUNT/s/^.*$/#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base)/ 72/^#undef PENDING_OUTPUT_COUNT/s/^.*$/#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base)/
73/^#undef VERSION/s/^.*$/#define VERSION "24.3.92"/ 73/^#undef VERSION/s/^.*$/#define VERSION "24.3.93"/
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 a04ee7c306a..b50c8b3cb17 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -1576,7 +1576,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
1576#undef USG_SUBTTY_WORKS 1576#undef USG_SUBTTY_WORKS
1577 1577
1578/* Version number of package */ 1578/* Version number of package */
1579#define VERSION "24.3.92" 1579#define VERSION "24.3.93"
1580 1580
1581/* Define to 1 if unsetenv returns void instead of int. */ 1581/* Define to 1 if unsetenv returns void instead of int. */
1582#undef VOID_UNSETENV 1582#undef VOID_UNSETENV
diff --git a/nt/emacs.rc b/nt/emacs.rc
index 96bc59ad8e4..0952845e6a0 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,3,92,0 14 FILEVERSION 24,3,93,0
15 PRODUCTVERSION 24,3,92,0 15 PRODUCTVERSION 24,3,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, 3, 92, 0\0" 32 VALUE "FileVersion", "24, 3, 93, 0\0"
33 VALUE "InternalName", "Emacs\0" 33 VALUE "InternalName", "Emacs\0"
34 VALUE "LegalCopyright", "Copyright (C) 2001-2014\0" 34 VALUE "LegalCopyright", "Copyright (C) 2001-2014\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, 3, 92, 0\0" 37 VALUE "ProductVersion", "24, 3, 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 d7c56e1f2a5..c51b0309670 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,3,92,0 8 FILEVERSION 24,3,93,0
9 PRODUCTVERSION 24,3,92,0 9 PRODUCTVERSION 24,3,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, 3, 92, 0\0" 26 VALUE "FileVersion", "24, 3, 93, 0\0"
27 VALUE "InternalName", "EmacsClient\0" 27 VALUE "InternalName", "EmacsClient\0"
28 VALUE "LegalCopyright", "Copyright (C) 2001-2014\0" 28 VALUE "LegalCopyright", "Copyright (C) 2001-2014\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, 3, 92, 0\0" 31 VALUE "ProductVersion", "24, 3, 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 fba62a4f1c9..d5c68a45b64 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.3.92 25VERSION = 24.3.93
26 26
27TMP_DIST_DIR = emacs-$(VERSION) 27TMP_DIST_DIR = emacs-$(VERSION)
28 28