diff options
| author | Glenn Morris | 2013-03-04 19:53:34 -0800 |
|---|---|---|
| committer | Glenn Morris | 2013-03-04 19:53:34 -0800 |
| commit | d6ec4070892d283dabc346ddc079597b1dc1340e (patch) | |
| tree | 1ef4ff5ae927f395f9dfb4ffcb34d639b5aca760 | |
| parent | b3cdfd9e06a5647767fbbb6448da6f9039fbf787 (diff) | |
| download | emacs-d6ec4070892d283dabc346ddc079597b1dc1340e.tar.gz emacs-d6ec4070892d283dabc346ddc079597b1dc1340e.zip | |
Bump version to 24.3 (only a release candidate at the moment)
| -rw-r--r-- | README | 2 | ||||
| -rwxr-xr-x | autogen/configure | 20 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/emacs/emacsver.texi | 2 | ||||
| -rw-r--r-- | doc/man/emacs.1 | 2 | ||||
| -rw-r--r-- | msdos/sed2v2.inp | 2 | ||||
| -rw-r--r-- | nt/config.nt | 2 | ||||
| -rw-r--r-- | nt/emacs.rc | 8 | ||||
| -rw-r--r-- | nt/emacsclient.rc | 8 | ||||
| -rw-r--r-- | nt/makefile.w32-in | 2 |
10 files changed, 25 insertions, 25 deletions
| @@ -2,7 +2,7 @@ Copyright (C) 2001-2013 Free Software Foundation, Inc. | |||
| 2 | See the end of the file for license conditions. | 2 | See the end of the file for license conditions. |
| 3 | 3 | ||
| 4 | 4 | ||
| 5 | This directory tree holds version 24.2.93 of GNU Emacs, the extensible, | 5 | This directory tree holds version 24.3 of GNU Emacs, the extensible, |
| 6 | customizable, self-documenting real-time display editor. | 6 | customizable, self-documenting real-time display editor. |
| 7 | 7 | ||
| 8 | The file INSTALL in this directory says how to build and install GNU | 8 | 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 @@ | |||
| 1 | #! /bin/sh | 1 | #! /bin/sh |
| 2 | # Guess values for system-dependent variables and create Makefiles. | 2 | # Guess values for system-dependent variables and create Makefiles. |
| 3 | # Generated by GNU Autoconf 2.65 for emacs 24.2.93. | 3 | # Generated by GNU Autoconf 2.65 for emacs 24.3. |
| 4 | # | 4 | # |
| 5 | # | 5 | # |
| 6 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | 6 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
| @@ -549,8 +549,8 @@ MAKEFLAGS= | |||
| 549 | # Identity of this package. | 549 | # Identity of this package. |
| 550 | PACKAGE_NAME='emacs' | 550 | PACKAGE_NAME='emacs' |
| 551 | PACKAGE_TARNAME='emacs' | 551 | PACKAGE_TARNAME='emacs' |
| 552 | PACKAGE_VERSION='24.2.93' | 552 | PACKAGE_VERSION='24.3' |
| 553 | PACKAGE_STRING='emacs 24.2.93' | 553 | PACKAGE_STRING='emacs 24.3' |
| 554 | PACKAGE_BUGREPORT='' | 554 | PACKAGE_BUGREPORT='' |
| 555 | PACKAGE_URL='' | 555 | PACKAGE_URL='' |
| 556 | 556 | ||
| @@ -1940,7 +1940,7 @@ if test "$ac_init_help" = "long"; then | |||
| 1940 | # Omit some internal or obsolete options to make the list less imposing. | 1940 | # Omit some internal or obsolete options to make the list less imposing. |
| 1941 | # This message is too long to be a string in the A/UX 3.1 sh. | 1941 | # This message is too long to be a string in the A/UX 3.1 sh. |
| 1942 | cat <<_ACEOF | 1942 | cat <<_ACEOF |
| 1943 | \`configure' configures emacs 24.2.93 to adapt to many kinds of systems. | 1943 | \`configure' configures emacs 24.3 to adapt to many kinds of systems. |
| 1944 | 1944 | ||
| 1945 | Usage: $0 [OPTION]... [VAR=VALUE]... | 1945 | Usage: $0 [OPTION]... [VAR=VALUE]... |
| 1946 | 1946 | ||
| @@ -2014,7 +2014,7 @@ fi | |||
| 2014 | 2014 | ||
| 2015 | if test -n "$ac_init_help"; then | 2015 | if test -n "$ac_init_help"; then |
| 2016 | case $ac_init_help in | 2016 | case $ac_init_help in |
| 2017 | short | recursive ) echo "Configuration of emacs 24.2.93:";; | 2017 | short | recursive ) echo "Configuration of emacs 24.3:";; |
| 2018 | esac | 2018 | esac |
| 2019 | cat <<\_ACEOF | 2019 | cat <<\_ACEOF |
| 2020 | 2020 | ||
| @@ -2183,7 +2183,7 @@ fi | |||
| 2183 | test -n "$ac_init_help" && exit $ac_status | 2183 | test -n "$ac_init_help" && exit $ac_status |
| 2184 | if $ac_init_version; then | 2184 | if $ac_init_version; then |
| 2185 | cat <<\_ACEOF | 2185 | cat <<\_ACEOF |
| 2186 | emacs configure 24.2.93 | 2186 | emacs configure 24.3 |
| 2187 | generated by GNU Autoconf 2.65 | 2187 | generated by GNU Autoconf 2.65 |
| 2188 | 2188 | ||
| 2189 | Copyright (C) 2009 Free Software Foundation, Inc. | 2189 | Copyright (C) 2009 Free Software Foundation, Inc. |
| @@ -2905,7 +2905,7 @@ cat >config.log <<_ACEOF | |||
| 2905 | This file contains any messages produced by compilers while | 2905 | This file contains any messages produced by compilers while |
| 2906 | running configure, to aid debugging if configure makes a mistake. | 2906 | running configure, to aid debugging if configure makes a mistake. |
| 2907 | 2907 | ||
| 2908 | It was created by emacs $as_me 24.2.93, which was | 2908 | It was created by emacs $as_me 24.3, which was |
| 2909 | generated by GNU Autoconf 2.65. Invocation command line was | 2909 | generated by GNU Autoconf 2.65. Invocation command line was |
| 2910 | 2910 | ||
| 2911 | $ $0 $@ | 2911 | $ $0 $@ |
| @@ -3766,7 +3766,7 @@ fi | |||
| 3766 | 3766 | ||
| 3767 | # Define the identity of the package. | 3767 | # Define the identity of the package. |
| 3768 | PACKAGE='emacs' | 3768 | PACKAGE='emacs' |
| 3769 | VERSION='24.2.93' | 3769 | VERSION='24.3' |
| 3770 | 3770 | ||
| 3771 | 3771 | ||
| 3772 | cat >>confdefs.h <<_ACEOF | 3772 | cat >>confdefs.h <<_ACEOF |
| @@ -25485,7 +25485,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | |||
| 25485 | # report actual input values of CONFIG_FILES etc. instead of their | 25485 | # report actual input values of CONFIG_FILES etc. instead of their |
| 25486 | # values after options handling. | 25486 | # values after options handling. |
| 25487 | ac_log=" | 25487 | ac_log=" |
| 25488 | This file was extended by emacs $as_me 24.2.93, which was | 25488 | This file was extended by emacs $as_me 24.3, which was |
| 25489 | generated by GNU Autoconf 2.65. Invocation command line was | 25489 | generated by GNU Autoconf 2.65. Invocation command line was |
| 25490 | 25490 | ||
| 25491 | CONFIG_FILES = $CONFIG_FILES | 25491 | CONFIG_FILES = $CONFIG_FILES |
| @@ -25551,7 +25551,7 @@ _ACEOF | |||
| 25551 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | 25551 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
| 25552 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | 25552 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
| 25553 | ac_cs_version="\\ | 25553 | ac_cs_version="\\ |
| 25554 | emacs config.status 24.2.93 | 25554 | emacs config.status 24.3 |
| 25555 | configured by $0, generated by GNU Autoconf 2.65, | 25555 | configured by $0, generated by GNU Autoconf 2.65, |
| 25556 | with options \\"\$ac_cs_config\\" | 25556 | with options \\"\$ac_cs_config\\" |
| 25557 | 25557 | ||
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 | |||
| 22 | dnl along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | 22 | dnl along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
| 23 | 23 | ||
| 24 | AC_PREREQ(2.65) | 24 | AC_PREREQ(2.65) |
| 25 | AC_INIT(emacs, 24.2.93) | 25 | AC_INIT(emacs, 24.3) |
| 26 | AC_CONFIG_HEADER(src/config.h:src/config.in) | 26 | AC_CONFIG_HEADER(src/config.h:src/config.in) |
| 27 | AC_CONFIG_SRCDIR(src/lisp.h) | 27 | AC_CONFIG_SRCDIR(src/lisp.h) |
| 28 | AC_CONFIG_AUX_DIR(build-aux) | 28 | 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 @@ | |||
| 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.2.93 | 4 | @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 @@ | |||
| 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.2.93" | 2 | .TH EMACS 1 "2007 April 13" "GNU Emacs 24.3" |
| 3 | . | 3 | . |
| 4 | . | 4 | . |
| 5 | .SH NAME | 5 | .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 @@ | |||
| 71 | /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/ | 71 | /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/ |
| 72 | /^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION ""/ | 72 | /^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION ""/ |
| 73 | /^#undef PENDING_OUTPUT_COUNT/s/^.*$/#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base)/ | 73 | /^#undef PENDING_OUTPUT_COUNT/s/^.*$/#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base)/ |
| 74 | /^#undef VERSION/s/^.*$/#define VERSION "24.2.93"/ | 74 | /^#undef VERSION/s/^.*$/#define VERSION "24.3"/ |
| 75 | /^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/ | 75 | /^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/ |
| 76 | /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/ | 76 | /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/ |
| 77 | /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/ | 77 | /^#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 <http://www.gnu.org/licenses/>. */ | |||
| 1399 | #undef USG_SUBTTY_WORKS | 1399 | #undef USG_SUBTTY_WORKS |
| 1400 | 1400 | ||
| 1401 | /* Version number of package */ | 1401 | /* Version number of package */ |
| 1402 | #define VERSION "24.2.93" | 1402 | #define VERSION "24.3" |
| 1403 | 1403 | ||
| 1404 | /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type | 1404 | /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type |
| 1405 | 'wchar_t'. */ | 1405 | '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 | |||
| 11 | #endif | 11 | #endif |
| 12 | 12 | ||
| 13 | VS_VERSION_INFO VERSIONINFO | 13 | VS_VERSION_INFO VERSIONINFO |
| 14 | FILEVERSION 24,2,93,0 | 14 | FILEVERSION 24,3,0,0 |
| 15 | PRODUCTVERSION 24,2,93,0 | 15 | PRODUCTVERSION 24,3,0,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, 2, 93, 0\0" | 32 | VALUE "FileVersion", "24, 3, 0, 0\0" |
| 33 | VALUE "InternalName", "Emacs\0" | 33 | VALUE "InternalName", "Emacs\0" |
| 34 | VALUE "LegalCopyright", "Copyright (C) 2001-2013\0" | 34 | VALUE "LegalCopyright", "Copyright (C) 2001-2013\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, 2, 93, 0\0" | 37 | VALUE "ProductVersion", "24, 3, 0, 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 f31b1314b75..ab565b2519c 100644 --- a/nt/emacsclient.rc +++ b/nt/emacsclient.rc | |||
| @@ -5,8 +5,8 @@ Emacs ICON icons\emacs.ico | |||
| 5 | #endif | 5 | #endif |
| 6 | 6 | ||
| 7 | VS_VERSION_INFO VERSIONINFO | 7 | VS_VERSION_INFO VERSIONINFO |
| 8 | FILEVERSION 24,2,93,0 | 8 | FILEVERSION 24,3,0,0 |
| 9 | PRODUCTVERSION 24,2,93,0 | 9 | PRODUCTVERSION 24,3,0,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, 2, 93, 0\0" | 26 | VALUE "FileVersion", "24, 3, 0, 0\0" |
| 27 | VALUE "InternalName", "EmacsClient\0" | 27 | VALUE "InternalName", "EmacsClient\0" |
| 28 | VALUE "LegalCopyright", "Copyright (C) 2001-2013\0" | 28 | VALUE "LegalCopyright", "Copyright (C) 2001-2013\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, 2, 93, 0\0" | 31 | VALUE "ProductVersion", "24, 3, 0, 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 4a3dc09074e..d4f4a3c7410 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 | ||
| 25 | VERSION = 24.2.93 | 25 | VERSION = 24.3 |
| 26 | 26 | ||
| 27 | TMP_DIST_DIR = emacs-$(VERSION) | 27 | TMP_DIST_DIR = emacs-$(VERSION) |
| 28 | 28 | ||