From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Antipov Newsgroups: gmane.emacs.bugs Subject: bug#17125: Acknowledgement (24.4.50; daemon mode: closing X client frame exits entire emacs) Date: Tue, 01 Apr 2014 20:27:44 +0400 Message-ID: <533AE900.5040507@yandex.ru> References: <533AC37A.7060703@yandex.ru> <533AD678.7080307@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------050404020608000603000909" X-Trace: ger.gmane.org 1396369710 12528 80.91.229.3 (1 Apr 2014 16:28:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 1 Apr 2014 16:28:30 +0000 (UTC) Cc: "Peder O. Klingenberg" , 17125@debbugs.gnu.org To: Andreas Schwab Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Apr 01 18:28:24 2014 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 1WV1Xx-0000kB-08 for geb-bug-gnu-emacs@m.gmane.org; Tue, 01 Apr 2014 18:28:21 +0200 Original-Received: from localhost ([::1]:33175 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WV1Xw-0001yl-JB for geb-bug-gnu-emacs@m.gmane.org; Tue, 01 Apr 2014 12:28:20 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58125) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WV1Xm-0001yV-PN for bug-gnu-emacs@gnu.org; Tue, 01 Apr 2014 12:28:17 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WV1Xf-00018V-8v for bug-gnu-emacs@gnu.org; Tue, 01 Apr 2014 12:28:10 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:58408) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WV1Xf-00018R-29 for bug-gnu-emacs@gnu.org; Tue, 01 Apr 2014 12:28:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1WV1Xe-00035t-4W for bug-gnu-emacs@gnu.org; Tue, 01 Apr 2014 12:28:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Antipov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 01 Apr 2014 16:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 17125 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 17125-submit@debbugs.gnu.org id=B17125.139636967311871 (code B ref 17125); Tue, 01 Apr 2014 16:28:02 +0000 Original-Received: (at 17125) by debbugs.gnu.org; 1 Apr 2014 16:27:53 +0000 Original-Received: from localhost ([127.0.0.1]:59590 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WV1XV-00035P-46 for submit@debbugs.gnu.org; Tue, 01 Apr 2014 12:27:53 -0400 Original-Received: from forward10l.mail.yandex.net ([84.201.143.143]:42524) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WV1XR-000356-7H for 17125@debbugs.gnu.org; Tue, 01 Apr 2014 12:27:50 -0400 Original-Received: from smtp1h.mail.yandex.net (smtp1h.mail.yandex.net [84.201.187.144]) by forward10l.mail.yandex.net (Yandex) with ESMTP id 5D9B5BA0BCA; Tue, 1 Apr 2014 20:27:45 +0400 (MSK) Original-Received: from smtp1h.mail.yandex.net (localhost [127.0.0.1]) by smtp1h.mail.yandex.net (Yandex) with ESMTP id D67921340777; Tue, 1 Apr 2014 20:27:44 +0400 (MSK) Original-Received: from unknown (unknown [37.139.80.10]) by smtp1h.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id gZmy6TxnJV-RiJK0qF9; Tue, 1 Apr 2014 20:27:44 +0400 (using TLSv1 with cipher AES128-SHA (128/128 bits)) (Client certificate not present) X-Yandex-Uniq: a0045916-676d-4885-8f1f-23136f69f66e DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1396369664; bh=J1aX2+3yQ88PSnuMLMG3jWTcHI2xqod+lQBJGWBjTE4=; h=Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject: References:In-Reply-To:Content-Type; b=n5/Hyhg77AzKIqEVHNg/7/KBL4goKGbkOk+T7H1OmFzj3R8wsvYknKAvLFZQ7vYS9 aXZTAWPTvREXWVexP8vYuzQVecKHMs6MHqxtjvBbZX/4MOUoPH+nntpB/sMCZPE7md d3VDfu0vz5LCEP3Zr0UO/eAsMrnvvuKNWi+nH47M= Authentication-Results: smtp1h.mail.yandex.net; dkim=pass header.i=@yandex.ru User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 In-Reply-To: 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:87600 Archived-At: This is a multi-part message in MIME format. --------------050404020608000603000909 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 04/01/2014 07:27 PM, Andreas Schwab wrote: > This is not a useful comment. Fvconcat(1,&obj) and vector1(obj) have > quite different semantics. The latter creates a one-element vector > containing obj (same as Fvector(1,&obj)), whereas the former creates a > vector from all elements in obj. Argh, that was a horrible mistake. Thanks. Peder, please try this instead. Dmitry --------------050404020608000603000909 Content-Type: text/x-patch; name="bug17125_fixed.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="bug17125_fixed.patch" === modified file 'src/font.c' --- src/font.c 2014-03-03 19:58:20 +0000 +++ src/font.c 2014-04-01 16:23:43 +0000 @@ -2756,10 +2756,7 @@ Lisp_Object copy; val = driver_list->driver->list (f, scratch_font_spec); - if (NILP (val)) - val = zero_vector; - else - val = Fvconcat (1, &val); + val = NILP (val) ? zero_vector : Fvconcat (1, &val); copy = copy_font_spec (scratch_font_spec); ASET (copy, FONT_TYPE_INDEX, driver_list->driver->type); XSETCDR (cache, Fcons (Fcons (copy, val), XCDR (cache))); @@ -2813,6 +2810,7 @@ else { entity = driver_list->driver->match (f, work); + entity = NILP (entity) ? zero_vector : Fvconcat (1, &entity); copy = copy_font_spec (work); ASET (copy, FONT_TYPE_INDEX, driver_list->driver->type); XSETCDR (cache, Fcons (Fcons (copy, entity), XCDR (cache))); --------------050404020608000603000909--