diff options
| author | Eli Zaretskii | 2014-09-29 22:49:44 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-09-29 22:49:44 +0300 |
| commit | 2b3d968a02be2b8859cc2078904a184337654898 (patch) | |
| tree | 48e6c0e6b169d252dd0d1ba67e0da2643ef8b12a | |
| parent | cbdc06f3be1fb1921454d15d5d9f48bef85cba9e (diff) | |
| download | emacs-2b3d968a02be2b8859cc2078904a184337654898.tar.gz emacs-2b3d968a02be2b8859cc2078904a184337654898.zip | |
Follow-up to renaming v24.5 to 25.1.
README: Bump version to 25.0.50.
configure.ac (AC_INIT): Bump version to 25.0.50.
nt/makefile.w32-in (VERSION): Bump version to 25.0.50.
nt/emacsclient.rc: Bump version to 25.0.50.
nt/emacs.rc: Bump version to 25.0.50.
nt/config.nt (VERSION): Bump version to 25.0.50.
msdos/sed2v2.inp: Bump version to 25.0.50.
etc/refcards/ru-refcard.tex: Bump version to 25.0.50.
etc/refcards/emacsver.tex: Bump version to 25.0.50.
src/msdos.c (internal_terminal_init): Bump version to 25.
doc/man/emacs.1: Bump version to 25.0.50.
doc/emacs/emacsver.texi (EMACSVER): Bump to 20.0.50.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/emacs/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/emacs/emacsver.texi | 2 | ||||
| -rw-r--r-- | doc/man/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/man/emacs.1 | 2 | ||||
| -rw-r--r-- | etc/ChangeLog | 6 | ||||
| -rw-r--r-- | etc/refcards/emacsver.tex | 2 | ||||
| -rw-r--r-- | etc/refcards/ru-refcard.tex | 2 | ||||
| -rw-r--r-- | msdos/ChangeLog | 4 | ||||
| -rw-r--r-- | msdos/sed2v2.inp | 2 | ||||
| -rw-r--r-- | nt/ChangeLog | 10 | ||||
| -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 | ||||
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/msdos.c | 2 |
19 files changed, 56 insertions, 18 deletions
| @@ -1,3 +1,9 @@ | |||
| 1 | 2014-09-29 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * README: Bump version to 25.0.50. | ||
| 4 | |||
| 5 | * configure.ac (AC_INIT): Bump version to 25.0.50. | ||
| 6 | |||
| 1 | 2014-09-29 Dmitry Antipov <dmantipov@yandex.ru> | 7 | 2014-09-29 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 8 | ||
| 3 | * configure.ac (HAVE_STATEMENT_EXPRESSIONS): Remove. | 9 | * configure.ac (HAVE_STATEMENT_EXPRESSIONS): Remove. |
| @@ -2,7 +2,7 @@ Copyright (C) 2001-2014 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.4.50 of GNU Emacs, the extensible, | 5 | This directory tree holds version 25.0.50 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/configure.ac b/configure.ac index ba23a617260..7e59493bcf0 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -23,7 +23,7 @@ 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 | dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el. | 25 | dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el. |
| 26 | AC_INIT(GNU Emacs, 24.4.50, bug-gnu-emacs@gnu.org) | 26 | AC_INIT(GNU Emacs, 25.0.50, bug-gnu-emacs@gnu.org) |
| 27 | 27 | ||
| 28 | dnl Set emacs_config_options to the options of 'configure', quoted for the shell, | 28 | dnl Set emacs_config_options to the options of 'configure', quoted for the shell, |
| 29 | dnl and then quoted again for a C string. Separate options with spaces. | 29 | dnl and then quoted again for a C string. Separate options with spaces. |
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 19dc4874967..44e8e5871fa 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-09-29 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * emacsver.texi (EMACSVER): Bump to 20.0.50. | ||
| 4 | |||
| 1 | 2014-09-15 Daniel Colascione <dancol@dancol.org> | 5 | 2014-09-15 Daniel Colascione <dancol@dancol.org> |
| 2 | 6 | ||
| 3 | * regs.texi (Text Registers): Update end-user documentation | 7 | * regs.texi (Text Registers): Update end-user documentation |
diff --git a/doc/emacs/emacsver.texi b/doc/emacs/emacsver.texi index 6329f8aa0e6..ac01c185bc1 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 25.0.50 |
diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog index 34ecda837ef..8723d9a9d6d 100644 --- a/doc/man/ChangeLog +++ b/doc/man/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-09-29 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * emacs.1: Bump version to 25.0.50. | ||
| 4 | |||
| 1 | 2014-01-12 Glenn Morris <rgm@gnu.org> | 5 | 2014-01-12 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * emacs.1: Replace reference to etc/MAILINGLISTS. | 7 | * emacs.1: Replace reference to etc/MAILINGLISTS. |
diff --git a/doc/man/emacs.1 b/doc/man/emacs.1 index 45bdb64d8b0..6ad6ee1030b 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 25.0.50" |
| 3 | . | 3 | . |
| 4 | . | 4 | . |
| 5 | .SH NAME | 5 | .SH NAME |
diff --git a/etc/ChangeLog b/etc/ChangeLog index a57605be64d..d87964b6bd2 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2014-09-29 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * refcards/ru-refcard.tex: Bump version to 25.0.50. | ||
| 4 | |||
| 5 | * refcards/emacsver.tex: Bump version to 25.0.50. | ||
| 6 | |||
| 1 | 2014-09-14 Daniel Colascione <dancol@dancol.org> | 7 | 2014-09-14 Daniel Colascione <dancol@dancol.org> |
| 2 | 8 | ||
| 3 | * NEWS: Mention changes to `insert-register' | 9 | * NEWS: Mention changes to `insert-register' |
diff --git a/etc/refcards/emacsver.tex b/etc/refcards/emacsver.tex index b2df1970ca3..7e5ff6488dc 100644 --- a/etc/refcards/emacsver.tex +++ b/etc/refcards/emacsver.tex | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | %% This file is not generated by configure, because then the provided | 1 | %% This file is not generated by configure, because then the provided |
| 2 | %% pdf files would always appear out-of-date. | 2 | %% pdf files would always appear out-of-date. |
| 3 | \def\versionemacs{24} % major version of emacs | 3 | \def\versionemacs{25} % major version of emacs |
| 4 | \def\year{2014} % latest copyright year | 4 | \def\year{2014} % latest copyright year |
diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex index 39a789d1d59..0458ccba41f 100644 --- a/etc/refcards/ru-refcard.tex +++ b/etc/refcards/ru-refcard.tex | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | \newlength{\ColThreeWidth} | 21 | \newlength{\ColThreeWidth} |
| 22 | \setlength{\ColThreeWidth}{25mm} | 22 | \setlength{\ColThreeWidth}{25mm} |
| 23 | 23 | ||
| 24 | \newcommand{\versionemacs}[0]{24} % version of Emacs this is for | 24 | \newcommand{\versionemacs}[0]{25} % version of Emacs this is for |
| 25 | \newcommand{\cyear}[0]{2014} % copyright year | 25 | \newcommand{\cyear}[0]{2014} % copyright year |
| 26 | 26 | ||
| 27 | \newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill | 27 | \newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill |
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index da0d7098d1a..6fa40a14595 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-09-29 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * sed2v2.inp: Bump version to 25.0.50. | ||
| 4 | |||
| 1 | 2014-08-28 Eli Zaretskii <eliz@gnu.org> | 5 | 2014-08-28 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * sedlibmk.inp (gl_LIBOBJS): Add execinfo.o. Reported by Juan | 7 | * sedlibmk.inp (gl_LIBOBJS): Add execinfo.o. Reported by Juan |
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index 976b74f1d4a..658a384a46b 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp | |||
| @@ -66,7 +66,7 @@ | |||
| 66 | /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/ | 66 | /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/ |
| 67 | /^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION ""/ | 67 | /^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION ""/ |
| 68 | /^#undef PENDING_OUTPUT_COUNT/s/^.*$/#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base)/ | 68 | /^#undef PENDING_OUTPUT_COUNT/s/^.*$/#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_ptr - (FILE)->_base)/ |
| 69 | /^#undef VERSION/s/^.*$/#define VERSION "24.4.50"/ | 69 | /^#undef VERSION/s/^.*$/#define VERSION "25.0.50"/ |
| 70 | /^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/ | 70 | /^#undef SYSTEM_TYPE/s/^.*$/#define SYSTEM_TYPE "ms-dos"/ |
| 71 | /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/ | 71 | /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/ |
| 72 | /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/ | 72 | /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/ |
diff --git a/nt/ChangeLog b/nt/ChangeLog index 4317a173a6a..abd62d35a96 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -1,3 +1,13 @@ | |||
| 1 | 2014-09-29 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * makefile.w32-in (VERSION): Bump version to 25.0.50. | ||
| 4 | |||
| 5 | * emacsclient.rc: Bump version to 25.0.50. | ||
| 6 | |||
| 7 | * emacs.rc: Bump version to 25.0.50. | ||
| 8 | |||
| 9 | * config.nt (VERSION): Bump version to 25.0.50. | ||
| 10 | |||
| 1 | 2014-09-01 Eli Zaretskii <eliz@gnu.org> | 11 | 2014-09-01 Eli Zaretskii <eliz@gnu.org> |
| 2 | 12 | ||
| 3 | * gnulib.mk: Synchronize with lib/gnulib.mk. | 13 | * gnulib.mk: Synchronize with lib/gnulib.mk. |
diff --git a/nt/config.nt b/nt/config.nt index 004a7381fb5..8040ecc373e 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 "25.0.50" |
| 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/emacs.rc b/nt/emacs.rc index 2d007ba9043..15455d982a7 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,4,50,0 | 14 | FILEVERSION 25,0,50,0 |
| 15 | PRODUCTVERSION 24,4,50,0 | 15 | PRODUCTVERSION 25,0,50,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, 4, 50, 0\0" | 32 | VALUE "FileVersion", "25, 0, 50, 0\0" |
| 33 | VALUE "InternalName", "Emacs\0" | 33 | VALUE "InternalName", "Emacs\0" |
| 34 | VALUE "LegalCopyright", "Copyright (C) 2001-2014\0" | 34 | VALUE "LegalCopyright", "Copyright (C) 2001-2014\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, 4, 50, 0\0" | 37 | VALUE "ProductVersion", "25, 0, 50, 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 7e5d2e4c0f1..9318492a342 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,4,50,0 | 8 | FILEVERSION 25,0,50,0 |
| 9 | PRODUCTVERSION 24,4,50,0 | 9 | PRODUCTVERSION 25,0,50,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, 4, 50, 0\0" | 26 | VALUE "FileVersion", "25, 0, 50, 0\0" |
| 27 | VALUE "InternalName", "EmacsClient\0" | 27 | VALUE "InternalName", "EmacsClient\0" |
| 28 | VALUE "LegalCopyright", "Copyright (C) 2001-2014\0" | 28 | VALUE "LegalCopyright", "Copyright (C) 2001-2014\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, 4, 50, 0\0" | 31 | VALUE "ProductVersion", "25, 0, 50, 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 59da03434e9..0770ad986f6 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.4.50 | 25 | VERSION = 25.0.50 |
| 26 | 26 | ||
| 27 | TMP_DIST_DIR = emacs-$(VERSION) | 27 | TMP_DIST_DIR = emacs-$(VERSION) |
| 28 | 28 | ||
diff --git a/src/ChangeLog b/src/ChangeLog index 698eab54b8f..d2d629f31b4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-09-29 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * msdos.c (internal_terminal_init): Bump version to 25. | ||
| 4 | |||
| 1 | 2014-09-29 Dmitry Antipov <dmantipov@yandex.ru> | 5 | 2014-09-29 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 6 | ||
| 3 | Keep stack-allocated Lisp objects fast rather than versatile. | 7 | Keep stack-allocated Lisp objects fast rather than versatile. |
diff --git a/src/msdos.c b/src/msdos.c index dae86b5a3b2..14c2624114d 100644 --- a/src/msdos.c +++ b/src/msdos.c | |||
| @@ -1792,7 +1792,7 @@ internal_terminal_init (void) | |||
| 1792 | } | 1792 | } |
| 1793 | 1793 | ||
| 1794 | Vinitial_window_system = Qpc; | 1794 | Vinitial_window_system = Qpc; |
| 1795 | Vwindow_system_version = make_number (24); /* RE Emacs version */ | 1795 | Vwindow_system_version = make_number (25); /* RE Emacs version */ |
| 1796 | tty->terminal->type = output_msdos_raw; | 1796 | tty->terminal->type = output_msdos_raw; |
| 1797 | 1797 | ||
| 1798 | /* If Emacs was dumped on DOS/V machine, forget the stale VRAM | 1798 | /* If Emacs was dumped on DOS/V machine, forget the stale VRAM |