[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xfns.c,v
From: |
Richard M. Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/src/xfns.c,v |
Date: |
Mon, 03 Jul 2006 15:42:49 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Richard M. Stallman <rms> 06/07/03 15:42:48
Index: xfns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xfns.c,v
retrieving revision 1.668
retrieving revision 1.669
diff -u -b -r1.668 -r1.669
--- xfns.c 24 Jun 2006 22:27:12 -0000 1.668
+++ xfns.c 3 Jul 2006 15:42:48 -0000 1.669
@@ -3075,7 +3075,6 @@
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",
@@ -3084,6 +3083,9 @@
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;
- [Emacs-diffs] Changes to emacs/src/xfns.c,v,
Richard M. Stallman <=