[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117975: Follow-up to renaming v24.5 to 25.1.
|
From: |
Eli Zaretskii |
|
Subject: |
[Emacs-diffs] trunk r117975: Follow-up to renaming v24.5 to 25.1. |
|
Date: |
Mon, 29 Sep 2014 19:53:58 +0000 |
|
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117975
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Mon 2014-09-29 22:49:44 +0300
message:
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.
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
README readme-20091113204419-o5vbwnq5f7feedwu-1539
configure.ac
configure.in-20091113204419-o5vbwnq5f7feedwu-783
doc/emacs/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6227
doc/emacs/emacsver.texi
emacsver.texi.in-20101009013439-2q4vgf941qfsvio7-1
doc/man/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6126
doc/man/emacs.1 emacs.1-20091113204419-o5vbwnq5f7feedwu-6123
etc/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1485
etc/refcards/emacsver.tex emacsver.tex-20120917071509-caxos2gouken81i9-1
etc/refcards/ru-refcard.tex
rurefcard.tex-20091113204419-o5vbwnq5f7feedwu-5152
msdos/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1535
msdos/sed2v2.inp sed2v2.inp-20091113204419-o5vbwnq5f7feedwu-2392
nt/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1545
nt/config.nt config.nt-20091113204419-o5vbwnq5f7feedwu-878
nt/emacs.rc emacs.rc-20091113204419-o5vbwnq5f7feedwu-875
nt/emacsclient.rc
emacsclient.rc-20091113204419-o5vbwnq5f7feedwu-8624
nt/makefile.w32-in
makefile.w32in-20091113204419-o5vbwnq5f7feedwu-1915
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/msdos.c msdos.c-20091113204419-o5vbwnq5f7feedwu-656
=== modified file 'ChangeLog'
--- a/ChangeLog 2014-09-29 06:44:31 +0000
+++ b/ChangeLog 2014-09-29 19:49:44 +0000
@@ -1,3 +1,9 @@
+2014-09-29 Eli Zaretskii <address@hidden>
+
+ * README: Bump version to 25.0.50.
+
+ * configure.ac (AC_INIT): Bump version to 25.0.50.
+
2014-09-29 Dmitry Antipov <address@hidden>
* configure.ac (HAVE_STATEMENT_EXPRESSIONS): Remove.
=== modified file 'README'
--- a/README 2014-08-15 04:34:06 +0000
+++ b/README 2014-09-29 19:49:44 +0000
@@ -2,7 +2,7 @@
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
=== modified file 'configure.ac'
--- a/configure.ac 2014-09-29 06:44:31 +0000
+++ b/configure.ac 2014-09-29 19:49:44 +0000
@@ -23,7 +23,7 @@
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, address@hidden)
+AC_INIT(GNU Emacs, 25.0.50, address@hidden)
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.
=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog 2014-09-15 00:43:29 +0000
+++ b/doc/emacs/ChangeLog 2014-09-29 19:49:44 +0000
@@ -1,3 +1,7 @@
+2014-09-29 Eli Zaretskii <address@hidden>
+
+ * emacsver.texi (EMACSVER): Bump to 20.0.50.
+
2014-09-15 Daniel Colascione <address@hidden>
* regs.texi (Text Registers): Update end-user documentation
=== modified file 'doc/emacs/emacsver.texi'
--- a/doc/emacs/emacsver.texi 2014-08-15 04:34:06 +0000
+++ b/doc/emacs/emacsver.texi 2014-09-29 19:49:44 +0000
@@ -1,4 +1,4 @@
@c It would be nicer to generate this using configure and @address@hidden
@c However, that would mean emacsver.texi would always be newer
@c then the info files in release tarfiles.
address@hidden EMACSVER 24.4.50
address@hidden EMACSVER 25.0.50
=== modified file 'doc/man/ChangeLog'
--- a/doc/man/ChangeLog 2014-01-12 01:35:51 +0000
+++ b/doc/man/ChangeLog 2014-09-29 19:49:44 +0000
@@ -1,3 +1,7 @@
+2014-09-29 Eli Zaretskii <address@hidden>
+
+ * emacs.1: Bump version to 25.0.50.
+
2014-01-12 Glenn Morris <address@hidden>
* emacs.1: Replace reference to etc/MAILINGLISTS.
=== modified file 'doc/man/emacs.1'
--- a/doc/man/emacs.1 2014-08-15 04:34:06 +0000
+++ b/doc/man/emacs.1 2014-09-29 19:49:44 +0000
@@ -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
=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog 2014-09-14 23:11:52 +0000
+++ b/etc/ChangeLog 2014-09-29 19:49:44 +0000
@@ -1,3 +1,9 @@
+2014-09-29 Eli Zaretskii <address@hidden>
+
+ * refcards/ru-refcard.tex: Bump version to 25.0.50.
+
+ * refcards/emacsver.tex: Bump version to 25.0.50.
+
2014-09-14 Daniel Colascione <address@hidden>
* NEWS: Mention changes to `insert-register'
=== modified file 'etc/refcards/emacsver.tex'
--- a/etc/refcards/emacsver.tex 2014-01-01 07:43:34 +0000
+++ b/etc/refcards/emacsver.tex 2014-09-29 19:49:44 +0000
@@ -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
=== modified file 'etc/refcards/ru-refcard.tex'
--- a/etc/refcards/ru-refcard.tex 2014-01-02 19:18:24 +0000
+++ b/etc/refcards/ru-refcard.tex 2014-09-29 19:49:44 +0000
@@ -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
=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog 2014-08-28 01:59:29 +0000
+++ b/msdos/ChangeLog 2014-09-29 19:49:44 +0000
@@ -1,3 +1,7 @@
+2014-09-29 Eli Zaretskii <address@hidden>
+
+ * sed2v2.inp: Bump version to 25.0.50.
+
2014-08-28 Eli Zaretskii <address@hidden>
* sedlibmk.inp (gl_LIBOBJS): Add execinfo.o. Reported by Juan
=== modified file 'msdos/sed2v2.inp'
--- a/msdos/sed2v2.inp 2014-08-28 01:59:29 +0000
+++ b/msdos/sed2v2.inp 2014-09-29 19:49:44 +0000
@@ -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/
=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog 2014-09-01 15:11:25 +0000
+++ b/nt/ChangeLog 2014-09-29 19:49:44 +0000
@@ -1,3 +1,13 @@
+2014-09-29 Eli Zaretskii <address@hidden>
+
+ * 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 <address@hidden>
* gnulib.mk: Synchronize with lib/gnulib.mk.
=== modified file 'nt/config.nt'
--- a/nt/config.nt 2014-08-15 04:34:06 +0000
+++ b/nt/config.nt 2014-09-29 19:49:44 +0000
@@ -1576,7 +1576,7 @@
#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
=== modified file 'nt/emacs.rc'
--- a/nt/emacs.rc 2014-08-15 04:34:06 +0000
+++ b/nt/emacs.rc 2014-09-29 19:49:44 +0000
@@ -11,8 +11,8 @@
#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
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
=== modified file 'nt/emacsclient.rc'
--- a/nt/emacsclient.rc 2014-08-15 04:34:06 +0000
+++ b/nt/emacsclient.rc 2014-09-29 19:49:44 +0000
@@ -5,8 +5,8 @@
#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
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
=== modified file 'nt/makefile.w32-in'
--- a/nt/makefile.w32-in 2014-08-15 04:34:06 +0000
+++ b/nt/makefile.w32-in 2014-09-29 19:49:44 +0000
@@ -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)
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-09-29 18:14:08 +0000
+++ b/src/ChangeLog 2014-09-29 19:49:44 +0000
@@ -1,3 +1,7 @@
+2014-09-29 Eli Zaretskii <address@hidden>
+
+ * msdos.c (internal_terminal_init): Bump version to 25.
+
2014-09-29 Dmitry Antipov <address@hidden>
Keep stack-allocated Lisp objects fast rather than versatile.
=== modified file 'src/msdos.c'
--- a/src/msdos.c 2014-08-10 16:28:36 +0000
+++ b/src/msdos.c 2014-09-29 19:49:44 +0000
@@ -1792,7 +1792,7 @@
}
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
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117975: Follow-up to renaming v24.5 to 25.1.,
Eli Zaretskii <=