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 19:08:40 +0400 Message-ID: <533AD678.7080307@yandex.ru> References: <533AC37A.7060703@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------050508080701060602000507" X-Trace: ger.gmane.org 1396364976 16274 80.91.229.3 (1 Apr 2014 15:09:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 1 Apr 2014 15:09:36 +0000 (UTC) Cc: 17125@debbugs.gnu.org To: "Peder O. Klingenberg" Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Apr 01 17:09:30 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 1WV0JX-0006dJ-MA for geb-bug-gnu-emacs@m.gmane.org; Tue, 01 Apr 2014 17:09:23 +0200 Original-Received: from localhost ([::1]:60911 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WV0JX-00040C-6p for geb-bug-gnu-emacs@m.gmane.org; Tue, 01 Apr 2014 11:09:23 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40726) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WV0JL-0003zo-3F for bug-gnu-emacs@gnu.org; Tue, 01 Apr 2014 11:09:18 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WV0JC-0008Rf-L6 for bug-gnu-emacs@gnu.org; Tue, 01 Apr 2014 11:09:11 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:58321) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WV0JC-0008Ra-Eb for bug-gnu-emacs@gnu.org; Tue, 01 Apr 2014 11:09:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1WV0JC-0008GO-1K for bug-gnu-emacs@gnu.org; Tue, 01 Apr 2014 11:09: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 15:09:01 +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.139636492731726 (code B ref 17125); Tue, 01 Apr 2014 15:09:01 +0000 Original-Received: (at 17125) by debbugs.gnu.org; 1 Apr 2014 15:08:47 +0000 Original-Received: from localhost ([127.0.0.1]:59500 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WV0Iw-0008Fb-Ar for submit@debbugs.gnu.org; Tue, 01 Apr 2014 11:08:47 -0400 Original-Received: from forward4l.mail.yandex.net ([84.201.143.137]:51535) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WV0Is-0008FS-T3 for 17125@debbugs.gnu.org; Tue, 01 Apr 2014 11:08:44 -0400 Original-Received: from smtp2h.mail.yandex.net (smtp2h.mail.yandex.net [84.201.187.145]) by forward4l.mail.yandex.net (Yandex) with ESMTP id 4CCF51440E29; Tue, 1 Apr 2014 19:08:41 +0400 (MSK) Original-Received: from smtp2h.mail.yandex.net (localhost [127.0.0.1]) by smtp2h.mail.yandex.net (Yandex) with ESMTP id E54DE1703F07; Tue, 1 Apr 2014 19:08:40 +0400 (MSK) Original-Received: from unknown (unknown [37.139.80.10]) by smtp2h.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id PL7E0Lc1wD-8eO86L9r; Tue, 1 Apr 2014 19:08:40 +0400 (using TLSv1 with cipher AES128-SHA (128/128 bits)) (Client certificate not present) X-Yandex-Uniq: eb8ef684-82ae-47a7-9b8b-b7a1808663e8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1396364920; bh=J4hdAIba5x0LH7sSAABxNUuEHodPWpfmnXDTR7ULAuw=; h=Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject: References:In-Reply-To:Content-Type; b=jg0TNV0rarfUV8w31l6N9mVbdUeCGmozMAzC7p/OfyyBXFvLT4ihaMDFt4xfiIDRs C0HNLPS8njnf1fDa2YpHZEjgvK/iSzH+kNRhmOgRuOTi1C6K4ceTkVKAeyp+8O7tSl Za29fInng3L73TgQjbKE8W0OiDTWV2YgNsmgo4CU= Authentication-Results: smtp2h.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:87594 Archived-At: This is a multi-part message in MIME format. --------------050508080701060602000507 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 04/01/2014 06:09 PM, Peder O. Klingenberg wrote: > I will do the breakpoint thing, but I'm out of time at the moment. I'll > get to it either later today or tomorrow. Don't; please try this patch instead (hopefully it fixes a bug in font_matching_entity). Dmitry --------------050508080701060602000507 Content-Type: text/x-patch; name="bug17125.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="bug17125.patch" === modified file 'src/composite.c' --- src/composite.c 2014-02-13 12:16:42 +0000 +++ src/composite.c 2014-04-01 14:06:38 +0000 @@ -223,7 +223,7 @@ if (INTEGERP (components)) key = Fmake_vector (make_number (1), components); else if (STRINGP (components) || CONSP (components)) - key = Fvconcat (1, &components); + key = vector1 (components); else if (VECTORP (components)) key = components; else if (NILP (components)) === modified file 'src/font.c' --- src/font.c 2014-03-03 19:58:20 +0000 +++ src/font.c 2014-04-01 14:32:00 +0000 @@ -2701,7 +2701,7 @@ if (prop < FONT_SPEC_MAX) val = Fcons (entity, val); } - return (Fvconcat (1, &val)); + return vector1 (val); } @@ -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 : vector1 (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))); @@ -2815,7 +2812,7 @@ entity = driver_list->driver->match (f, work); copy = copy_font_spec (work); ASET (copy, FONT_TYPE_INDEX, driver_list->driver->type); - XSETCDR (cache, Fcons (Fcons (copy, entity), XCDR (cache))); + XSETCDR (cache, Fcons (Fcons (copy, vector1 (entity)), XCDR (cache))); } if (! NILP (entity)) break; === modified file 'src/lisp.h' --- src/lisp.h 2014-03-27 22:52:14 +0000 +++ src/lisp.h 2014-04-01 14:07:02 +0000 @@ -3709,6 +3709,16 @@ return v; } +/* Fast path to avoid Fvconcat (1, &obj). */ + +INLINE Lisp_Object +vector1 (Lisp_Object obj) +{ + Lisp_Object v = make_uninit_vector (1); + ASET (v, 0, obj); + return v; +} + extern struct Lisp_Vector *allocate_pseudovector (int, int, enum pvec_type); #define ALLOCATE_PSEUDOVECTOR(typ,field,tag) \ ((typ*) \ --------------050508080701060602000507--