Mercurial > emacs

comparison src/xfns.c @ 34895:53e52b3525bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
author Gerd Moellmann <gerd@gnu.org>
date Thu, 28 Dec 2000 10:11:50 +0000
parents d8005f5e0a23
children 4cdfcac861d7
comparison
equal deleted inserted replaced
34894:21ab14f51772 34895:53e52b3525bf
253 253
254 extern Lisp_Object Vwindow_system_version; 254 extern Lisp_Object Vwindow_system_version;
255 255
256 Lisp_Object Qface_set_after_frame_default; 256 Lisp_Object Qface_set_after_frame_default;
257 257
258 #ifdef GLYPH_DEBUG 258 #if GLYPH_DEBUG
259 int image_cache_refcount, dpyinfo_refcount; 259 int image_cache_refcount, dpyinfo_refcount;
260 #endif 260 #endif
261 261
262 262
263 263
4041 struct frame *f = XFRAME (frame); 4041 struct frame *f = XFRAME (frame);
4042 4042
4043 /* If frame is ``official'', nothing to do. */ 4043 /* If frame is ``official'', nothing to do. */
4044 if (!CONSP (Vframe_list) || !EQ (XCAR (Vframe_list), frame)) 4044 if (!CONSP (Vframe_list) || !EQ (XCAR (Vframe_list), frame))
4045 { 4045 {
4046 #ifdef GLYPH_DEBUG 4046 #if GLYPH_DEBUG
4047 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); 4047 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
4048 #endif 4048 #endif
4049 4049
4050 x_free_frame_resources (f); 4050 x_free_frame_resources (f);
4051 4051
4156 RES_TYPE_STRING); 4156 RES_TYPE_STRING);
4157 if (! STRINGP (f->icon_name)) 4157 if (! STRINGP (f->icon_name))
4158 f->icon_name = Qnil; 4158 f->icon_name = Qnil;
4159 4159
4160 FRAME_X_DISPLAY_INFO (f) = dpyinfo; 4160 FRAME_X_DISPLAY_INFO (f) = dpyinfo;
4161 #ifdef GLYPH_DEBUG 4161 #if GLYPH_DEBUG
4162 image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount; 4162 image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount;
4163 dpyinfo_refcount = dpyinfo->reference_count; 4163 dpyinfo_refcount = dpyinfo->reference_count;
4164 #endif /* GLYPH_DEBUG */ 4164 #endif /* GLYPH_DEBUG */
4165 #ifdef MULTI_KBOARD 4165 #ifdef MULTI_KBOARD
4166 FRAME_KBOARD (f) = kb; 4166 FRAME_KBOARD (f) = kb;
10438 f->output_data.x->fontset = -1; 10438 f->output_data.x->fontset = -1;
10439 f->output_data.x->scroll_bar_foreground_pixel = -1; 10439 f->output_data.x->scroll_bar_foreground_pixel = -1;
10440 f->output_data.x->scroll_bar_background_pixel = -1; 10440 f->output_data.x->scroll_bar_background_pixel = -1;
10441 f->icon_name = Qnil; 10441 f->icon_name = Qnil;
10442 FRAME_X_DISPLAY_INFO (f) = dpyinfo; 10442 FRAME_X_DISPLAY_INFO (f) = dpyinfo;
10443 #ifdef GLYPH_DEBUG 10443 #if GLYPH_DEBUG
10444 image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount; 10444 image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount;
10445 dpyinfo_refcount = dpyinfo->reference_count; 10445 dpyinfo_refcount = dpyinfo->reference_count;
10446 #endif /* GLYPH_DEBUG */ 10446 #endif /* GLYPH_DEBUG */
10447 #ifdef MULTI_KBOARD 10447 #ifdef MULTI_KBOARD
10448 FRAME_KBOARD (f) = kb; 10448 FRAME_KBOARD (f) = kb;