From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Merging the underline attribute at EOL Date: Thu, 19 Dec 2019 17:38:51 +0200 Message-ID: <83woas1g1g.fsf@gnu.org> References: <83eex771ky.fsf@gnu.org> <20191216161104.767sfxj7taabs5jl@Ergus> <83v9qg42vz.fsf@gnu.org> <20191216203156.oojz2o3uskxsgd5a@Ergus> <83lfrb4owb.fsf@gnu.org> <20191217141345.z3ldbj4nolrgmbqo@Ergus> <834kxy50rk.fsf@gnu.org> <20191219011910.bhvwrcco56uv2znm@Ergus> Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="63307"; mail-complaints-to="usenet@blaine.gmane.org" Cc: emacs-devel@gnu.org To: Ergus Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Dec 19 16:39:07 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.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1ihxtK-000GKA-H1 for ged-emacs-devel@m.gmane.org; Thu, 19 Dec 2019 16:39:06 +0100 Original-Received: from localhost ([::1]:43704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihxtJ-0008LG-76 for ged-emacs-devel@m.gmane.org; Thu, 19 Dec 2019 10:39:05 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:39561) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihxtD-0008GG-8U for emacs-devel@gnu.org; Thu, 19 Dec 2019 10:39:00 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:35140) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ihxtC-0007Kl-TI; Thu, 19 Dec 2019 10:38:58 -0500 Original-Received: from [176.228.60.248] (port=2648 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1ihxtC-00030I-30; Thu, 19 Dec 2019 10:38:58 -0500 In-reply-to: <20191219011910.bhvwrcco56uv2znm@Ergus> (message from Ergus on Thu, 19 Dec 2019 02:19:10 +0100) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 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:243477 Archived-At: > Date: Thu, 19 Dec 2019 02:19:10 +0100 > From: Ergus > Cc: emacs-devel@gnu.org > > >> if (FRAME_WINDOW_P (f) > >> && MATRIX_ROW_DISPLAYS_TEXT_P (it->glyph_row) > >> - && face->box == FACE_NO_BOX > >> && FACE_COLOR_TO_PIXEL (face->background, f) == FRAME_BACKGROUND_PIXEL (f) > >> #ifdef HAVE_WINDOW_SYSTEM > >> && !face->stipple > >> #endif > >> && !it->glyph_row->reversed_p > >> - && !Vdisplay_fill_column_indicator) > >> + && !Vdisplay_fill_column_indicator > >> + && (NILP (face->lface[LFACE_EXTEND_INDEX]) > >> + ||(face->box == FACE_NO_BOX > >> + && face->underline == FACE_NO_UNDERLINE > >> + && face->overline_p == false > >> + && face->strike_through_p == false))) > >> return; > > > >I don't think I understand the test for the :extend attribute being > >non-nil. Can you explain why you added it? In general, faces that we > >treat as "base face" when we start face merging don't need to have the > >:extend attribute set (see, for example, the tool-bar face), but we > >still want to apply them to the space past EOL. Am I missing > >something? Did you bump into some scenario where this attribute > >caused some regression or bad results? > > > >Thanks. > > > Hi Eli: > > I just added that test (probably not the best one) for the case where > the face is the default face. Actually the merge we use (with the > filter) asserts that the resulting face will be :extend t or the default > face (AFAIR). Mostly true (it could also be the "underlying" face when we render a display string). > So at this point I thought (probably wrong) that only the default face > could have :extend nil and we could exit early in that case... But if > there are some cases that I am not considering we can remove that. But if the default face has underline or overline or box etc., attributes, we don't want to exit early, even though its background color is the default, right?