procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Code for previous change

Browse source
This commit is contained in:
Daniel Colascione 2014-03-21 05:10:23 -07:00
parent c4beb8da58
commit aa46590754
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/xterm.c
View file

@ -7337,9 +7337,13 @@ x_bitmap_icon (struct frame *f, Lisp_Object file)
#ifdef USE_GTK
if (xg_set_icon (f, xg_default_icon_file)
|| xg_set_icon_from_xpm_data (f, gnu_xpm_bits))
return 0;
if (FRAME_DISPLAY_INFO (f)->icon_bitmap_id == -2
|| xg_set_icon (f, xg_default_icon_file)
|| xg_set_icon_from_xpm_data (f, gnu_xpm_bits))
{
FRAME_DISPLAY_INFO (f)->icon_bitmap_id = -2;
return 0;
}
#elif defined (HAVE_XPM) && defined (HAVE_X_WINDOWS)