diff options
| author | Miles Bader <miles@gnu.org> | 2006-07-06 08:59:39 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-07-06 08:59:39 +0000 |
| commit | 6a46b0188332c8007c23014bd0ba97441be6abe8 (patch) | |
| tree | e6bad7efe8102d87934fbae8f1b34341cd4e4957 /src/xfns.c | |
| parent | 5ed089581a49f8f0eba2d911203ff5db57eac322 (diff) | |
| parent | 978db1472a9d4bbaafbc93b9176f7c409ac209bd (diff) | |
| download | emacs-6a46b0188332c8007c23014bd0ba97441be6abe8.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 320-342)
- Update from CVS
- Merge from gnus--rel--5.10
- lisp/play/cookie1.el (cookie): Work properly when there's only one entry
- Add note about "link" button-class to etc/TODO
* gnus--rel--5.10 (patch 108-112)
- Merge from emacs--devo--0
- Clean up merge mistakes
- Update from CVS
- Update from CVS: texi/gnus.texi (Summary Buffer Lines): Fix typo.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-86
Diffstat (limited to 'src/xfns.c')
| -rw-r--r-- | src/xfns.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/xfns.c b/src/xfns.c index 5924ba21f88..253f2829f85 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -3099,7 +3099,6 @@ This function is an internal primitive--use `make-frame' instead. */) f->output_data.x->scroll_bar_top_shadow_pixel = -1; f->output_data.x->scroll_bar_bottom_shadow_pixel = -1; #endif /* USE_TOOLKIT_SCROLL_BARS */ - record_unwind_protect (unwind_create_frame, frame); f->icon_name = x_get_arg (dpyinfo, parms, Qicon_name, "iconName", "Title", @@ -3108,6 +3107,9 @@ This function is an internal primitive--use `make-frame' instead. */) f->icon_name = Qnil; FRAME_X_DISPLAY_INFO (f) = dpyinfo; + + /* With FRAME_X_DISPLAY_INFO set up, this unwind-protect is safe. */ + record_unwind_protect (unwind_create_frame, frame); #if GLYPH_DEBUG image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount; dpyinfo_refcount = dpyinfo->reference_count; @@ -4847,8 +4849,7 @@ else if (! STRINGP (font)) font = build_string ("fixed"); - x_default_parameter (f, parms, Qfont, font, - "font", "Font", RES_TYPE_STRING); + x_set_frame_parameters (f, Fcons (Fcons (Qfont, font), Qnil)); } x_default_parameter (f, parms, Qborder_width, make_number (2), |