diff options
| author | Miles Bader <miles@gnu.org> | 2007-10-27 09:12:07 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-10-27 09:12:07 +0000 |
| commit | 18cd1f1a08833b0baad21c1d7b13a6845d95cf57 (patch) | |
| tree | 03f33df7513d15bd5de0348aec35ef82bd061508 /src/macterm.c | |
| parent | 74863e7a78b1c8da1094a8250660a009c3b23015 (diff) | |
| parent | fdc9061358d3654e14bfc1419632e1d6c6c5c13e (diff) | |
| download | emacs-18cd1f1a08833b0baad21c1d7b13a6845d95cf57.tar.gz emacs-18cd1f1a08833b0baad21c1d7b13a6845d95cf57.tar.bz2 emacs-18cd1f1a08833b0baad21c1d7b13a6845d95cf57.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 902-908)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 131-137)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 261-262)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-278
Diffstat (limited to 'src/macterm.c')
| -rw-r--r-- | src/macterm.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/macterm.c b/src/macterm.c index 3c01a6618a2..7f837d2a20d 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -12842,6 +12842,26 @@ mac_create_terminal (struct mac_display_info *dpyinfo) #endif + /* 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. */ + terminal->kboard = (KBOARD *) xmalloc (sizeof (KBOARD)); + init_kboard (terminal->kboard); + terminal->kboard->Vwindow_system = intern ("mac"); + terminal->kboard->next_kboard = all_kboards; + all_kboards = terminal->kboard; + /* Don't let the initial kboard remain current longer than necessary. + That would cause problems if a file loaded on startup tries to + prompt in the mini-buffer. */ + if (current_kboard == initial_kboard) + current_kboard = terminal->kboard; + terminal->kboard->reference_count++; +#endif + return terminal; } |