Mercurial > emacs

comparison src/xfns.c @ 71577:ae1e5666e49f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Fx_create_frame): Move unwind_create_frame setup down.
author Richard M. Stallman <rms@gnu.org>
date Mon, 03 Jul 2006 15:42:48 +0000
parents 9e62d7b78e51
children 3f1637b3adcb b19aaf4ab0ee 138ce2701550
comparison
equal deleted inserted replaced
71576:b8678c550150 71577:ae1e5666e49f
3073 f->output_data.x->scroll_bar_background_pixel = -1; 3073 f->output_data.x->scroll_bar_background_pixel = -1;
3074 #ifdef USE_TOOLKIT_SCROLL_BARS 3074 #ifdef USE_TOOLKIT_SCROLL_BARS
3075 f->output_data.x->scroll_bar_top_shadow_pixel = -1; 3075 f->output_data.x->scroll_bar_top_shadow_pixel = -1;
3076 f->output_data.x->scroll_bar_bottom_shadow_pixel = -1; 3076 f->output_data.x->scroll_bar_bottom_shadow_pixel = -1;
3077 #endif /* USE_TOOLKIT_SCROLL_BARS */ 3077 #endif /* USE_TOOLKIT_SCROLL_BARS */
3078 record_unwind_protect (unwind_create_frame, frame);
3079 3078
3080 f->icon_name 3079 f->icon_name
3081 = x_get_arg (dpyinfo, parms, Qicon_name, "iconName", "Title", 3080 = x_get_arg (dpyinfo, parms, Qicon_name, "iconName", "Title",
3082 RES_TYPE_STRING); 3081 RES_TYPE_STRING);
3083 if (! STRINGP (f->icon_name)) 3082 if (! STRINGP (f->icon_name))
3084 f->icon_name = Qnil; 3083 f->icon_name = Qnil;
3085 3084
3086 FRAME_X_DISPLAY_INFO (f) = dpyinfo; 3085 FRAME_X_DISPLAY_INFO (f) = dpyinfo;
3086
3087 /* With FRAME_X_DISPLAY_INFO set up, this unwind-protect is safe. */
3088 record_unwind_protect (unwind_create_frame, frame);
3087 #if GLYPH_DEBUG 3089 #if GLYPH_DEBUG
3088 image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount; 3090 image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount;
3089 dpyinfo_refcount = dpyinfo->reference_count; 3091 dpyinfo_refcount = dpyinfo->reference_count;
3090 #endif /* GLYPH_DEBUG */ 3092 #endif /* GLYPH_DEBUG */
3091 #ifdef MULTI_KBOARD 3093 #ifdef MULTI_KBOARD