[Emacs-diffs] emacs-24 cc11321: Fix --no-bitmap-icon

[Glenn Morris]

branch: emacs-24
commit cc1132158206626d9cab7b98ca68e8ca43dddc8c
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    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
---
 src/ChangeLog |    5 +++++
 src/frame.h   |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index ca5f85a..90908fc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-12  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * search.c (find_newline): Avoid assertion violations in
diff --git a/src/frame.h b/src/frame.h
index 3d3982f..bc49cfa 100644
--- 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));
 }