aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Rumney2008-12-20 16:00:39 +0000
committerJason Rumney2008-12-20 16:00:39 +0000
commit99b72cc426dc014815eba2ea30324ead423c301b (patch)
tree03fc925a993f6c467e55c53329e343e3af257ffa
parent54ea0c877fd00119d72250e9c5acc105f4fc3deb (diff)
downloademacs-99b72cc426dc014815eba2ea30324ead423c301b.tar.gz
emacs-99b72cc426dc014815eba2ea30324ead423c301b.zip
(Fmake_terminal_frame): Raise an error when called from
a graphical frame on Windows.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/frame.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 83d43479df8..bd37f3528fd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12008-12-20 Jason Rumney <jasonr@gnu.org>
2
3 * frame.c (Fmake_terminal_frame): Raise an error when called from
4 a graphical frame on Windows.
5
12008-12-20 Jan Djärv <jan.h.d@swipnet.se> 62008-12-20 Jan Djärv <jan.h.d@swipnet.se>
2 7
3 * frame.c (Fdelete_frame): Set f->menu_bar_vector to Qnil. 8 * frame.c (Fdelete_frame): Set f->menu_bar_vector to Qnil.
diff --git a/src/frame.c b/src/frame.c
index 8af3e4bf35f..db8874f5280 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -684,7 +684,7 @@ affects all frames on the same terminal device. */)
684 abort (); 684 abort ();
685#else /* not MSDOS */ 685#else /* not MSDOS */
686 686
687#if 0 /* This should work now! */ 687#ifdef WINDOWSNT /* This should work now! */
688 if (sf->output_method != output_termcap) 688 if (sf->output_method != output_termcap)
689 error ("Not using an ASCII terminal now; cannot make a new ASCII frame"); 689 error ("Not using an ASCII terminal now; cannot make a new ASCII frame");
690#endif 690#endif