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: Sun, 22 Dec 2019 23:46:39 +0100 Message-ID: <20191222224639.rbeslrfnivhenciv@Ergus> 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> <83woas1g1g.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="p3gzhecnipgxql2r" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="111765"; 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 Sun Dec 22 23:47:36 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 1ijA0a-000Stu-IR for ged-emacs-devel@m.gmane.org; Sun, 22 Dec 2019 23:47:33 +0100 Original-Received: from localhost ([::1]:51416 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ijA0Z-0004CF-0M for ged-emacs-devel@m.gmane.org; Sun, 22 Dec 2019 17:47:31 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:59076) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ijA0I-00049W-IZ for emacs-devel@gnu.org; Sun, 22 Dec 2019 17:47:15 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ijA0E-0004ht-3O for emacs-devel@gnu.org; Sun, 22 Dec 2019 17:47:14 -0500 Original-Received: from sonic309-14.consmr.mail.bf2.yahoo.com ([74.6.129.124]:41008) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ijA0D-0004V5-Ac for emacs-devel@gnu.org; Sun, 22 Dec 2019 17:47:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aol.com; s=a2048; t=1577054827; bh=VGNhg2uw4MQcsA/EHqY8BL6h/AUSctBpKWuxbbd22Og=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From:Subject; b=CRvLOZcmnZJ5lLzPtdKXjETP4ZNEjDNrg8UFd5w4jsMb9o9l7gBjNdXX0zqz1/98ggQk3Gnor478Hf3ln/sFVKBWZ/+4jIvYqLV7V6M0K1INNtCYePDlDcbHeTAg+p8Wz7zWgWGtR7MXb0Lgs3Iy8PKWbFQCC9eBRpkc0HfJtja7qcWUB4cymrlcR/yJDrbaUvi6bU2qov/REy8q1fR68BUcEDYI7YTIMACwoQlI7Zvpo0yTHdTbAB/7tZ0tu2SXXhZ6TTu5qBIKhTU+c64Ws83OZafw/LjlFBlwMd6EKrh/kcRe1Q23tz6jWPaQOyX2dveHUYEoV6OgixWaprqjiA== X-YMail-OSG: Ethce.wVM1lmfb53PFfCaBFfgwteZy.73rm6Cf7Ovi_SaZn4vMXN2sSDzVQ2Or2 hqnLIF9rX3oebgmZ2iL99WWveUgb1ZAzrflP5RKOnJY0BdnZee4Q6OeC.bvaISSaZXbld1J8QvBP K.sDNMem0CT28k6dQ2JYDtoCmMXpOLyu3LYEOXAbCo2F0hjGlloKt6_E5kJSbfX7gJOTwI5J489I quUUH04e9cJ_DodJ9gGBDr8VRBQMfEub5oMGWRKBy51En4R1RUD1WutIWgBuYj332c5L_0uzHSMc ohe7hHsGCC_NwnbPr8NtHbgZ96cWRaEXcpRfCuQfKYaiV_Y4stleoIYUZYm77_LWTwpclcar83M7 T6GtM51TDdMi2nPgSrAuI_sN3jeODv6Nj53LyNWZ.Q3kx4b_wyMVtD82mF_cqAAeFfYI1YiC_G6d gfGz66VGgKbBW5wVo_ZHA.q.cy2soRAG_3qoTUFqDJxh00a3bmLhgqh7hrPmcaBzjh7kuqSg9XLr KxB7U4MBk_LDanuxpxbTFaq9OtBAlWVwv3P5AlCvo4M5SaL5mPd.0GFZsnTXsd952vakHThj2RFZ k8xoSVTXxPneiCBhn53NOfvRArZzFJp5iIsP4omlHVQ.V1pTB1J350OgnV5G8jVjbqWR6eqPnUHo 9IA77h0UYmKzqv0tLd2d2R.FJALgzZBH9B68Kw2.TGGjIq2aYMZDCzcazGdLtB2dp0yMGCygDTif x9A8tLLpnrht.mGbGF0SmzdP3VF91_etf5jTR.BRTiwsa6uXkjTxYbKNrxNAmZ0D9kr7hxr91Ya4 40wIBtwj9JIaWVnCyYQQkWljniq4oCzwOV1gnaC4FA Original-Received: from sonic.gate.mail.ne1.yahoo.com by sonic309.consmr.mail.bf2.yahoo.com with HTTP; Sun, 22 Dec 2019 22:47:07 +0000 Original-Received: by smtp427.mail.ir2.yahoo.com (Oath Hermes SMTP Server) with ESMTPA ID 48f652ef703be034ff3c90892678f89c; Sun, 22 Dec 2019 22:47:00 +0000 (UTC) Content-Disposition: inline In-Reply-To: <83woas1g1g.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.129.124 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:243571 Archived-At: --p3gzhecnipgxql2r Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline Hi: Sorry for the big latency in my replies. Busy days. > >Mostly true (it could also be the "underlying" face when we render a >display string). > You're right > >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? > Then the simpler solution is the attached patch I have been using for some days... It just extends the conditions in the if (as you suggested since the beginning). If it is fine for you, then you can commit the patch for me. Of just tell me if there are more issues to fix. Best, Ergus --p3gzhecnipgxql2r Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="test.patch" diff --git a/src/xdisp.c b/src/xdisp.c index 2dfc4cbfeb..f7d0df714f 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -21601,8 +21601,8 @@ extend_face_to_end_of_line (struct it *it) one extra blank where we could display the cursor. */ if ((it->current_x >= it->last_visible_x + (!FRAME_WINDOW_P (f) - && it->glyph_row->reversed_p - && !it->glyph_row->continued_p)) + && it->glyph_row->reversed_p + && !it->glyph_row->continued_p)) /* If the window has display margins, we will need to extend their face even if the text area is filled. */ && !(WINDOW_LEFT_MARGIN_WIDTH (it->w) > 0 @@ -21623,13 +21623,16 @@ 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 + && 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 --p3gzhecnipgxql2r--