From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.bugs Subject: bug#19680: 24.4; option --no-bitmap-icon not working Date: Thu, 12 Mar 2015 12:03:34 -0400 Message-ID: References: <54C42121.7080602@crowcastle.net> <41vbifyx2o.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1426176260 27594 80.91.229.3 (12 Mar 2015 16:04:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 12 Mar 2015 16:04:20 +0000 (UTC) To: 19680-done@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Mar 12 17:04:12 2015 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YW5al-0003Ug-SF for geb-bug-gnu-emacs@m.gmane.org; Thu, 12 Mar 2015 17:04:12 +0100 Original-Received: from localhost ([::1]:32778 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YW5al-00035i-9A for geb-bug-gnu-emacs@m.gmane.org; Thu, 12 Mar 2015 12:04:11 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38955) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YW5ae-00035U-UU for bug-gnu-emacs@gnu.org; Thu, 12 Mar 2015 12:04:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YW5ad-0006W8-15 for bug-gnu-emacs@gnu.org; Thu, 12 Mar 2015 12:04:04 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:45564) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YW5ac-0006W2-TU for bug-gnu-emacs@gnu.org; Thu, 12 Mar 2015 12:04:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YW5ac-0001tM-PK for bug-gnu-emacs@gnu.org; Thu, 12 Mar 2015 12:04:02 -0400 Resent-From: Glenn Morris Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Thu, 12 Mar 2015 16:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 19680 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Mail-Followup-To: 19680@debbugs.gnu.org, rgm@gnu.org, frompreston2002315lt@crowcastle.net Original-Received: via spool by 19680-done@debbugs.gnu.org id=D19680.14261762197226 (code D ref 19680); Thu, 12 Mar 2015 16:04:02 +0000 Original-Received: (at 19680-done) by debbugs.gnu.org; 12 Mar 2015 16:03:39 +0000 Original-Received: from localhost ([127.0.0.1]:44131 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YW5aE-0001sU-Rj for submit@debbugs.gnu.org; Thu, 12 Mar 2015 12:03:39 -0400 Original-Received: from fencepost.gnu.org ([208.118.235.10]:37610 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YW5aC-0001sM-Gi for 19680-done@debbugs.gnu.org; Thu, 12 Mar 2015 12:03:37 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1YW5aA-0006oO-VF; Thu, 12 Mar 2015 12:03:35 -0400 X-Spook: TELINT SP4 militia BCCI JPL lynch Pine Gap codes X-Ran: f8DIp@,(w'FK{G`50f[&YX}{VXJQF1#NqfF{2d5&dhaV40.IsN{;!=a"!U&jsPX#+g{4$2 X-Hue: magenta X-Attribution: GM In-Reply-To: <41vbifyx2o.fsf@fencepost.gnu.org> (Glenn Morris's message of "Thu, 05 Mar 2015 16:05:19 -0500") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:100411 Archived-At: 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)); > }