From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Dario Gjorgjevski Newsgroups: gmane.emacs.bugs Subject: bug#35452: Line number faces should check for remapping of the default face Date: Sat, 27 Apr 2019 14:52:10 +0200 Message-ID: <878svvehl1.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="59150"; mail-complaints-to="usenet@blaine.gmane.org" To: 35452@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Apr 27 17:49:15 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1hKPZi-000F8L-Hx for geb-bug-gnu-emacs@m.gmane.org; Sat, 27 Apr 2019 17:49:14 +0200 Original-Received: from localhost ([127.0.0.1]:33451 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hKPZh-0004RX-Hv for geb-bug-gnu-emacs@m.gmane.org; Sat, 27 Apr 2019 11:49:13 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:54705) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hKPZY-0004RR-2i for bug-gnu-emacs@gnu.org; Sat, 27 Apr 2019 11:49:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hKPZX-00059g-5e for bug-gnu-emacs@gnu.org; Sat, 27 Apr 2019 11:49:04 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:50469) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hKPZW-00059C-UR for bug-gnu-emacs@gnu.org; Sat, 27 Apr 2019 11:49:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hKPZW-0006TJ-Lr for bug-gnu-emacs@gnu.org; Sat, 27 Apr 2019 11:49:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dario Gjorgjevski Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 27 Apr 2019 15:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 35452 X-GNU-PR-Package: emacs X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.155638013424860 (code B ref -1); Sat, 27 Apr 2019 15:49:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 27 Apr 2019 15:48:54 +0000 Original-Received: from localhost ([127.0.0.1]:35780 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKPZO-0006St-Cc for submit@debbugs.gnu.org; Sat, 27 Apr 2019 11:48:54 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:41824) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hKMpX-00085N-HG for submit@debbugs.gnu.org; Sat, 27 Apr 2019 08:53:23 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:44324) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hKMpS-0004qX-97 for submit@debbugs.gnu.org; Sat, 27 Apr 2019 08:53:18 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:56178) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hKMpO-00058V-SY for bug-gnu-emacs@gnu.org; Sat, 27 Apr 2019 08:53:18 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hKMpN-0004jH-Kw for bug-gnu-emacs@gnu.org; Sat, 27 Apr 2019 08:53:14 -0400 Original-Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:40240) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hKMpN-0004UT-D8 for bug-gnu-emacs@gnu.org; Sat, 27 Apr 2019 08:53:13 -0400 Original-Received: by mail-wm1-x32f.google.com with SMTP id h11so8292479wmb.5 for ; Sat, 27 Apr 2019 05:53:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=A+AS6vgvaw0o2ILtEHIW6rK2P/lg6u2DY0I0S0uY1Hk=; b=JIvJ3sqGUfRJjEETyXCYoR5D01oPvNA1fs8MObljUVE+hKozt83AJm014lozBxBzkE uEm9c6E7Yn7AeFV/iSNVEzYhojbNx/I5cgqJCaFk3SmcP46zTkwczT/bc5wWZFy2uOC7 WgjdpWvIL7sjd4VY9FpjsuUGObyjW95hexMK+U0Grz5HV7ePhDHuYytajSZoBs5G8CSQ ljRZSbeJNHBg9mZOuSfQWM3xBU9t8y4BObV8pbOMgVnhm6qYQGVwI/OVtjDk1j+pQ8jM gS1kj73Yn3T1VeRE9OKJKl13DtrMqS0mWIqJ5SKCvEA7cNDFAnf05aDc1nsf34ErLU45 aVWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=A+AS6vgvaw0o2ILtEHIW6rK2P/lg6u2DY0I0S0uY1Hk=; b=pxfR7F16W0/I9XLaqo9oILVmtHtLrZ9qhjze9ghAcwzRvxHtdqVTT1RSan1QvPQsFA BhJ702ka/p0oKiMZtGtXwjh6UjzmkpX3/oP+i2QHxr3DvAzKZFUqFQlv51oQPS+izAPY br06frRywhJq0no5jz0rpdfniUWFjD7o0z0NcNq9nGns9OoWtNy0/3avZsxoMXM0/ngY TtYvuBNs4vWGa2+7zmpASR0IPfbH/idbNil0/VhYpEULF9F0Ci1KIM5kZtGjv2DLzcio XQT4e3mpJt53wVrnrQkYQomMJwAyzII/O+t1uolhHNkAdA1n8TQd8cwjWMOo4eyls27B XpQQ== X-Gm-Message-State: APjAAAUuhE4HLQ3daR0fgoaX7kJ1gHlMwrQQwpfLYi6u/7zomzxO/DZN 4aqt2L56ICxOmkf79cBliSbjC3T74ao= X-Google-Smtp-Source: APXvYqzQ0g9R/kMIlYcM/OhgbWxP4NvloJXPepTUbiC4jdcmRFRDmMRoXkPnSJsSYA+OCicBtExNfA== X-Received: by 2002:a7b:c086:: with SMTP id r6mr10885494wmh.123.1556369580538; Sat, 27 Apr 2019 05:53:00 -0700 (PDT) Original-Received: from dario-XPS-13-9370 ([77.28.239.119]) by smtp.gmail.com with ESMTPSA id h84sm30784245wmf.15.2019.04.27.05.52.59 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 27 Apr 2019 05:52:59 -0700 (PDT) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Mailman-Approved-At: Sat, 27 Apr 2019 11:48:53 -0400 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.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:158355 Archived-At: Currently, the line number faces do not check for remapping of the default face and use its attributes directly. In the default configuration, this has no adverse effects since the `line-number' face inherits from `default' explicitly, so any remapping is considered there. However, there is no need to have `line-number' inherit from `default' explicitly since it already merges DEFAULT_FACE_ID. Instead, we can check for remapping of DEFAULT_FACE_ID prior to merging the faces. The patch shown below accomplishes that. diff --git a/src/xdisp.c b/src/xdisp.c index d52d1333a0..1e7e31fb8a 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -21176,9 +21176,10 @@ maybe_produce_line_number (struct it *it) char lnum_buf[INT_STRLEN_BOUND (ptrdiff_t) + 1]; bool beyond_zv = IT_BYTEPOS (*it) >= ZV_BYTE ? true : false; ptrdiff_t lnum_offset = -1; /* to produce 1-based line numbers */ - int lnum_face_id = merge_faces (it->w, Qline_number, 0, DEFAULT_FACE_ID); + int base_face_id = lookup_basic_face (it->w, it->f, DEFAULT_FACE_ID); + int lnum_face_id = merge_faces (it->w, Qline_number, 0, base_face_id); int current_lnum_face_id - = merge_faces (it->w, Qline_number_current_line, 0, DEFAULT_FACE_ID); + = merge_faces (it->w, Qline_number_current_line, 0, base_face_id); /* Compute point's line number if needed. */ if ((EQ (Vdisplay_line_numbers, Qrelative) || EQ (Vdisplay_line_numbers, Qvisual) -- Dario Gjorgjevski :: +389 (0)70 784 142