diff --git a/ChangeLog b/ChangeLog index 7ce90048509..e26a81f0c40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-09-29 Eli Zaretskii + + * README: Bump version to 25.0.50. + + * configure.ac (AC_INIT): Bump version to 25.0.50. + 2014-09-29 Dmitry Antipov * configure.ac (HAVE_STATEMENT_EXPRESSIONS): Remove. diff --git a/README b/README index daf7b0dbfda..6c83c75bee3 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 25.0.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 ba23a617260..7e59493bcf0 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ dnl along with GNU Emacs. If not, see . AC_PREREQ(2.65) dnl Note this is parsed by (at least) make-dist and lisp/cedet/ede/emacs.el. -AC_INIT(GNU Emacs, 24.4.50, bug-gnu-emacs@gnu.org) +AC_INIT(GNU Emacs, 25.0.50, bug-gnu-emacs@gnu.org) dnl Set emacs_config_options to the options of 'configure', quoted for the shell, 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 @@ +2014-09-29 Eli Zaretskii + + * emacsver.texi (EMACSVER): Bump to 20.0.50. + 2014-09-15 Daniel Colascione * 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 @@ @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 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 @@ +2014-09-29 Eli Zaretskii + + * emacs.1: Bump version to 25.0.50. + 2014-01-12 Glenn Morris * 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 @@ .\" 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 25.0.50" . . .SH NAME diff --git a/etc/ChangeLog b/etc/ChangeLog index a57605be64d..d87964b6bd2 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,9 @@ +2014-09-29 Eli Zaretskii + + * refcards/ru-refcard.tex: Bump version to 25.0.50. + + * refcards/emacsver.tex: Bump version to 25.0.50. + 2014-09-14 Daniel Colascione * 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 @@ %% This file is not generated by configure, because then the provided %% pdf files would always appear out-of-date. -\def\versionemacs{24} % major version of emacs +\def\versionemacs{25} % major version of emacs \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 @@ \newlength{\ColThreeWidth} \setlength{\ColThreeWidth}{25mm} -\newcommand{\versionemacs}[0]{24} % version of Emacs this is for +\newcommand{\versionemacs}[0]{25} % version of Emacs this is for \newcommand{\cyear}[0]{2014} % copyright year \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 @@ +2014-09-29 Eli Zaretskii + + * sed2v2.inp: Bump version to 25.0.50. + 2014-08-28 Eli Zaretskii * 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 @@ /^#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 "25.0.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/ChangeLog b/nt/ChangeLog index 4317a173a6a..abd62d35a96 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,13 @@ +2014-09-29 Eli Zaretskii + + * makefile.w32-in (VERSION): Bump version to 25.0.50. + + * emacsclient.rc: Bump version to 25.0.50. + + * emacs.rc: Bump version to 25.0.50. + + * config.nt (VERSION): Bump version to 25.0.50. + 2014-09-01 Eli Zaretskii * 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 . */ #undef USG_SUBTTY_WORKS /* Version number of package */ -#define VERSION "24.4.50" +#define VERSION "25.0.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 2d007ba9043..15455d982a7 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,4,50,0 - PRODUCTVERSION 24,4,50,0 + FILEVERSION 25,0,50,0 + PRODUCTVERSION 25,0,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, 4, 50, 0\0" + VALUE "FileVersion", "25, 0, 50, 0\0" VALUE "InternalName", "Emacs\0" VALUE "LegalCopyright", "Copyright (C) 2001-2014\0" VALUE "OriginalFilename", "emacs.exe" VALUE "ProductName", "Emacs\0" - VALUE "ProductVersion", "24, 4, 50, 0\0" + VALUE "ProductVersion", "25, 0, 50, 0\0" VALUE "OLESelfRegister", "\0" END 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 #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 24,4,50,0 - PRODUCTVERSION 24,4,50,0 + FILEVERSION 25,0,50,0 + PRODUCTVERSION 25,0,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, 4, 50, 0\0" + VALUE "FileVersion", "25, 0, 50, 0\0" VALUE "InternalName", "EmacsClient\0" VALUE "LegalCopyright", "Copyright (C) 2001-2014\0" VALUE "OriginalFilename", "emacsclientw.exe" VALUE "ProductName", "EmacsClient\0" - VALUE "ProductVersion", "24, 4, 50, 0\0" + VALUE "ProductVersion", "25, 0, 50, 0\0" VALUE "OLESelfRegister", "\0" END 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 @@ # 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 = 25.0.50 TMP_DIST_DIR = emacs-$(VERSION) diff --git a/src/ChangeLog b/src/ChangeLog index 698eab54b8f..d2d629f31b4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2014-09-29 Eli Zaretskii + + * msdos.c (internal_terminal_init): Bump version to 25. + 2014-09-29 Dmitry Antipov 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) } Vinitial_window_system = Qpc; - Vwindow_system_version = make_number (24); /* RE Emacs version */ + Vwindow_system_version = make_number (25); /* RE Emacs version */ tty->terminal->type = output_msdos_raw; /* If Emacs was dumped on DOS/V machine, forget the stale VRAM