Merge from emacs-24

1 files changed, 11 insertions, 2 deletions

diff --git a/src/w32term.c b/src/w32term.c
index 55c2d718346..443f5ece8f0 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -2228,7 +2228,7 @@ x_draw_stretch_glyph_string (struct glyph_string *s)
         {
           /* In R2L rows, draw the cursor on the right edge of the
              stretch glyph.  */
-          int right_x = window_box_right_offset (s->w, TEXT_AREA);
+          int right_x = window_box_right (s->w, TEXT_AREA);
 
           if (x + background_width > right_x)
             background_width -= x - right_x;
@@ -5472,6 +5472,12 @@ x_draw_hollow_cursor (struct window *w, struct glyph_row *row)
   /* Compute frame-relative coordinates for phys cursor.  */
   get_phys_cursor_geometry (w, row, cursor_glyph, &left, &top, &h);
   rect.left = left;
+  /* When on R2L character, show cursor at the right edge of the
+     glyph, unless the cursor box is as wide as the glyph or wider
+     (the latter happens when x-stretch-cursor is non-nil).  */
+  if ((cursor_glyph->resolved_level & 1) != 0
+      && cursor_glyph->pixel_width > w->phys_cursor_width)
+    rect.left += cursor_glyph->pixel_width - w->phys_cursor_width;
   rect.top = top;
   rect.bottom = rect.top + h;
   rect.right = rect.left + w->phys_cursor_width;
@@ -5553,7 +5559,7 @@ x_draw_bar_cursor (struct window *w, struct glyph_row *row,
                          WINDOW_TO_FRAME_PIXEL_Y (w, w->phys_cursor.y),
                          width, row->height);
         }
-      else
+      else      /* HBAR_CURSOR */
         {
           int dummy_x, dummy_y, dummy_h;
 
@@ -5564,6 +5570,9 @@ x_draw_bar_cursor (struct window *w, struct glyph_row *row,
 
           get_phys_cursor_geometry (w, row, cursor_glyph, &dummy_x,
                                     &dummy_y, &dummy_h);
+          if ((cursor_glyph->resolved_level & 1) != 0
+              && cursor_glyph->pixel_width > w->phys_cursor_width)
+            x += cursor_glyph->pixel_width - w->phys_cursor_width;
           w32_fill_area (f, hdc, cursor_color, x,
                          WINDOW_TO_FRAME_PIXEL_Y (w, w->phys_cursor.y +
                                                   row->height - width),