emacs option --no-bitmap-icon does not work (#1199160)

Signed-off-by: Petr Hracek <phracek@redhat.com>

emacs-no-bitmap-icon.patch

@@ -0,0 +1,13 @@
+diff --git a/src/frame.h b/src/frame.h
+index ff696df..fc19768 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));
+ }
+ 

emacs.spec

@@ -3,7 +3,7 @@ Summary: GNU Emacs text editor
 Name:           emacs
 Epoch:          1
 Version:        24.4
-Release: 4%{?dist}
+Release:        5%{?dist}
 License:        GPLv3+ and CC0-1.0
 URL:            http://www.gnu.org/software/emacs/
 Group:          Applications/Editors
@@ -24,6 +24,7 @@ Patch1: emacs-spellchecker.patch
 # Fix for default PDF viewer bug #971162
 Patch2:         emacs-pdf-default.patch
 Patch3:         emacs-adds-extra-spaces.patch
+Patch4:         emacs-no-bitmap-icon.patch
 
 BuildRequires:  atk-devel cairo-devel freetype-devel fontconfig-devel dbus-devel giflib-devel glibc-devel libpng-devel
 BuildRequires:  libjpeg-devel libtiff-devel libX11-devel libXau-devel libXdmcp-devel libXrender-devel libXt-devel
@@ -150,6 +151,7 @@ packages that add functionality to Emacs.
 %patch1 -p1 -b .spellchecker
 %patch2 -p1 -b .pdf-default.patch
 %patch3 -p1 -b .add-extra-spaces
+%patch4 -p1 -b .no-bitmap-icon
 
 # We prefer our emacs.desktop file
 cp %SOURCE1 etc/emacs.desktop
@@ -433,6 +435,9 @@ update-desktop-database &> /dev/null || :
 %dir %{_datadir}/emacs/site-lisp/site-start.d
 
 %changelog
+* Fri Mar 27 2015 Petr Hracek <phracek@redhat.com> - 1:24.4-5
+- emacs option --no-bitmap-icon does not work (#1199160)
+
 * Wed Mar 04 2015 Petr Hracek <phracek@redhat.com> - 1:24.4-4
 - emacs adds extra spaces on copy/paste (#1161786)