diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2008-07-31 02:47:32 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2008-07-31 02:47:32 +0000 |
| commit | 12205281da02dc955c47fa1830bbd4daef835433 (patch) | |
| tree | 1496b27a15674de3998143ee86c890e777b78c8f /src/frame.c | |
| parent | b41d4794f126c98d4f0a3a6921a611b022e5f33f (diff) | |
| download | emacs-before-remove-vms.tar.gz | |
* s/ms-w32.h (MULTI_KBOARD): Remove.before-remove-vms
* xterm.c:
* xselect.c:
* xfns.c:
* window.c:
* w32term.c:
* w32fns.c:
* terminal.c:
* termhooks.h:
* term.c:
* sysdep.c:
* keyboard.h:
* keyboard.c:
* frame.h:
* frame.c:
* frame.c: Remove references to MULTI_KBOARD, it is now the
default.
* config.in: Regenerate.
* config.nt (MULTI_KBOARD): Remove.
* configure.in (MULTI_KBOARD): Remove.
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/frame.c b/src/frame.c index edcf3a54bc8..448f6bab918 100644 --- a/src/frame.c +++ b/src/frame.c @@ -433,11 +433,9 @@ make_frame_without_minibuffer (mini_window, kb, display) if (!NILP (mini_window)) CHECK_LIVE_WINDOW (mini_window); -#ifdef MULTI_KBOARD if (!NILP (mini_window) && FRAME_KBOARD (XFRAME (XWINDOW (mini_window)->frame)) != kb) error ("Frame and minibuffer must be on the same terminal"); -#endif /* Make a frame containing just a root window. */ f = make_frame (0); @@ -1513,10 +1511,8 @@ But FORCE inhibits this too. */) kb = NULL; Fdelete_terminal (tmp, NILP (force) ? Qt : force); } -#ifdef MULTI_KBOARD else kb = terminal->kboard; -#endif } /* If we've deleted the last_nonminibuf_frame, then try to find |