aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDan Nicolaescu2007-11-20 18:14:19 +0000
committerDan Nicolaescu2007-11-20 18:14:19 +0000
commitb951420f700906645c67a5aaff3e4da039f632c5 (patch)
treead3ed479aeaafa9176c7dde260d2e7b514ca089c /src
parent202c09a889e637eb4162db551252c80bbf46b02b (diff)
downloademacs-b951420f700906645c67a5aaff3e4da039f632c5.tar.gz
emacs-b951420f700906645c67a5aaff3e4da039f632c5.zip
(mac_term_init): Call add_keyboard_wait_descriptor.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/macterm.c4
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index dda5b989775..ba163a9c2c7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12007-11-20 Dan Nicolaescu <dann@ics.uci.edu> 12007-11-20 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 * macterm.c (mac_term_init): Call add_keyboard_wait_descriptor.
4
3 * s/darwin.h (MULTI_KBOARD): Remove. 5 * s/darwin.h (MULTI_KBOARD): Remove.
4 6
5 * macfns.c (x_create_tip_frame, Fx_create_frame) 7 * macfns.c (x_create_tip_frame, Fx_create_frame)
diff --git a/src/macterm.c b/src/macterm.c
index bc33cfe472e..1bf0cd0e707 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -12604,6 +12604,10 @@ mac_term_init (display_name, xrm_option, resource_name)
12604 x_display_name_list); 12604 x_display_name_list);
12605 dpyinfo->name_list_element = XCAR (x_display_name_list); 12605 dpyinfo->name_list_element = XCAR (x_display_name_list);
12606 12606
12607 /* FIXME: Untested.
12608 Add the default keyboard. */
12609 add_keyboard_wait_descriptor (0);
12610
12607#if USE_CG_DRAWING 12611#if USE_CG_DRAWING
12608 mac_init_fringe (terminal->rif); 12612 mac_init_fringe (terminal->rif);
12609#endif 12613#endif