Romain Francoise's and Ami Fischman's bugfixes.

src/term.c (create_tty_output): Fix syntax error.  Reported by Ami
Fischman (ami at fischman dot org).

lisp/loadup.el: Load term/x-win.el if X is available.

lisp/startup.el (handle-args-function-alist)
(window-system-initialization-alist): New variables.
(command-line): Don't load term/x-win.el, use the above variables.

lisp/x-win.el: (x-initialize-window-system): New function, move X
initialization here.
(x-initialized): New variable.

lisp/frame.el (make-frame-on-display): Don't initialize X twice, and
make sure to pass the correct display parameter to x-open-connection.
Reported by Romain Francoise (romain at orebokech dot com).

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

1 files changed, 3 insertions, 1 deletions

diff --git a/src/term.c b/src/term.c
index 3ab02c501b8..c6782efa606 100644
--- a/src/term.c
+++ b/src/term.c
@@ -2908,10 +2908,12 @@ delete_tty (struct display *display)
 void
 create_tty_output (struct frame *f)
 {
+  struct tty_output *t;
+
   if (! FRAME_TERMCAP_P (f))
     abort ();
 
-  struct tty_output *t = xmalloc (sizeof (struct tty_output));
+  t = xmalloc (sizeof (struct tty_output));
   bzero (t, sizeof (struct tty_output));
 
   t->display_info = FRAME_DISPLAY (f)->display_info.tty;