From d6ec4070892d283dabc346ddc079597b1dc1340e Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 4 Mar 2013 19:53:34 -0800 Subject: [PATCH] Bump version to 24.3 (only a release candidate at the moment) --- README | 2 +- autogen/configure | 20 ++++++++++---------- configure.ac | 2 +- doc/emacs/emacsver.texi | 2 +- doc/man/emacs.1 | 2 +- msdos/sed2v2.inp | 2 +- nt/config.nt | 2 +- nt/emacs.rc | 8 ++++---- nt/emacsclient.rc | 8 ++++---- nt/makefile.w32-in | 2 +- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/README b/README index cfd9a220944..fb5b65bff58 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ Copyright (C) 2001-2013 Free Software Foundation, Inc. See the end of the file for license conditions. -This directory tree holds version 24.2.93 of GNU Emacs, the extensible, +This directory tree holds version 24.3 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/autogen/configure b/autogen/configure index 471ac175b0e..f6386c9da51 100755 --- a/autogen/configure +++ b/autogen/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for emacs 24.2.93. +# Generated by GNU Autoconf 2.65 for emacs 24.3. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -549,8 +549,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='emacs' PACKAGE_TARNAME='emacs' -PACKAGE_VERSION='24.2.93' -PACKAGE_STRING='emacs 24.2.93' +PACKAGE_VERSION='24.3' +PACKAGE_STRING='emacs 24.3' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1940,7 +1940,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures emacs 24.2.93 to adapt to many kinds of systems. +\`configure' configures emacs 24.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2014,7 +2014,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of emacs 24.2.93:";; + short | recursive ) echo "Configuration of emacs 24.3:";; esac cat <<\_ACEOF @@ -2183,7 +2183,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -emacs configure 24.2.93 +emacs configure 24.3 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2905,7 +2905,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by emacs $as_me 24.2.93, which was +It was created by emacs $as_me 24.3, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -3766,7 +3766,7 @@ fi # Define the identity of the package. PACKAGE='emacs' - VERSION='24.2.93' + VERSION='24.3' cat >>confdefs.h <<_ACEOF @@ -25485,7 +25485,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by emacs $as_me 24.2.93, which was +This file was extended by emacs $as_me 24.3, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25551,7 +25551,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -emacs config.status 24.2.93 +emacs config.status 24.3 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 7f6defa7059..ef65e7eaee6 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.2.93) +AC_INIT(emacs, 24.3) AC_CONFIG_HEADER(src/config.h:src/config.in) AC_CONFIG_SRCDIR(src/lisp.h) AC_CONFIG_AUX_DIR(build-aux) diff --git a/doc/emacs/emacsver.texi b/doc/emacs/emacsver.texi index 310caade050..ec0b4940059 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.2.93 +@set EMACSVER 24.3 diff --git a/doc/man/emacs.1 b/doc/man/emacs.1 index 6db2bfe2d1c..4f7f8d28ada 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.2.93" +.TH EMACS 1 "2007 April 13" "GNU Emacs 24.3" . . .SH NAME diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index 1237fd16aaa..b760d1d6396 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp @@ -71,7 +71,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.2.93"/ +/^#undef VERSION/s/^.*$/#define VERSION "24.3"/ /^#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 c1125466926..14c862444c8 100644 --- a/nt/config.nt +++ b/nt/config.nt @@ -1399,7 +1399,7 @@ along with GNU Emacs. If not, see . */ #undef USG_SUBTTY_WORKS /* Version number of package */ -#define VERSION "24.2.93" +#define VERSION "24.3" /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type 'wchar_t'. */ diff --git a/nt/emacs.rc b/nt/emacs.rc index 76d8530915e..141e62c6133 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,2,93,0 - PRODUCTVERSION 24,2,93,0 + FILEVERSION 24,3,0,0 + PRODUCTVERSION 24,3,0,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, 2, 93, 0\0" + VALUE "FileVersion", "24, 3, 0, 0\0" VALUE "InternalName", "Emacs\0" VALUE "LegalCopyright", "Copyright (C) 2001-2013\0" VALUE "OriginalFilename", "emacs.exe" VALUE "ProductName", "Emacs\0" - VALUE "ProductVersion", "24, 2, 93, 0\0" + VALUE "ProductVersion", "24, 3, 0, 0\0" VALUE "OLESelfRegister", "\0" END END diff --git a/nt/emacsclient.rc b/nt/emacsclient.rc index f31b1314b75..ab565b2519c 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,2,93,0 - PRODUCTVERSION 24,2,93,0 + FILEVERSION 24,3,0,0 + PRODUCTVERSION 24,3,0,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, 2, 93, 0\0" + VALUE "FileVersion", "24, 3, 0, 0\0" VALUE "InternalName", "EmacsClient\0" VALUE "LegalCopyright", "Copyright (C) 2001-2013\0" VALUE "OriginalFilename", "emacsclientw.exe" VALUE "ProductName", "EmacsClient\0" - VALUE "ProductVersion", "24, 2, 93, 0\0" + VALUE "ProductVersion", "24, 3, 0, 0\0" VALUE "OLESelfRegister", "\0" END END diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in index 4a3dc09074e..d4f4a3c7410 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.2.93 +VERSION = 24.3 TMP_DIST_DIR = emacs-$(VERSION) -- 2.11.4.GIT