summaryrefslogtreecommitdiff
path: root/src/frame.c
diff options
context:
space:
mode:
authorJason Rumney <jasonr@gnu.org>2007-05-15 23:05:27 +0000
committerJason Rumney <jasonr@gnu.org>2007-05-15 23:05:27 +0000
commit7e166218fc8d1d0571561937ba64c9cc1c0b5497 (patch)
tree1f3e2e5bbacd61aae6ec0164864b6cd42662782f /src/frame.c
parentff709c3a9f0024946c50ab376ec385e11935bdd5 (diff)
downloademacs-7e166218fc8d1d0571561937ba64c9cc1c0b5497.tar.gz
(Fdelete_frame): Only get kboard when MULTI_KBOARD defined.
(make_terminal_frame) [WINDOWSNT]: Initialize terminal.
Diffstat (limited to 'src/frame.c')
-rw-r--r--src/frame.c6
1 files changed, 5 insertions, 1 deletions
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