From: Jason Rumney <jasonr@gnu.org>
Date: Tue, 15 May 2007 23:05:27 +0000 (+0000)
Subject: (Fdelete_frame): Only get kboard when MULTI_KBOARD defined.
X-Git-Tag: emacs-pretest-23.0.90~11236^2~130
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7e166218fc8d1d0571561937ba64c9cc1c0b5497;p=emacs.git

(Fdelete_frame): Only get kboard when MULTI_KBOARD defined.
(make_terminal_frame) [WINDOWSNT]: Initialize terminal.
---

diff --git a/src/frame.c b/src/frame.c
index 740dac812c2..859802995af 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -603,7 +603,9 @@ make_terminal_frame (struct terminal *terminal)
 #else
 #ifdef WINDOWSNT
   f->output_method = output_termcap;
-  f->output_data.x = &tty_display; /* XXX ??? */
+  f->terminal = terminal;
+  f->terminal->reference_count++;
+  create_w32cons_output (f);
 #else
 #ifdef MAC_OS8
   make_mac_terminal_frame (f);
@@ -1553,8 +1555,10 @@ The functions are run with one arg, the frame to be deleted.  */)
         else
           delete_terminal (terminal);
       }
+#ifdef MULTI_KBOARD
     else
       kb = terminal->kboard;
+#endif
   }
 
   /* If we've deleted the last_nonminibuf_frame, then try to find