Merge from origin/emacs-24

[gnu-emacs] / src / frame.h

diff --git a/src/frame.h b/src/frame.h
index ddbf93e98f5b3fbd53ac1e47f9b71c3650be9f30..d4dfd1c8f949a6389a0f02fcdf56a4643a11225d 100644 (file)
--- 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));
 }