From: Stefan Monnier Date: Wed, 22 Oct 2014 13:10:41 +0000 (-0400) Subject: * configure.ac: Bump version to 24.4.51 to avoid ambiguity with the old X-Git-Tag: emacs-24.4.90~321 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bdc9a8b5acdffe0acd6360b1cade8ff732df3e76;p=emacs.git * configure.ac: Bump version to 24.4.51 to avoid ambiguity with the old trunk's 24.4.50. --- diff --git a/ChangeLog b/ChangeLog index a759f5a54ff..91b09a488a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-10-22 Stefan Monnier + + * configure.ac: Bump version to 24.4.51 to avoid ambiguity with the old + trunk's 24.4.50. + 2014-10-20 Glenn Morris * 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. See the end of the file for license conditions. -This directory tree holds version 24.4.50 of GNU Emacs, the extensible, +This directory tree holds version 24.4.51 of GNU Emacs, the extensible, customizable, self-documenting real-time display editor. The 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 dnl along with GNU Emacs. If not, see . AC_PREREQ(2.65) -AC_INIT(emacs, 24.4.50) +AC_INIT(emacs, 24.4.51) dnl We get MINGW64 with MSYS2 if 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 @@ @c It would be nicer to generate this using configure and @version@. @c However, that would mean emacsver.texi would always be newer @c then the info files in release tarfiles. -@set EMACSVER 24.4.50 +@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 @@ .\" See section COPYING for copyright and redistribution information. -.TH EMACS 1 "2007 April 13" "GNU Emacs 24.4.50" +.TH EMACS 1 "2007 April 13" "GNU Emacs 24.4.51" . . .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 @@ /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/ /^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION ""/ /^#undef PENDING_OUTPUT_COUNT/s/^.*$/#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base)/ -/^#undef VERSION/s/^.*$/#define VERSION "24.4.50"/ +/^#undef VERSION/s/^.*$/#define VERSION "24.4.51"/ /^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/ /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/ /^#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 . */ #undef USG_SUBTTY_WORKS /* Version number of package */ -#define VERSION "24.4.50" +#define VERSION "24.4.51" /* Define to 1 if unsetenv returns void instead of int. */ #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 @@ # FIXME: This file uses DOS EOLs. Convert to Unix after 22.1 is out # (and remove or replace this comment). -VERSION = 24.4.50 +VERSION = 24.4.51 TMP_DIST_DIR = emacs-$(VERSION)