Fix initialization of the window-system variable.

lisp/faces.el (x-create-frame-with-faces)
(tty-create-frame-with-faces): Don't set the window-system parameter
here, it seems to be unreliable.

lisp/frame.el (make-frame): Don't forget to return the new frame (d'oh).

src/frame.c (Qwindow_system): New symbol.
(syms_of_frame): Intern it.
(Fmake_terminal_frame): Initialize window-system frame parameter.

src/frame.h (Qwindow_system): New declaration.

src/xfns.c (Fx_create_frame, x_create_tip_frame): Initialize
window-system frame parameter.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-56

2 files changed, 3 insertions, 3 deletions

diff --git a/lisp/faces.el b/lisp/faces.el
index 4877fd246e0..342ba5b60bd 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1658,7 +1658,7 @@ Value is the new frame created."
   (setq parameters (x-handle-named-frame-geometry parameters))
   (let ((visibility-spec (assq 'visibility parameters))
         (frame-list (frame-list))
-        (frame (x-create-frame `((window-system . x) (visibility . nil) . ,parameters)))
+        (frame (x-create-frame `((visibility . nil) . ,parameters)))
         success)
     (unwind-protect
         (progn
@@ -1744,7 +1744,7 @@ Parameters not specified by PARAMETERS are taken from
 `default-frame-alist'.  If either PARAMETERS or `default-frame-alist'
 contains a `reverse' parameter, handle that.  Value is the new frame
 created."
-  (let ((frame (make-terminal-frame `((window-system . nil) . ,parameters)))
+  (let ((frame (make-terminal-frame parameters))
         success)
     (unwind-protect
         (progn
diff --git a/lisp/frame.el b/lisp/frame.el
index 2175bdd8615..f374f838696 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -636,7 +636,7 @@ on `after-make-frame-functions' are run with one arg, the newly created frame."
     (unless frame-creation-function
       (error "Don't know how to create a frame on window system %s" w))
     (run-hooks 'before-make-frame-hook)
-    (funcall frame-creation-function parameters)
+    (setq frame (funcall frame-creation-function parameters))
     (run-hook-with-args 'after-make-frame-functions frame)
     frame))