From: Ulrich Müller Date: Sat, 11 Apr 2015 08:37:48 +0000 (+0200) Subject: Bump Emacs version to 24.5.50. X-Git-Tag: emacs-25.0.90~1900^2 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=82e2ce9d792e6bd76cd517589d5b89144497ecf8;p=emacs.git Bump Emacs version to 24.5.50. --- diff --git a/README b/README index 51fb00015ad..191eefde61e 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ Copyright (C) 2001-2015 Free Software Foundation, Inc. See the end of the file for license conditions. -This directory tree holds version 24.5 of GNU Emacs, the extensible, +This directory tree holds version 24.5.50 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 4291453535b..faa2b6d3167 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.5) +AC_INIT(emacs, 24.5.50) 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 bdc3c03b850..1697a82fbd5 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.5 +@set EMACSVER 24.5.50 diff --git a/doc/man/emacs.1 b/doc/man/emacs.1 index 3fcec6bfbcd..f9978752a64 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.5" +.TH EMACS 1 "2007 April 13" "GNU Emacs 24.5.50" . . .SH NAME diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index f931afb48d1..20399f116ca 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.5"/ +/^#undef VERSION/s/^.*$/#define VERSION "24.5.50"/ /^#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 7827b15d2ef..c06270cff27 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.5" +#define VERSION "24.5.50" /* Define to 1 if unsetenv returns void instead of int. */ #undef VOID_UNSETENV diff --git a/nt/emacs.rc b/nt/emacs.rc index e0077864cc8..942620216cf 100644 --- a/nt/emacs.rc +++ b/nt/emacs.rc @@ -11,8 +11,8 @@ Emacs ICON icons/emacs.ico #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 24,5,0,0 - PRODUCTVERSION 24,5,0,0 + FILEVERSION 24,5,50,0 + PRODUCTVERSION 24,5,50,0 FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -29,12 +29,12 @@ BEGIN BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0" - VALUE "FileVersion", "24, 5, 0, 0\0" + VALUE "FileVersion", "24, 5, 50, 0\0" VALUE "InternalName", "Emacs\0" VALUE "LegalCopyright", "Copyright (C) 2001-2015\0" VALUE "OriginalFilename", "emacs.exe" VALUE "ProductName", "Emacs\0" - VALUE "ProductVersion", "24, 5, 0, 0\0" + VALUE "ProductVersion", "24, 5, 50, 0\0" VALUE "OLESelfRegister", "\0" END END diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc index 15bdda1db89..9df550a90bd 100644 --- a/nt/emacsclient.rc +++ b/nt/emacsclient.rc @@ -5,8 +5,8 @@ Emacs ICON icons\emacs.ico #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 24,5,0,0 - PRODUCTVERSION 24,5,0,0 + FILEVERSION 24,5,50,0 + PRODUCTVERSION 24,5,50,0 FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -23,12 +23,12 @@ BEGIN BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0" - VALUE "FileVersion", "24, 5, 0, 0\0" + VALUE "FileVersion", "24, 5, 50, 0\0" VALUE "InternalName", "EmacsClient\0" VALUE "LegalCopyright", "Copyright (C) 2001-2015\0" VALUE "OriginalFilename", "emacsclientw.exe" VALUE "ProductName", "EmacsClient\0" - VALUE "ProductVersion", "24, 5, 0, 0\0" + VALUE "ProductVersion", "24, 5, 50, 0\0" VALUE "OLESelfRegister", "\0" END END diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in index b374dc30512..f0099abde2d 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.5 +VERSION = 24.5.50 TMP_DIST_DIR = emacs-$(VERSION)