Mercurial > emacs

comparison src/xfns.c @ 83532:b19aaf4ab0ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from emacs@sv.gnu.org. Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-331 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-332 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-333 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-334 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-335 Add note about "link" button-class to etc/TODO * emacs@sv.gnu.org/emacs--devo--0--patch-336 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-337 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-338 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-339 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-340 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-341 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-342 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-343 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-344 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-345 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-346 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-347 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-348 Update for ERC 5.1.3. * emacs@sv.gnu.org/emacs--devo--0--patch-349 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-350 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/gnus--rel--5.10--patch-111 Update from CVS: texi/gnus.texi (Summary Buffer Lines): Fix typo. * emacs@sv.gnu.org/gnus--rel--5.10--patch-112 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-113 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-114 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-572
author Karoly Lorentey <lorentey@elte.hu>
date Fri, 14 Jul 2006 05:56:32 +0000
parents a387c138b28e ae1e5666e49f
children 02e39decdc84
comparison
equal deleted inserted replaced
83531:a387c138b28e 83532:b19aaf4ab0ee
3094 f->output_data.x->scroll_bar_background_pixel = -1; 3094 f->output_data.x->scroll_bar_background_pixel = -1;
3095 #ifdef USE_TOOLKIT_SCROLL_BARS 3095 #ifdef USE_TOOLKIT_SCROLL_BARS
3096 f->output_data.x->scroll_bar_top_shadow_pixel = -1; 3096 f->output_data.x->scroll_bar_top_shadow_pixel = -1;
3097 f->output_data.x->scroll_bar_bottom_shadow_pixel = -1; 3097 f->output_data.x->scroll_bar_bottom_shadow_pixel = -1;
3098 #endif /* USE_TOOLKIT_SCROLL_BARS */ 3098 #endif /* USE_TOOLKIT_SCROLL_BARS */
3099 record_unwind_protect (unwind_create_frame, frame);
3100 3099
3101 f->icon_name 3100 f->icon_name
3102 = x_get_arg (dpyinfo, parms, Qicon_name, "iconName", "Title", 3101 = x_get_arg (dpyinfo, parms, Qicon_name, "iconName", "Title",
3103 RES_TYPE_STRING); 3102 RES_TYPE_STRING);
3104 if (! STRINGP (f->icon_name)) 3103 if (! STRINGP (f->icon_name))
3105 f->icon_name = Qnil; 3104 f->icon_name = Qnil;
3106 3105
3107 FRAME_X_DISPLAY_INFO (f) = dpyinfo; 3106 FRAME_X_DISPLAY_INFO (f) = dpyinfo;
3107
3108 /* With FRAME_X_DISPLAY_INFO set up, this unwind-protect is safe. */
3109 record_unwind_protect (unwind_create_frame, frame);
3108 #if GLYPH_DEBUG 3110 #if GLYPH_DEBUG
3109 image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount; 3111 image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount;
3110 dpyinfo_refcount = dpyinfo->reference_count; 3112 dpyinfo_refcount = dpyinfo->reference_count;
3111 #endif /* GLYPH_DEBUG */ 3113 #endif /* GLYPH_DEBUG */
3112 3114