Mercurial > emacs

comparison src/xfns.c @ 108439:c3622fa53abe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Fri, 26 Mar 2010 15:03:20 +0000
parents 75e87467a0db
children 41e0da544208
comparison
equal deleted inserted replaced
108438:2485b1fb98d3 108439:c3622fa53abe
3345 } 3345 }
3346 3346
3347 #ifdef USE_LUCID 3347 #ifdef USE_LUCID
3348 /* Prevent lwlib/xlwmenu.c from crashing because of a bug 3348 /* Prevent lwlib/xlwmenu.c from crashing because of a bug
3349 whereby it fails to get any font. */ 3349 whereby it fails to get any font. */
3350 BLOCK_INPUT;
3350 xlwmenu_default_font = XLoadQueryFont (FRAME_X_DISPLAY (f), "fixed"); 3351 xlwmenu_default_font = XLoadQueryFont (FRAME_X_DISPLAY (f), "fixed");
3352 UNBLOCK_INPUT;
3351 #endif 3353 #endif
3352 3354
3353 /* Frame contents get displaced if an embedded X window has a border. */ 3355 /* Frame contents get displaced if an embedded X window has a border. */
3354 if (! FRAME_X_EMBEDDED_P (f)) 3356 if (! FRAME_X_EMBEDDED_P (f))
3355 x_default_parameter (f, parms, Qborder_width, make_number (2), 3357 x_default_parameter (f, parms, Qborder_width, make_number (2),
3419 end up in init_iterator with a null face cache, which should not 3421 end up in init_iterator with a null face cache, which should not
3420 happen. */ 3422 happen. */
3421 init_frame_faces (f); 3423 init_frame_faces (f);
3422 3424
3423 x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1), 3425 x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1),
3424 "menuBar", "MenuBar", RES_TYPE_NUMBER); 3426 "menuBar", "MenuBar", RES_TYPE_BOOLEAN_NUMBER);
3425 x_default_parameter (f, parms, Qtool_bar_lines, make_number (1), 3427 x_default_parameter (f, parms, Qtool_bar_lines, make_number (1),
3426 "toolBar", "ToolBar", RES_TYPE_NUMBER); 3428 "toolBar", "ToolBar", RES_TYPE_NUMBER);
3427 x_default_parameter (f, parms, Qbuffer_predicate, Qnil, 3429 x_default_parameter (f, parms, Qbuffer_predicate, Qnil,
3428 "bufferPredicate", "BufferPredicate", 3430 "bufferPredicate", "BufferPredicate",
3429 RES_TYPE_SYMBOL); 3431 RES_TYPE_SYMBOL);