aboutsummaryrefslogtreecommitdiffstats
path: root/nt
diff options
context:
space:
mode:
authorEli Zaretskii2014-09-29 22:49:44 +0300
committerEli Zaretskii2014-09-29 22:49:44 +0300
commit2b3d968a02be2b8859cc2078904a184337654898 (patch)
tree48e6c0e6b169d252dd0d1ba67e0da2643ef8b12a /nt
parentcbdc06f3be1fb1921454d15d5d9f48bef85cba9e (diff)
downloademacs-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.
Diffstat (limited to 'nt')
-rw-r--r--nt/ChangeLog10
-rw-r--r--nt/config.nt2
-rw-r--r--nt/emacs.rc8
-rw-r--r--nt/emacsclient.rc8
-rw-r--r--nt/makefile.w32-in2
5 files changed, 20 insertions, 10 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 4317a173a6a..abd62d35a96 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,13 @@
12014-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
12014-09-01 Eli Zaretskii <eliz@gnu.org> 112014-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
13VS_VERSION_INFO VERSIONINFO 13VS_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
7VS_VERSION_INFO VERSIONINFO 7VS_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
25VERSION = 24.4.50 25VERSION = 25.0.50
26 26
27TMP_DIST_DIR = emacs-$(VERSION) 27TMP_DIST_DIR = emacs-$(VERSION)
28 28