Fix bug #14739 with creation of GUI frames from TTY session on Windows.

 src/w32fns.c (Fx_create_frame): Error out if called from a TTY
 session.

 lisp/frame.el (window-system-for-display): Don't allow to create a
 GUI frame from a -nw session on MS-Windows.

2 files changed, 8 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 6bdadaf796f..2749399d392 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-28  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32fns.c (Fx_create_frame): Error out if called from a TTY
+        session.  (Bug#14739)
+
 2013-12-27  Jarek Czekalski  <jarekczek@poczta.onet.pl>
 
         * callproc.c (Vexec_path): Document that exec-directory is in it.
diff --git a/src/w32fns.c b/src/w32fns.c
index 9536b146535..5ecddbc11d3 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -4346,6 +4346,9 @@ This function is an internal primitive--use `make-frame' instead.  */)
   Lisp_Object parent;
   struct kboard *kb;
 
+  if (!FRAME_W32_P (SELECTED_FRAME ()))
+    error ("Cannot create a GUI frame in a -nw session");
+
   /* Make copy of frame parameters because the original is in pure
      storage now. */
   parameters = Fcopy_alist (parameters);