Fix cursor positioning in hscrolled lines with R2L characters.

 src/xdisp.c (set_cursor_from_row): Fix cursor positioning in mixed L2R+R2L
 lines that are hscrolled on the left.

diff --git a/src/ChangeLog b/src/ChangeLog
index 3f93987c0f16c4947ab5d11cbe9b76285cff28d4..4409d5e7f608e8ec6334883d65bf0ffef04cea84 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,8 @@
 
        * xdisp.c (hscroll_window_tree): Support hscroll in right-to-left
        lines.
+       (set_cursor_from_row): Fix cursor positioning in mixed L2R+R2L
+       lines that are hscrolled on the left.
 
        * dispnew.c (buffer_posn_from_coords): Account for a possible
        presence of header-line.  (Bug#4426)

diff --git a/src/xdisp.c b/src/xdisp.c
index 2fff6d9518ca25e0d086d308478abf37b4ef0850..e7fc1b4b37e50970106c8a59fc438a5e62afe25a 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13890,7 +13890,11 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
                               ? glyph_after > glyphs_end
                               : glyph_after < glyphs_end)))))
        {
-         cursor = glyph_after;
+         if (!match_with_avoid_cursor
+             && row->truncated_on_left_p && pt_old < bpos_min)
+           cursor = glyph_before;
+         else
+           cursor = glyph_after;
          x = -1;
        }
       else if (string_seen)