Mercurial > emacs
comparison src/xfns.c @ 12080:862907031e94
(Fx_create_frame): Make sure icon_name is a string or nil.
author | Karl Heuer <kwzh@gnu.org> |
---|---|
date | Mon, 05 Jun 1995 17:41:10 +0000 |
parents | 1b0018c43060 |
children | a9fda5417acf |
comparison
equal
deleted
inserted
replaced
12079:f6e8c75cca52 | 12080:862907031e94 |
---|---|
2899 bzero (f->display.x, sizeof (struct x_display)); | 2899 bzero (f->display.x, sizeof (struct x_display)); |
2900 f->display.x->icon_bitmap = -1; | 2900 f->display.x->icon_bitmap = -1; |
2901 | 2901 |
2902 f->display.x->icon_name | 2902 f->display.x->icon_name |
2903 = x_get_arg (parms, Qicon_name, "iconName", "Title", string); | 2903 = x_get_arg (parms, Qicon_name, "iconName", "Title", string); |
2904 if (! STRINGP (f->display.x->icon_name)) | |
2905 f->display.x->icon_name = Qnil; | |
2904 | 2906 |
2905 FRAME_X_DISPLAY_INFO (f) = dpyinfo; | 2907 FRAME_X_DISPLAY_INFO (f) = dpyinfo; |
2906 #ifdef MULTI_KBOARD | 2908 #ifdef MULTI_KBOARD |
2907 FRAME_KBOARD (f) = kb; | 2909 FRAME_KBOARD (f) = kb; |
2908 #endif | 2910 #endif |