Mercurial > hg > xemacs-beta

comparison src/frame.c @ 410:de805c49cfc1 r21-2-35

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2-35
author cvs
date Mon, 13 Aug 2007 11:19:21 +0200
parents 501cfd01ee6d
children 697ef44129c6
comparison
equal deleted inserted replaced
409:301b9ebbdf3b 410:de805c49cfc1
266 if (!NILP (mini_window) 266 if (!NILP (mini_window)
267 && !EQ (DEVICE_CONSOLE (XDEVICE (device)), 267 && !EQ (DEVICE_CONSOLE (XDEVICE (device)),
268 FRAME_CONSOLE (XFRAME (XWINDOW (mini_window)->frame)))) 268 FRAME_CONSOLE (XFRAME (XWINDOW (mini_window)->frame))))
269 error ("frame and minibuffer must be on the same console"); 269 error ("frame and minibuffer must be on the same console");
270 270
271 if (NILP (mini_window)) 271 /* Do not create a default minibuffer frame on printer devices. */
272 if (NILP (mini_window)
273 && DEVICE_DISPLAY_P (XDEVICE (FRAME_DEVICE (f))))
272 { 274 {
273 struct console *con = XCONSOLE (FRAME_CONSOLE (f)); 275 struct console *con = XCONSOLE (FRAME_CONSOLE (f));
274 /* Use default-minibuffer-frame if possible. */ 276 /* Use default-minibuffer-frame if possible. */
275 if (!FRAMEP (con->default_minibuffer_frame) 277 if (!FRAMEP (con->default_minibuffer_frame)
276 || ! FRAME_LIVE_P (XFRAME (con->default_minibuffer_frame))) 278 || ! FRAME_LIVE_P (XFRAME (con->default_minibuffer_frame)))
281 } 283 }
282 mini_window = XFRAME (con->default_minibuffer_frame)->minibuffer_window; 284 mini_window = XFRAME (con->default_minibuffer_frame)->minibuffer_window;
283 } 285 }
284 286
285 /* Install the chosen minibuffer window, with proper buffer. */ 287 /* Install the chosen minibuffer window, with proper buffer. */
286 store_minibuf_frame_prop (f, mini_window); 288 if (!NILP (mini_window))
287 Fset_window_buffer (mini_window, Vminibuffer_zero, Qt); 289 {
290 store_minibuf_frame_prop (f, mini_window);
291 Fset_window_buffer (mini_window, Vminibuffer_zero, Qt);
292 }
293 else
294 f->minibuffer_window = Qnil;
288 } 295 }
289 296
290 /* Make a frame containing only a minibuffer window. */ 297 /* Make a frame containing only a minibuffer window. */
291 298
292 static void 299 static void
3407 This is the same format as `modeline-format' with the exception that 3414 This is the same format as `modeline-format' with the exception that
3408 %- is ignored. 3415 %- is ignored.
3409 */ ); 3416 */ );
3410 /* #### I would change this unilaterally but for the wrath of the Kyles 3417 /* #### I would change this unilaterally but for the wrath of the Kyles
3411 of the world. */ 3418 of the world. */
3412 #ifdef WINDOWSNT 3419 #ifdef WIN32_NATIVE
3413 Vframe_title_format = build_string ("%b - XEmacs"); 3420 Vframe_title_format = build_string ("%b - XEmacs");
3414 #else 3421 #else
3415 Vframe_title_format = build_string ("%S: %b"); 3422 Vframe_title_format = build_string ("%S: %b");
3416 #endif 3423 #endif
3417 3424