From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Ergus Newsgroups: gmane.emacs.devel Subject: Re: Merging the underline attribute at EOL Date: Tue, 17 Dec 2019 15:13:45 +0100 Message-ID: <20191217141345.z3ldbj4nolrgmbqo@Ergus> References: <83eex771ky.fsf@gnu.org> <20191216161104.767sfxj7taabs5jl@Ergus> <83v9qg42vz.fsf@gnu.org> <20191216203156.oojz2o3uskxsgd5a@Ergus> <83lfrb4owb.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="tn4pxvgib3qt76gb" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="156950"; mail-complaints-to="usenet@blaine.gmane.org" Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Dec 17 15:14:57 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 1ihDcm-000eYP-AU for ged-emacs-devel@m.gmane.org; Tue, 17 Dec 2019 15:14:56 +0100 Original-Received: from localhost ([::1]:41018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihDcl-00047v-3j for ged-emacs-devel@m.gmane.org; Tue, 17 Dec 2019 09:14:55 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:52027) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihDc6-0002zo-GP for emacs-devel@gnu.org; Tue, 17 Dec 2019 09:14:19 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihDc4-0003hs-QH for emacs-devel@gnu.org; Tue, 17 Dec 2019 09:14:13 -0500 Original-Received: from sonic302-2.consmr.mail.bf2.yahoo.com ([74.6.135.41]:42382) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ihDc4-0003VT-Bi for emacs-devel@gnu.org; Tue, 17 Dec 2019 09:14:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aol.com; s=a2048; t=1576592050; bh=mLwnb3rhWomDaLwJMofiF7djqdaWMV0Pqm0OneS90Gc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From:Subject; b=hETaOZ54pS8Qu5UPTQ8qq7CDPP91mv9BeL6Rk4Xsrx0tR2LgGA0ah3eiUiugsKypCHqaADQODzf8CBRRNVWIf5xtkpSibylre5GCKdkCB+0Eshk7XGqFA7A8vGukKCU/2B27W46qx3G+KzSSDdHhfy/I95/rBkkXrWUMzdBdrjEmHEEsW29jHmMvEXIAkSI74vPEzOjOeoWZLFdZQm3RYUnKWbNFBHPcjhS8lq0M6PRelH0r3SPO4SbdfejN9n3AQcP24aYf78Kh3tPY2yceNH/UBS6JI+cNW3QfRfbMrkMbMMMyQoeFfiAFNHFphjacnxIL2tgqiwglLcj1rAlyxw== X-YMail-OSG: AhvOCAMVM1n6bkiBMSp6QcxQPGbkRIWeT4ilU3V7EJvtLuwAqKonjkVtm_k1HSJ Dgg0iUaplu1cLWuOlaljzlNI55I5l7CgN0EIHtFnExjkeS8OsaC0uiPYY_qPuAPywk45s7w_hka2 xT_FtvnzhswRrqgE0J4sH9w6VSFzLjMSOnIkJZADqKu1H90_bw5o381_0vhFH7AXJWBIE84e71ed bFBH2w_1CkcC5jVUUDjKWx5kSJB29IIGZwzxGWZYzvL.6q_3ypBlHpJhXIrGfXIjjbfY1NDD9AMU 04lA_6Sw93LTdsbW4Tea.FtqnQFPTTU3Gs1mt2kRsq8yMopKo470UB9mK0djycSA6nLqVLKHGI1S kOvKu19cEsFw_HNOG4V9Rc3V1VIR7rh7Ik0e8FoqtWLoiegKYcCckEHJW1GjTnNFLzdknrhfs.1x UHI.JvYW3aF27aiQvokrRIyuaJr0xe3thuSTCeF02IdNSwn6AWife_87aE64P9YMDoysP6dZUm22 hBEe3yq.8280NNcT56MbETlK_js2SBmgpACQrMUq6dDBijycmhyz0kFJVNBvlBMG07STu1VBZvMj TkrPlAKgCKpU62m.SWoSLATvgyDy_fasyivvsmHCGH7uv.0T5_LEiL1YdKWgy8HLcFq5pvaxlxR4 pOa7ZCjA..Cl5hwwTckcG2Rd0x31c0b8KZQO2kBu2WymA9mLQtPmAZRPwP_JlygnRlfpNh60vNu0 EPhq5AK7XblIT0_hN.bNNrADTAD0N74peImZJaoc1hwJP0J8i1g9UyR7e1eKmArQ9Q1AifIM2pv. 5nJYsrPiGbUxVTpvlXgWvifJOEALSawPtSejENgtMY Original-Received: from sonic.gate.mail.ne1.yahoo.com by sonic302.consmr.mail.bf2.yahoo.com with HTTP; Tue, 17 Dec 2019 14:14:10 +0000 Original-Received: by smtp410.mail.ir2.yahoo.com (Oath Hermes SMTP Server) with ESMTPA ID 885364a9e97de4554e98da971841629d; Tue, 17 Dec 2019 14:14:05 +0000 (UTC) Content-Disposition: inline In-Reply-To: <83lfrb4owb.fsf@gnu.org> X-Mailer: WebService/1.1.14873 hermes Apache-HttpAsyncClient/4.1.4 (Java/1.8.0_181) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 74.6.135.41 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:243438 Archived-At: --tn4pxvgib3qt76gb Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline Hi Eli: Please give a look to the attached patch I am still testing it. But just to check if it solves all the issues you see. Best Ergus On Tue, Dec 17, 2019 at 05:22:28AM +0200, Eli Zaretskii wrote: >> Date: Mon, 16 Dec 2019 21:31:56 +0100 >> From: Ergus >> Cc: emacs-devel@gnu.org >> >> I had build a wrong branch where I have actually added >> >> NILP (face->lface[LFACE_EXTEND_INDEX]) >> >> to the condition you mention. >> >> Actually the question is why there is only: >> >> face->box == FACE_NO_BOX >> >> Maybe we have to remove it and rely only in the extend attribute? > >If the extend attribute is set, but the background color is the same >as the default, and there's no box/underline/overline/strikethrough >attributes set, then we can still return early, no? > --tn4pxvgib3qt76gb Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="test.patch" diff --git a/src/xdisp.c b/src/xdisp.c index 08c6927052..fdf10894bf 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -21596,13 +21596,17 @@ extend_face_to_end_of_line (struct it *it) 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; /* Set the glyph row flag indicating that the face of the last glyph --tn4pxvgib3qt76gb--