[Emacs-diffs] /srv/bzr/emacs/trunk r106024: Fix cursor positioning in hscrolled lines with R2L characters.

[Eli Zaretskii]

------------------------------------------------------------
revno: 106024
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2011-10-08 15:03:43 +0200
message:
  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.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-10-08 12:15:08 +0000
+++ b/src/ChangeLog     2011-10-08 13:03:43 +0000
@@ -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)

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2011-10-08 12:15:08 +0000
+++ b/src/xdisp.c       2011-10-08 13:03:43 +0000
@@ -13890,7 +13890,11 @@
                               ? 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)