Commit cc113215 authored by Glenn Morris's avatar Glenn Morris

Fix --no-bitmap-icon

* 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
parent b21a56ac
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
......
......@@ -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));
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment