comparison src/frame-x.c @ 217:d44af0c54775 r20-4b7

Import from CVS: tag r20-4b7
author cvs
date Mon, 13 Aug 2007 10:08:34 +0200
parents 1f0dabaa0855
children 262b8bb4a523
comparison
equal deleted inserted replaced
216:43306a74e31c 217:d44af0c54775
2002 f->frame_data = xnew_and_zero (struct x_frame); 2002 f->frame_data = xnew_and_zero (struct x_frame);
2003 2003
2004 /* yeah, except the lisp ones */ 2004 /* yeah, except the lisp ones */
2005 FRAME_X_ICON_PIXMAP (f) = Qnil; 2005 FRAME_X_ICON_PIXMAP (f) = Qnil;
2006 FRAME_X_ICON_PIXMAP_MASK (f) = Qnil; 2006 FRAME_X_ICON_PIXMAP_MASK (f) = Qnil;
2007 #ifdef ENERGIZE
2008 FRAME_X_CURRENT_PSHEET_BUFFER (f) = Qnil;
2009 FRAME_X_DESIRED_PSHEET_BUFFER (f) = Qnil;
2010 #endif
2011 } 2007 }
2012 2008
2013 2009
2014 /************************************************************************/ 2010 /************************************************************************/
2015 /* Lisp functions */ 2011 /* Lisp functions */
2074 static void 2070 static void
2075 x_mark_frame (struct frame *f, void (*markobj) (Lisp_Object)) 2071 x_mark_frame (struct frame *f, void (*markobj) (Lisp_Object))
2076 { 2072 {
2077 ((markobj) (FRAME_X_ICON_PIXMAP (f))); 2073 ((markobj) (FRAME_X_ICON_PIXMAP (f)));
2078 ((markobj) (FRAME_X_ICON_PIXMAP_MASK (f))); 2074 ((markobj) (FRAME_X_ICON_PIXMAP_MASK (f)));
2079 #ifdef ENERGIZE
2080 ((markobj) (FRAME_X_CURRENT_PSHEET_BUFFER (f)));
2081 ((markobj) (FRAME_X_DESIRED_PSHEET_BUFFER (f)));
2082 #endif
2083 } 2075 }
2084 2076
2085 static void 2077 static void
2086 x_set_frame_icon (struct frame *f) 2078 x_set_frame_icon (struct frame *f)
2087 { 2079 {