From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Robert Pluim Newsgroups: gmane.emacs.bugs Subject: bug#38564: 27.0.50; macOS "emacs -nw" git-gutter-mode segfault Date: Thu, 12 Dec 2019 08:45:11 +0100 Message-ID: References: <20191211193734.GA2806@breton.holly.idiocy.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="32733"; mail-complaints-to="usenet@blaine.gmane.org" Cc: Mike Hamrick , 38564@debbugs.gnu.org To: Alan Third Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Dec 12 08:46:16 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1ifJAu-0008Mz-5I for geb-bug-gnu-emacs@m.gmane.org; Thu, 12 Dec 2019 08:46:16 +0100 Original-Received: from localhost ([::1]:55642 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifJAr-0005Io-NT for geb-bug-gnu-emacs@m.gmane.org; Thu, 12 Dec 2019 02:46:13 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:48745) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifJAh-0005Ih-MU for bug-gnu-emacs@gnu.org; Thu, 12 Dec 2019 02:46:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifJAg-0001jD-Iq for bug-gnu-emacs@gnu.org; Thu, 12 Dec 2019 02:46:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:53018) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifJAg-0001iZ-Cb for bug-gnu-emacs@gnu.org; Thu, 12 Dec 2019 02:46:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ifJAg-0004oV-BM for bug-gnu-emacs@gnu.org; Thu, 12 Dec 2019 02:46:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Robert Pluim Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 12 Dec 2019 07:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38564 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: fixed Original-Received: via spool by 38564-submit@debbugs.gnu.org id=B38564.157613672116330 (code B ref 38564); Thu, 12 Dec 2019 07:46:02 +0000 Original-Received: (at 38564) by debbugs.gnu.org; 12 Dec 2019 07:45:21 +0000 Original-Received: from localhost ([127.0.0.1]:58991 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ifJA0-0004F0-Kx for submit@debbugs.gnu.org; Thu, 12 Dec 2019 02:45:20 -0500 Original-Received: from mail-wr1-f48.google.com ([209.85.221.48]:42987) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ifJ9z-00049v-R9 for 38564@debbugs.gnu.org; Thu, 12 Dec 2019 02:45:20 -0500 Original-Received: by mail-wr1-f48.google.com with SMTP id q6so1547985wro.9 for <38564@debbugs.gnu.org>; Wed, 11 Dec 2019 23:45:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:gmane-reply-to-list:date:in-reply-to :message-id:mime-version:content-transfer-encoding; bh=aacGvNecjAmbPiA1B4aof3HJ1Q3kZOy0XORSwLpVguc=; b=SOz25xFLv6ODpGJf4Vml9806gdKlawW6xXXjacygXNcjMj/CRrwyiJK6cJPyaEA8Vq KK4Mz9GE5jWpHJJvIShGENg3b0OW2D/yVVKyeWHyyIbuCLaPJjK40t1PWz74siuG8qt1 kA09S+OA+hFFFdvMI+MMN1ufp5xV6dcsSO9a2CVdFY9o7r8If1YJUOk9LXYwuJAdzwfE yGtmSIUAQ49LMgAcvLk13MiWP6xmpItjF5ZMPajo4JvC0u5VHvhkNkVsdGZHuVif7jkK cSl+1gshVhDleEVcFrjHmsg2laOhFvz9H3n9B7cYJTMIl93HTnTNGUAEChRZiL8BM+pk zc9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references :gmane-reply-to-list:date:in-reply-to:message-id:mime-version :content-transfer-encoding; bh=aacGvNecjAmbPiA1B4aof3HJ1Q3kZOy0XORSwLpVguc=; b=B2Yb9gmFz7w2j58wtqqkE4mA94AdZ1ZkrDyDHgwsoNITLKVgnv6eaWDTfn8I2D9g7v oGn0jSdNxkegJ+fdhu16zOku26ferh51P3xdXooAviohLmcqwejkuIvT5FvLU6HqupgU Q+5+QBBNdcf6WNaLQeIVFVYGwgPbtpJzKDgxB5GDywFPkKHsn+nIbUW4NYTsA8Lw1jXX 3RG6uD7YLqUL2P58W5x0dk6gfJHaaERAwVAwkPNuwNvvi2UreUKjZpwueOfMYY3iIo+3 MNdr5U9i1xhHT3tlHvq1OOHUERxxQiBOa8dD4JX9BhSNetUMKN7ZC/KM5XSUoaUL39cn mTEg== X-Gm-Message-State: APjAAAXdpv8e4mx1S301TabJfLrYqgowLBAghETyZTgydnKxxfWhjBN8 vmNJIvCBEB3M6P39Qs3r+lUmrXwgLIY= X-Google-Smtp-Source: APXvYqyOSifO2f8V2/jrI4cnWa7ic7qOEvXRwkQ9m/IRQHd8U9uj+Zt/zG3Cf2tHSbOhWQ58G76l5g== X-Received: by 2002:a5d:6551:: with SMTP id z17mr4789311wrv.269.1576136713436; Wed, 11 Dec 2019 23:45:13 -0800 (PST) Original-Received: from rpluim-mac ([149.5.228.1]) by smtp.gmail.com with ESMTPSA id m7sm5119878wma.39.2019.12.11.23.45.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 23:45:12 -0800 (PST) Gmane-Reply-To-List: yes In-Reply-To: <20191211193734.GA2806@breton.holly.idiocy.org> (Alan Third's message of "Wed, 11 Dec 2019 19:37:34 +0000") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.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" Xref: news.gmane.org gmane.emacs.bugs:173211 Archived-At: >>>>> On Wed, 11 Dec 2019 19:37:34 +0000, Alan Third said: Alan> On Wed, Dec 11, 2019 at 11:12:41AM +0100, Robert Pluim wrote: >> Right idea, but one layer lower than needed. ns_color_index_to_rgba >> should not be calling ns_lookup_indexed_color in non-gui mode. Try >> this instead: Alan> Hi Robert, thanks for sorting this. One thing... >> + if (FRAME_DISPLAY_INFO (f)) Alan> Would it not be better to use FRAME_NS_P? Yes. In fact, how about reverting my change to ns_color_index_to_rgba and doing this instead (you can=CA=BCt use FRAME_DISPLAY_INFO in dispextern.h without much bigger changes): diff --git i/src/dispextern.h w/src/dispextern.h index 0615b16d71..4bf9f39cd0 100644 --- i/src/dispextern.h +++ w/src/dispextern.h @@ -123,7 +123,9 @@ #define NativeRectangle XRectangle #ifdef HAVE_NS #include "nsgui.h" -#define FACE_COLOR_TO_PIXEL(face_color, frame) ns_color_index_to_rgba(face= _color, frame) +#define FACE_COLOR_TO_PIXEL(face_color, frame) (FRAME_NS_P (frame) \ + ? ns_color_index_to_rgba (= face_color, frame) \ + : face_color) /* Following typedef needed to accommodate the MSDOS port, believe it or n= ot. */ typedef struct ns_display_info Display_Info; typedef Emacs_Pixmap Emacs_Pix_Container;