2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1b1a9c59033..bdec3c9cde1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-18  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-03-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * alloc.c (purecopy): Handle hash-tables.
diff --git a/src/frame.h b/src/frame.h
index ddbf93e98f5..d4dfd1c8f94 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -1425,7 +1425,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));
 }