Subject: Re: bug#19680: 24.4; option --no-bitmap-icon not working

From: Glenn Morris <[email-masked]>
Date: Thu, 12 Mar 2015 12:03:34 -0400

Version: 24.5

Applied to emacs-24 in the absence of any comments on the patch.

Glenn Morris wrote:

> --- a/src/frame.h
> +++ b/src/frame.h
> @@ -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));
>  }