diff options
| author | Miles Bader <miles@gnu.org> | 2007-12-06 09:51:45 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-12-06 09:51:45 +0000 |
| commit | 0bd508417142ff377f34aec8dcec9438d9175c2c (patch) | |
| tree | 4d60fe09e5cebf7d79766b11e9cda8cc1c9dbb9b /src/macterm.c | |
| parent | 98fe991da804a42f53f6a5e84cd5eab18a82e181 (diff) | |
| parent | 9fb1ba8090da3528de56158a79bd3527d31c7f2f (diff) | |
| download | emacs-0bd508417142ff377f34aec8dcec9438d9175c2c.tar.gz emacs-0bd508417142ff377f34aec8dcec9438d9175c2c.tar.bz2 emacs-0bd508417142ff377f34aec8dcec9438d9175c2c.zip | |
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-294
Diffstat (limited to 'src/macterm.c')
| -rw-r--r-- | src/macterm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/macterm.c b/src/macterm.c index f107f081421..f07b9eb0a5d 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -12625,6 +12625,10 @@ mac_term_init (display_name, xrm_option, resource_name) x_display_name_list); dpyinfo->name_list_element = XCAR (x_display_name_list); + /* FIXME: Untested. + Add the default keyboard. */ + add_keyboard_wait_descriptor (0); + #if USE_CG_DRAWING mac_init_fringe (terminal->rif); #endif @@ -12844,7 +12848,6 @@ mac_create_terminal (struct mac_display_info *dpyinfo) /* FIXME: This keyboard setup is 100% untested, just copied from w32_create_terminal in order to set window-system now that it's a keyboard object. */ -#ifdef MULTI_KBOARD /* We don't yet support separate terminals on Mac, so don't try to share keyboards between virtual terminals that are on the same physical terminal like X does. */ @@ -12859,7 +12862,6 @@ mac_create_terminal (struct mac_display_info *dpyinfo) if (current_kboard == initial_kboard) current_kboard = terminal->kboard; terminal->kboard->reference_count++; -#endif return terminal; } |