aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2014-10-22 09:10:41 -0400
committerStefan Monnier2014-10-22 09:10:41 -0400
commitbdc9a8b5acdffe0acd6360b1cade8ff732df3e76 (patch)
tree6859cfda3a17af1278937a37d9bccc5687b05440
parent1a7aa3ce7fe32955f45ba8cfee2ccaf4a0770395 (diff)
downloademacs-bdc9a8b5acdffe0acd6360b1cade8ff732df3e76.tar.gz
emacs-bdc9a8b5acdffe0acd6360b1cade8ff732df3e76.zip
* configure.ac: Bump version to 24.4.51 to avoid ambiguity with the old
trunk's 24.4.50.
-rw-r--r--ChangeLog5
-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/makefile.w32-in2
8 files changed, 12 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index a759f5a54ff..91b09a488a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12014-10-22 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * configure.ac: Bump version to 24.4.51 to avoid ambiguity with the old
4 trunk's 24.4.50.
5
12014-10-20 Glenn Morris <rgm@gnu.org> 62014-10-20 Glenn Morris <rgm@gnu.org>
2 7
3 * Version 24.4 released. 8 * Version 24.4 released.
diff --git a/README b/README
index 9f0ff0c5daa..bc0fb249d08 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.4.50 of GNU Emacs, the extensible, 5This directory tree holds version 24.4.51 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 42bf7e8f316..1d28161b386 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.4.50) 25AC_INIT(emacs, 24.4.51)
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 6329f8aa0e6..cef51213d5e 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.4.50 4@set EMACSVER 24.4.51
diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index 45bdb64d8b0..bd2b5fd66c2 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.4.50" 2.TH EMACS 1 "2007 April 13" "GNU Emacs 24.4.51"
3. 3.
4. 4.
5.SH NAME 5.SH NAME
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index 3a2a94f2ca9..88da4fae65f 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.4.50"/ 73/^#undef VERSION/s/^.*$/#define VERSION "24.4.51"/
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 004a7381fb5..3bd6ebf39b0 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.4.50" 1579#define VERSION "24.4.51"
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/makefile.w32-in b/nt/makefile.w32-in
index 59da03434e9..d1542e74a64 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.4.50 25VERSION = 24.4.51
26 26
27TMP_DIST_DIR = emacs-$(VERSION) 27TMP_DIST_DIR = emacs-$(VERSION)
28 28