mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-24 07:20:37 +00:00
Code Issues Releases Activity

Follow-up to renaming v24.5 to 25.1.

Browse Source 
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.
This commit is contained in:
Eli Zaretskii 2014-09-29 22:49:44 +03:00
parent cbdc06f3be
commit 2b3d968a02
19 changed files with 56 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2014-09-29 Eli Zaretskii <eliz@gnu.org>
* README: Bump version to 25.0.50.
* configure.ac (AC_INIT): Bump version to 25.0.50.
2014-09-29 Dmitry Antipov <dmantipov@yandex.ru>
* configure.ac (HAVE_STATEMENT_EXPRESSIONS): Remove.

2
README
View File

@ -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

2
configure.ac
View File

@ -23,7 +23,7 @@ dnl along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
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.

4
doc/emacs/ChangeLog
View File

@ -1,3 +1,7 @@
2014-09-29 Eli Zaretskii <eliz@gnu.org>
* emacsver.texi (EMACSVER): Bump to 20.0.50.
2014-09-15 Daniel Colascione <dancol@dancol.org>
* regs.texi (Text Registers): Update end-user documentation

2
doc/emacs/emacsver.texi
View File

@ -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

4
doc/man/ChangeLog
View File

@ -1,3 +1,7 @@
2014-09-29 Eli Zaretskii <eliz@gnu.org>
* emacs.1: Bump version to 25.0.50.
2014-01-12 Glenn Morris <rgm@gnu.org>
* emacs.1: Replace reference to etc/MAILINGLISTS.

2
doc/man/emacs.1
View File

@ -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

6
etc/ChangeLog
View File

@ -1,3 +1,9 @@
2014-09-29 Eli Zaretskii <eliz@gnu.org>
* refcards/ru-refcard.tex: Bump version to 25.0.50.
* refcards/emacsver.tex: Bump version to 25.0.50.
2014-09-14 Daniel Colascione <dancol@dancol.org>
* NEWS: Mention changes to `insert-register'

2
etc/refcards/emacsver.tex
View File

@ -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

2
etc/refcards/ru-refcard.tex
View File

@ -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

4
msdos/ChangeLog
View File

@ -1,3 +1,7 @@
2014-09-29 Eli Zaretskii <eliz@gnu.org>
* sed2v2.inp: Bump version to 25.0.50.
2014-08-28 Eli Zaretskii <eliz@gnu.org>
* sedlibmk.inp (gl_LIBOBJS): Add execinfo.o. Reported by Juan

2
msdos/sed2v2.inp
View File

@ -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/

10
nt/ChangeLog
View File

@ -1,3 +1,13 @@
2014-09-29 Eli Zaretskii <eliz@gnu.org>
* 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 <eliz@gnu.org>
* gnulib.mk: Synchronize with lib/gnulib.mk.

2
nt/config.nt
View File

@ -1576,7 +1576,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#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

8
nt/emacs.rc
View File

@ -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

8
nt/emacsclient.rc
View File

@ -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

2
nt/makefile.w32-in
View File

@ -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)

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2014-09-29 Eli Zaretskii <eliz@gnu.org>
* msdos.c (internal_terminal_init): Bump version to 25.
2014-09-29 Dmitry Antipov <dmantipov@yandex.ru>
Keep stack-allocated Lisp objects fast rather than versatile.

2
src/msdos.c
View File

@ -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