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

Fix --no-bitmap-icon

Browse source 
* src/frame.h (x_set_bitmap_icon): Don't set the icon if icon-type is
nil/not present in the parameter alist.

Fixes: debbugs:19680
This commit is contained in:
Glenn Morris 2015-03-12 08:59:56 -07:00
parent b21a56ac91
commit cc11321582
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2015-03-12 Glenn Morris <rgm@gnu.org>
* frame.h (x_set_bitmap_icon): Don't set the icon if icon-type is
nil/not present in the parameter alist. (Bug#19680)
2015-02-28 Eli Zaretskii <eliz@gnu.org>
* search.c (find_newline): Avoid assertion violations in

2
src/frame.h
View file

@ -1349,7 +1349,7 @@ x_set_bitmap_icon (struct frame *f)
{
Lisp_Object obj = assq_no_quit (Qicon_type, f->param_alist);
if (CONSP (obj))
if (CONSP (obj) && !NILP (XCDR (obj)))
x_bitmap_icon (f, XCDR (obj));
}