Mercurial > emacs
comparison src/frame.c @ 11775:fe7852953b75
(make_frame_without_minibuffer): New arg KB.
Require the new frame's minibuffer to be on the same display.
author | Karl Heuer <kwzh@gnu.org> |
---|---|
date | Tue, 09 May 1995 04:58:10 +0000 |
parents | bde1a67e0455 |
children | 6234b3610a6f |
comparison
equal
deleted
inserted
replaced
11774:0b5cb5170084 | 11775:fe7852953b75 |
---|---|
254 /* Make a frame using a separate minibuffer window on another frame. | 254 /* Make a frame using a separate minibuffer window on another frame. |
255 MINI_WINDOW is the minibuffer window to use. nil means use the | 255 MINI_WINDOW is the minibuffer window to use. nil means use the |
256 default (the global minibuffer). */ | 256 default (the global minibuffer). */ |
257 | 257 |
258 struct frame * | 258 struct frame * |
259 make_frame_without_minibuffer (mini_window) | 259 make_frame_without_minibuffer (mini_window, kb) |
260 register Lisp_Object mini_window; | 260 register Lisp_Object mini_window; |
261 KBOARD *kb; | |
261 { | 262 { |
262 register struct frame *f; | 263 register struct frame *f; |
263 | 264 |
264 /* Choose the minibuffer window to use. */ | 265 /* Choose the minibuffer window to use. */ |
265 if (NILP (mini_window)) | 266 if (NILP (mini_window)) |
272 } | 273 } |
273 else | 274 else |
274 { | 275 { |
275 CHECK_LIVE_WINDOW (mini_window, 0); | 276 CHECK_LIVE_WINDOW (mini_window, 0); |
276 } | 277 } |
278 | |
279 #ifdef MULTI_KBOARD | |
280 if (XFRAME (XWINDOW (mini_window)->frame)->kboard != kb) | |
281 error ("frame and minibuffer must be on the same display"); | |
282 #endif | |
277 | 283 |
278 /* Make a frame containing just a root window. */ | 284 /* Make a frame containing just a root window. */ |
279 f = make_frame (0); | 285 f = make_frame (0); |
280 | 286 |
281 /* Install the chosen minibuffer window, with proper buffer. */ | 287 /* Install the chosen minibuffer window, with proper buffer. */ |