From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.ciao.gmane.io!not-for-mail From: Robert Pluim Newsgroups: gmane.emacs.bugs Subject: bug#39865: 28.0.50; Emacs crash Date: Thu, 12 Mar 2020 11:25:06 +0100 Message-ID: References: <83fteryy4o.fsf@gnu.org> <837dzyuf20.fsf@gnu.org> <83a74tbc9v.fsf@gnu.org> <83tv2w9sa3.fsf@gnu.org> <83a74makvy.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="ciao.gmane.io:159.69.161.202"; logging-data="122007"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 39865@debbugs.gnu.org, viniciusjl@gmail.com To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Mar 12 11:29:14 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jCL5W-000VZq-4i for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 12 Mar 2020 11:29:14 +0100 Original-Received: from localhost ([::1]:38992 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCL5V-0001n1-4q for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 12 Mar 2020 06:29:13 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:39245) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCL2R-0006Tn-AS for bug-gnu-emacs@gnu.org; Thu, 12 Mar 2020 06:26:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCL2Q-0003CV-0I for bug-gnu-emacs@gnu.org; Thu, 12 Mar 2020 06:26:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:50034) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jCL2P-0003Bf-Pp for bug-gnu-emacs@gnu.org; Thu, 12 Mar 2020 06:26:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jCL2P-0003gQ-Mk for bug-gnu-emacs@gnu.org; Thu, 12 Mar 2020 06:26:01 -0400 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 Mar 2020 10:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39865 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: confirmed Original-Received: via spool by 39865-submit@debbugs.gnu.org id=B39865.158400871714044 (code B ref 39865); Thu, 12 Mar 2020 10:26:01 +0000 Original-Received: (at 39865) by debbugs.gnu.org; 12 Mar 2020 10:25:17 +0000 Original-Received: from localhost ([127.0.0.1]:56007 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jCL1h-0003eQ-Aa for submit@debbugs.gnu.org; Thu, 12 Mar 2020 06:25:17 -0400 Original-Received: from mail-wr1-f65.google.com ([209.85.221.65]:33865) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jCL1f-0003c1-3g for 39865@debbugs.gnu.org; Thu, 12 Mar 2020 06:25:15 -0400 Original-Received: by mail-wr1-f65.google.com with SMTP id z15so6703069wrl.1 for <39865@debbugs.gnu.org>; Thu, 12 Mar 2020 03:25:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :mime-version:content-transfer-encoding; bh=iRQuWkAO2ITfLxmro5d1+TExU3E8pvVxAtVW5FiNSC0=; b=VGyp8enbMuArFWTll0VAcP+kqDzmnly0qqWs1U9PhIMOAYY5KtIDX9z79PYvb01pDB 8H/nJtCQbafXZRVyutcX3zNCoaN4PhgM7R1Xpoqr/XuYEawohMZiwPxGEp5skE/QClFh zQBlRxOWpIO8NbbJkKXJRaOg460KWx/+rTGyod+/UzWMDYuE/beiFTtOk/fKux9ogzQx HqexhASsoGDTkNa64fH915Mfy+7hYbTnJEakH1t/SftsZUfqEUhDZct56UlgTcE0hmm9 /kN0EGzTSCWgPC29f2P1qk1OwIQ7uvPCkYhV6lSvaYUmXG94jBPKeD05nVB92wLorm++ MZOg== 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:date:in-reply-to :message-id:mime-version:content-transfer-encoding; bh=iRQuWkAO2ITfLxmro5d1+TExU3E8pvVxAtVW5FiNSC0=; b=Iuf9GVTWdMcSMmyLrjZZTnZsLQsuxrhWiiU7J9eO3CTgi5cE9CRCHGJnh7wJBAfwCS 9oiNpNBB1TVc13e+8NgpiavLCW29FtddU0iJ144AZrc9E/pdjt3rT5l2lYeaqpNtYFpA l7Q+rIst0FQ2mIs7roq0cjrNkGUOxDbBtTZ6ISyeDlGDTPxYqsDVrpVuVVCU+ZHSJcL0 Kh14dQbqR/llUGo/+7NRiQM8noY4bPVSYd3WqwOYdObeW2vvXt67Yjr7AfQQMpEvGhw7 qv1IZP++xrcNOnnM3/aarPXp1Vnf57evdBMpBG1Pilw/mqnvC3dYmUpzBQl62I1seMVe SkIA== X-Gm-Message-State: ANhLgQ0+UrlceUEuQEaS0IPq6ml+4askITFmx6WgiQi5pBMxJqUzU2EV xWK+WMtAwv4tn5lqVMg6lGQ= X-Google-Smtp-Source: ADFU+vtO08+6QuykAQksPiaIsVCwuQDc2eI3YDjjEMKQHCRFC8tsNccXI2eJHdEYDdaLnV1aZmuPpQ== X-Received: by 2002:adf:f148:: with SMTP id y8mr10156399wro.322.1584008709128; Thu, 12 Mar 2020 03:25:09 -0700 (PDT) Original-Received: from rpluim-mac ([149.5.228.1]) by smtp.gmail.com with ESMTPSA id s13sm23107126wrw.29.2020.03.12.03.25.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2020 03:25:08 -0700 (PDT) In-Reply-To: (Robert Pluim's message of "Thu, 12 Mar 2020 10:33:00 +0100") 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-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:177219 Archived-At: >>>>> On Thu, 12 Mar 2020 10:33:00 +0100, Robert Pluim s= aid: Robert> Of course, what I should do is rebase Robert> Robert> Yep, that fixes this for me. Of course it breaks the macOS buil= d, Robert> since that doesn=CA=BCt have a gui_default_font_parameter funct= ion Robert> (yet :-) ). Vinicius, the following patch should fix things for you. I=CA=BCll have to look at what's needed on the macOS side. diff --git a/src/dispextern.h b/src/dispextern.h index 6246c7c080..f08231f071 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -3726,6 +3726,7 @@ #define IMAGE_BACKGROUND_TRANSPARENT(img, f, mask) = \ Lisp_Object, Lisp_Object, const char *, const char *, enum resource_types); +extern void gui_default_font_parameter (struct frame *, Lisp_Object); =20 #ifndef HAVE_NS /* These both used on W32 and X only. */ extern bool gui_mouse_grabbed (Display_Info *); diff --git a/src/frame.c b/src/frame.c index 51fc78ab70..45fed8420c 100644 --- a/src/frame.c +++ b/src/frame.c @@ -4565,7 +4565,11 @@ gui_set_font_backend (struct frame *f, Lisp_Object n= ew_value, Lisp_Object old_va return; =20 if (FRAME_FONT (f)) - free_all_realized_faces (Qnil); + { + Lisp_Object frame; + XSETFRAME (frame, f); + free_all_realized_faces (frame); + } =20 new_value =3D font_update_drivers (f, NILP (new_value) ? Qt : new_value); if (NILP (new_value)) @@ -4579,10 +4583,8 @@ gui_set_font_backend (struct frame *f, Lisp_Object n= ew_value, Lisp_Object old_va =20 if (FRAME_FONT (f)) { - Lisp_Object frame; - - XSETFRAME (frame, f); - gui_set_font (f, Fframe_parameter (frame, Qfont), Qnil); + /* Reconsider default font after backend(s) change (Bug#23386). */ + gui_default_font_parameter (f, Qnil); face_change =3D true; windows_or_buffers_changed =3D 18; } diff --git a/src/xfns.c b/src/xfns.c index 5758bb7a18..ab013d85d8 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -3555,8 +3555,8 @@ do_unwind_create_frame (Lisp_Object frame) unwind_create_frame (frame); } =20 -static void -x_default_font_parameter (struct frame *f, Lisp_Object parms) +void +gui_default_font_parameter (struct frame *f, Lisp_Object parms) { struct x_display_info *dpyinfo =3D FRAME_DISPLAY_INFO (f); Lisp_Object font_param =3D gui_display_get_arg (dpyinfo, parms, Qfont, N= ULL, NULL, @@ -3894,7 +3894,7 @@ DEFUN ("x-create-frame", Fx_create_frame, Sx_create_f= rame, =20 /* Extract the window parameters from the supplied values that are needed to determine window geometry. */ - x_default_font_parameter (f, parms); + gui_default_font_parameter (f, parms); if (!FRAME_FONT (f)) { delete_frame (frame, Qnoelisp); @@ -6378,7 +6378,7 @@ x_create_tip_frame (struct x_display_info *dpyinfo, L= isp_Object parms) =20 /* Extract the window parameters from the supplied values that are needed to determine window geometry. */ - x_default_font_parameter (f, parms); + gui_default_font_parameter (f, parms); =20 gui_default_parameter (f, parms, Qborder_width, make_fixnum (0), "borderWidth", "BorderWidth", RES_TYPE_NUMBER);