From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Alex Gramiak Newsgroups: gmane.emacs.devel,gmane.emacs.diffs Subject: Re: master updated (05b7953 -> b2b1ccb) Date: Mon, 20 May 2019 12:54:36 -0600 Message-ID: <87mujhufbn.fsf@gmail.com> References: <20190520020459.10030.99221@vcs0.savannah.gnu.org> <87r28tufo4.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="52665"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) Cc: emacs-diffs@gnu.org, emacs-devel@gnu.org To: Lars Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon May 20 20:54:47 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hSnQt-000Da4-2w for ged-emacs-devel@m.gmane.org; Mon, 20 May 2019 20:54:47 +0200 Original-Received: from localhost ([127.0.0.1]:40454 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hSnQs-0002VR-4b for ged-emacs-devel@m.gmane.org; Mon, 20 May 2019 14:54:46 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:54137) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hSnQl-0002VG-Dg for emacs-devel@gnu.org; Mon, 20 May 2019 14:54:40 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hSnQj-0000jJ-Gb for emacs-devel@gnu.org; Mon, 20 May 2019 14:54:38 -0400 Original-Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]:33466) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hSnQg-0000hw-Sn; Mon, 20 May 2019 14:54:35 -0400 Original-Received: by mail-pf1-x436.google.com with SMTP id z28so7684646pfk.0; Mon, 20 May 2019 11:54:34 -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 :user-agent:mime-version; bh=hPJDB7aGSWeE5jSJu+j6JDQtUH9EEsL/Vl9GzLTGSwE=; b=i1IurqnXKWxGfs8HsFko6Eppr8EnxAbxZ0VD4Up9fGEc7RkH/8hI3sJu0bDnX6rEST zMVnDRtLT0HH370QnX8xL05EebOkMBSGqXClgxzW/4l1shm4xP+KMVpgDX6l9YcHpsGR CBAXTz+kkzZOZtAs1v5BX4CLPPZU3QydLB7HGNk9Umt1ddacKQhecN5LJxCPAdoMQRHR CDp1C//JmB2q76jGkh/rLTJmgdMAnwWgrstJHKdsIxOFwr2BEalxaf7iwlz1SaiSBgHx YlKZObwIwDuh1TUB2beA4I215/GmwUUwnanvPh8jw3/sCdJ7IrGP/EUthu2j1QABAaEI ZWIA== 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:user-agent:mime-version; bh=hPJDB7aGSWeE5jSJu+j6JDQtUH9EEsL/Vl9GzLTGSwE=; b=NeNtXIi1e/qJ7X/KAFiAzGG3AAWG031zObRBEGPgTrSyNLfOZMEwKUynXIJuMZWwl2 rAW4ajaWCC/pNpxXESZ3HaBS0vD6robyAAA3aXIre5nz0wavHEkh9Up7BrXq9HquFUDs TQNnHBUF7FqN3M6/+hYQXpYnV4iajILSpofrJOOXoSsm0SHDJmFm8dHknmeOosyVpw+0 pYrVa5xuPRH67brocUUxB3P8XxZpV1wG+FwhaGuDq5bB+z7AI5v4MiwIuSVxddSavXkx J8fel68IAiF+lRuYvs003LQ5BBDLkUG55L83m5i1OwRc8WvPJ51y4F4A2lL4iZwr+JmO Qbog== X-Gm-Message-State: APjAAAV1S7ekDAD0F6ltvUjhhekRgc/jdGboIm1HlKlZNLLr94pPVH38 ii2+x8IzmsHmcBsyJdrgbfjV/ZLk X-Google-Smtp-Source: APXvYqw9r3bMQmi5xWbx4dCTlSN4Y6SV4NHYo4bdPBZtN/9wtDaS+veZkM9M4Ep4Ni1+EFJZP73MRg== X-Received: by 2002:a63:e406:: with SMTP id a6mr78091161pgi.132.1558378473129; Mon, 20 May 2019 11:54:33 -0700 (PDT) Original-Received: from lylat ([2604:3d09:e37f:1500:1a72:4878:e793:7302]) by smtp.gmail.com with ESMTPSA id a11sm11297667pff.128.2019.05.20.11.54.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 May 2019 11:54:32 -0700 (PDT) In-Reply-To: <87r28tufo4.fsf@gmail.com> (Alex Gramiak's message of "Mon, 20 May 2019 12:47:07 -0600") X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::436 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:236817 gmane.emacs.diffs:150212 Archived-At: --=-=-= Content-Type: text/plain Alex Gramiak writes: > The below diff should silence the warnings. > > diff --git a/src/xdisp.c b/src/xdisp.c > index c561ea9e36..ca95f8f944 100644 > --- a/src/xdisp.c > +++ b/src/xdisp.c > @@ -26430,7 +26430,10 @@ normal_char_ascent_descent (struct font *font, int c, int *ascent, int *descent) > { > struct font_metrics *pcm = get_per_char_metric (font, &char2b); > > - if (!(pcm->width == 0 && pcm->rbearing == 0 && pcm->lbearing == 0)) > + if (!(pcm > + && pcm->width == 0 > + && pcm->rbearing == 0 > + && pcm->lbearing == 0)) > { > /* We add 1 pixel to character dimensions as heuristics > that produces nicer display, e.g. when the face has Whoops, the pcm check shouldn't happen inside the negation. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=pcm.diff Content-Description: pcm v2 diff --git a/src/xdisp.c b/src/xdisp.c index c561ea9e36..2d417be03e 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -26430,7 +26430,9 @@ normal_char_ascent_descent (struct font *font, int c, int *ascent, int *descent) { struct font_metrics *pcm = get_per_char_metric (font, &char2b); - if (!(pcm->width == 0 && pcm->rbearing == 0 && pcm->lbearing == 0)) + if (pcm && !(pcm->width == 0 + && pcm->rbearing == 0 + && pcm->lbearing == 0)) { /* We add 1 pixel to character dimensions as heuristics that produces nicer display, e.g. when the face has @@ -28479,8 +28481,10 @@ gui_produce_glyphs (struct it *it) if (get_char_glyph_code (it->char_to_display, font, &char2b)) { pcm = get_per_char_metric (font, &char2b); - if (pcm->width == 0 - && pcm->rbearing == 0 && pcm->lbearing == 0) + if (pcm + && pcm->width == 0 + && pcm->rbearing == 0 + && pcm->lbearing == 0) pcm = NULL; } @@ -28742,8 +28746,10 @@ gui_produce_glyphs (struct it *it) if (get_char_glyph_code (' ', font, &char2b)) { pcm = get_per_char_metric (font, &char2b); - if (pcm->width == 0 - && pcm->rbearing == 0 && pcm->lbearing == 0) + if (pcm + && pcm->width == 0 + && pcm->rbearing == 0 + && pcm->lbearing == 0) pcm = NULL; } --=-=-=--