aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2014-09-29 22:49:44 +0300
committerEli Zaretskii2014-09-29 22:49:44 +0300
commit2b3d968a02be2b8859cc2078904a184337654898 (patch)
tree48e6c0e6b169d252dd0d1ba67e0da2643ef8b12a /src
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 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/msdos.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 698eab54b8f..d2d629f31b4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12014-09-29 Eli Zaretskii <eliz@gnu.org>
2
3 * msdos.c (internal_terminal_init): Bump version to 25.
4
12014-09-29 Dmitry Antipov <dmantipov@yandex.ru> 52014-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