From: Juanma Barranquero <lekktu@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: wavexx@thregr.org, Emacs developers <emacs-devel@gnu.org>
Subject: Re: Native line numbers landed on master
Date: Tue, 1 Oct 2019 07:44:47 +0200 [thread overview]
Message-ID: <CAAeL0SSTEKReisT4PK2QaLiPdt5pCZZqYNWyx_jKo7UdSbjDWw@mail.gmail.com> (raw)
In-Reply-To: <83eezycce5.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 3808 bytes --]
On Mon, Sep 30, 2019 at 12:21 PM Eli Zaretskii <eliz@gnu.org> wrote:
> Patches welcome.
To quote Barney Stinson, "Challenge accepted!"
> I don't think it should be too hard to write that.
Didn't know you were an optimist.
Ok. The following extremely simple patch (with no documentation, etc, and
horrible, *horrible* face names because I couldn't think of anything
better) seems to work in the various tests I've done in absolute, visual
and relative modes.
Now, I'm not sure about code (try_cursor_movement and try_window_id) that
compare the line-number and line-number-current-line faces for
optimization. Performance seems to be fine, and I haven't seen any obvious
visual glitch.
Also, this in maybe_produce_line_number:
/* Compute point's line number if needed. */
if ((EQ (Vdisplay_line_numbers, Qrelative)
|| EQ (Vdisplay_line_numbers, Qvisual)
|| lnum_face_id != current_lnum_face_id)
&& !it->pt_lnum)
should perhaps compare curremt_lnum_face_id also with the face_ids of the
two new faces. ?
diff --git i/lisp/faces.el w/lisp/faces.el
index 9c5ffe1e59..0d9107a6a0 100644
--- i/lisp/faces.el
+++ w/lisp/faces.el
@@ -2391,4 +2391,35 @@ line-number-current-line
:group 'display-line-numbers)
+(defface line-number-ends-5
+ '((t :inherit line-number))
+ "Face for displaying line numbers that end in 5.
+That is, multiple of 5 but not of 10.
+This face is used when `display-line-numbers' is non-nil.
+
+If you customize the font of this face, make sure it is a
+monospaced font, otherwise line numbers will not line up,
+and text lines might move horizontally as you move through
+the buffer. Similarly, making this face's font different
+from that of the `line-number' face could produce such
+unwanted effects."
+ :version "27.1"
+ :group 'basic-faces
+ :group 'display-line-numbers)
+
+(defface line-number-ends-0
+ '((t :inherit line-number))
+ "Face for displaying line numbers that are multiples of 10.
+This face is used when `display-line-numbers' is non-nil.
+
+If you customize the font of this face, make sure it is a
+monospaced font, otherwise line numbers will not line up,
+and text lines might move horizontally as you move through
+the buffer. Similarly, making this face's font different
+from that of the `line-number' face could produce such
+unwanted effects."
+ :version "27.1"
+ :group 'basic-faces
+ :group 'display-line-numbers)
+
;; Definition stolen from display-line-numbers.
(defface fill-column-indicator
diff --git i/src/xdisp.c w/src/xdisp.c
index 95895ec3ac..7d5c0b11f4 100644
--- i/src/xdisp.c
+++ w/src/xdisp.c
@@ -21483,4 +21483,8 @@ maybe_produce_line_number (struct it *it)
int current_lnum_face_id
= merge_faces (it->w, Qline_number_current_line, 0, DEFAULT_FACE_ID);
+ int mul5_lnum_face_id
+ = merge_faces (it->w, Qline_number_ends_5, 0, DEFAULT_FACE_ID);
+ int mul10_lnum_face_id
+ = merge_faces (it->w, Qline_number_ends_0, 0, DEFAULT_FACE_ID);
/* Compute point's line number if needed. */
if ((EQ (Vdisplay_line_numbers, Qrelative)
@@ -21576,4 +21580,8 @@ maybe_produce_line_number (struct it *it)
&& it->what != IT_EOB)
tem_it.face_id = current_lnum_face_id;
+ else if (lnum_to_display % 10 == 0)
+ tem_it.face_id = mul10_lnum_face_id;
+ else if (lnum_to_display % 5 == 0)
+ tem_it.face_id = mul5_lnum_face_id;
else
tem_it.face_id = lnum_face_id;
@@ -32971,4 +32979,6 @@ syms_of_xdisp (void)
DEFSYM (Qline_number, "line-number");
DEFSYM (Qline_number_current_line, "line-number-current-line");
+ DEFSYM (Qline_number_ends_5, "line-number-ends-5");
+ DEFSYM (Qline_number_ends_0, "line-number-ends-0");
/* Name of a text property which disables line-number display. */
DEFSYM (Qdisplay_line_numbers_disable, "display-line-numbers-disable");
[-- Attachment #2: Type: text/html, Size: 4651 bytes --]
next prev parent reply other threads:[~2019-10-01 5:44 UTC|newest]
Thread overview: 129+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-08 7:58 Native line numbers landed on master Eli Zaretskii
2017-07-08 8:41 ` martin rudalics
2017-07-08 10:23 ` Eli Zaretskii
2017-07-08 22:38 ` Alex
2017-07-09 14:22 ` Eli Zaretskii
2017-07-09 22:56 ` Alex
2017-07-10 17:50 ` Eli Zaretskii
2017-07-10 20:31 ` Alex
2017-07-11 15:12 ` Eli Zaretskii
2017-07-11 20:44 ` Alex
2017-07-12 14:40 ` Eli Zaretskii
2017-07-16 7:30 ` Alex
2017-07-16 14:10 ` Eli Zaretskii
2017-07-16 19:31 ` Alex
2017-07-17 15:00 ` Eli Zaretskii
2017-07-17 20:34 ` Alex
2017-07-22 9:18 ` Eli Zaretskii
2017-07-10 22:19 ` John Wiegley
2017-07-11 2:29 ` Eli Zaretskii
2017-07-11 15:27 ` Stefan Monnier
2017-07-11 16:04 ` Eli Zaretskii
2017-07-11 16:16 ` Stefan Monnier
2017-07-11 17:23 ` Eli Zaretskii
2017-07-11 17:48 ` Stefan Monnier
2017-07-11 18:04 ` Eli Zaretskii
2017-07-11 18:19 ` Stefan Monnier
2017-07-11 18:18 ` Sharp-quoting function symbols (Was: Native line numbers landed on master) Kaushal Modi
2017-09-30 18:36 ` Philipp Stephani
2017-12-30 21:09 ` Philipp Stephani
2017-07-10 16:51 ` Native line numbers landed on master Filipe Silva
2017-07-11 13:00 ` Robert Pluim
2017-07-11 13:37 ` Jean-Christophe Helary
2017-07-11 13:47 ` Robert Pluim
2017-07-11 14:19 ` Jean-Christophe Helary
2017-07-11 15:24 ` Eli Zaretskii
2017-07-11 15:29 ` Robert Pluim
2017-07-11 16:07 ` Eli Zaretskii
2017-07-11 16:12 ` Robert Pluim
2017-07-11 17:33 ` Eli Zaretskii
2017-07-12 3:23 ` Kaushal Modi
2017-07-12 7:11 ` martin rudalics
2017-07-12 14:27 ` Eli Zaretskii
2017-07-12 15:49 ` martin rudalics
2017-07-15 22:02 ` Yuri D'Elia
2017-07-16 2:34 ` Eli Zaretskii
2017-07-16 14:25 ` Eli Zaretskii
2017-07-17 9:44 ` Yuri D'Elia
2017-07-17 14:16 ` Eli Zaretskii
2019-06-10 2:46 ` Juanma Barranquero
2019-06-10 8:32 ` Yuri D'Elia
2019-06-10 12:38 ` Juanma Barranquero
2019-06-10 15:22 ` Eli Zaretskii
2019-06-10 15:32 ` Juanma Barranquero
2019-06-10 15:33 ` Yuri D'Elia
2019-06-10 15:54 ` Eli Zaretskii
2019-06-10 16:23 ` Yuri D'Elia
2019-06-10 17:41 ` Eli Zaretskii
2019-09-30 10:01 ` Juanma Barranquero
2019-09-30 10:21 ` Eli Zaretskii
2019-10-01 5:44 ` Juanma Barranquero [this message]
2019-10-01 7:05 ` Eli Zaretskii
2019-10-01 8:49 ` Juanma Barranquero
2019-10-01 8:55 ` Juanma Barranquero
2019-10-01 9:26 ` Eli Zaretskii
2019-10-01 9:25 ` Eli Zaretskii
2019-10-01 9:09 ` Yuri D'Elia
2019-10-01 9:21 ` Juanma Barranquero
2019-10-01 9:51 ` Yuri D'Elia
2019-10-01 10:23 ` Juanma Barranquero
2019-10-01 10:40 ` Yuri D'Elia
2019-10-01 10:39 ` Eli Zaretskii
2019-10-01 10:47 ` Lars Ingebrigtsen
2019-10-01 11:07 ` Eli Zaretskii
2019-10-01 11:11 ` Juanma Barranquero
2019-10-01 22:52 ` Ergus
2019-10-01 23:51 ` Juanma Barranquero
2019-10-02 3:41 ` Ergus
2019-10-02 9:40 ` Juanma Barranquero
2019-10-02 13:56 ` Ergus
2019-10-02 15:06 ` Eli Zaretskii
2019-10-03 4:11 ` Juanma Barranquero
2019-10-03 8:16 ` martin rudalics
2019-10-03 14:43 ` Juanma Barranquero
2019-10-03 9:10 ` Robert Pluim
2019-10-03 14:47 ` Juanma Barranquero
2019-10-03 15:18 ` Robert Pluim
2019-10-03 20:37 ` Stefan Kangas
2019-10-03 21:48 ` Juanma Barranquero
2019-10-03 22:37 ` Yuri D'Elia
2019-10-04 1:51 ` Juanma Barranquero
2019-10-04 7:45 ` Eli Zaretskii
2019-10-04 9:52 ` Yuri D'Elia
2019-10-04 10:24 ` Juanma Barranquero
2019-10-05 6:26 ` Juanma Barranquero
2019-10-07 0:14 ` Juanma Barranquero
2019-10-07 6:54 ` Robert Pluim
2019-10-07 7:39 ` Juanma Barranquero
2019-10-07 8:09 ` Robert Pluim
2019-10-07 8:39 ` Juanma Barranquero
2019-10-07 18:52 ` Juri Linkov
2019-10-08 0:57 ` Juanma Barranquero
2019-10-19 20:38 ` Juri Linkov
2019-10-07 16:30 ` Eli Zaretskii
2019-10-08 11:15 ` Robert Pluim
2019-10-08 12:23 ` Eli Zaretskii
2019-10-09 7:19 ` Robert Pluim
2019-10-09 8:16 ` Eli Zaretskii
2019-10-09 12:14 ` Robert Pluim
2019-10-09 12:23 ` Eli Zaretskii
2019-10-09 13:19 ` Robert Pluim
2019-10-09 10:51 ` Juanma Barranquero
2019-10-04 10:22 ` Ergus
2019-10-04 10:26 ` Juanma Barranquero
2019-10-03 12:28 ` Yuri Khan
2019-10-03 14:48 ` Juanma Barranquero
2019-10-03 17:56 ` Yuri D'Elia
2019-10-03 18:40 ` Eli Zaretskii
2019-10-03 19:01 ` Yuri D'Elia
2019-10-04 2:01 ` Juanma Barranquero
2019-10-04 5:01 ` Juanma Barranquero
2019-10-04 15:57 ` Johan Bockgård
2019-10-04 17:28 ` Juanma Barranquero
2019-10-04 19:24 ` Stefan Monnier
2019-10-04 20:12 ` Yuri D'Elia
2019-10-04 22:45 ` Juanma Barranquero
2019-10-06 14:04 ` Juanma Barranquero
2019-10-06 14:45 ` Juanma Barranquero
2019-10-06 18:02 ` Eli Zaretskii
2019-10-01 9:24 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAAeL0SSTEKReisT4PK2QaLiPdt5pCZZqYNWyx_jKo7UdSbjDWw@mail.gmail.com \
--to=lekktu@gmail.com \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=wavexx@thregr.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).