From bf5ddded70c11edaf3514b25da27fc71cfb8e965 Mon Sep 17 00:00:00 2001 From: Alan Third Date: Sun, 17 Jul 2016 14:44:52 +0100 Subject: [PATCH] Prevent bar cursor overwriting next glyph (bug#16856) * src/nsterm.m (ns_draw_window_cursor): Test glyph width vs cursor width before setting final size. --- src/nsterm.m | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/nsterm.m b/src/nsterm.m index a6160ed5b2a..8da2ffe5b7f 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -2861,7 +2861,10 @@ ns_draw_window_cursor (struct window *w, struct glyph_row *glyph_row, { if (cursor_width < 1) cursor_width = max (FRAME_CURSOR_WIDTH (f), 1); - w->phys_cursor_width = cursor_width; + + /* The bar cursor should never be wider than the glyph. */ + if (cursor_width < w->phys_cursor_width) + w->phys_cursor_width = cursor_width; } /* If we have an HBAR, "cursor_width" MAY specify height. */ else if (cursor_type == HBAR_CURSOR) -- 2.39.2