2 files changed, 10 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b7345b840b8..661731a9c5d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-08-31  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (display_and_set_cursor): Call erase_phys_cursor also
+        when HPOS is negative, for the benefit of R2L glyph rows whose
+        newline overflows into the fringe.
+
 2014-08-30  Ken Brown  <kbrown@cornell.edu>
 
         * conf_post.h (strnicmp) [CYGWIN && HAVE_NTGUI]: Define.
diff --git a/src/xdisp.c b/src/xdisp.c
index 6ce8e3fff18..d435bf148a0 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -27464,6 +27464,10 @@ display_and_set_cursor (struct window *w, bool on,
       && (!on
           || w->phys_cursor.x != x
           || w->phys_cursor.y != y
+          /* HPOS can be negative in R2L rows whose
+             exact_window_width_line_p flag is set (i.e. their newline
+             would "overflow into the fringe").  */
+          || hpos < 0
           || new_cursor_type != w->phys_cursor_type
           || ((new_cursor_type == BAR_CURSOR || new_cursor_type == HBAR_CURSOR)
               && new_cursor_width != w->phys_cursor_width)))