upstream merge

5 files changed, 26 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 45cccea1ebb..0a1a268d962 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-19  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsselect.m (nxatoms_of_nsselect): Use "Selection" and "Secondary".
+
+2010-08-18  Eli Zaretskii  <eliz@gnu.org>
+
+        * xterm.c (x_draw_bar_cursor):
+        * w32term.c (x_draw_bar_cursor): If the character under cursor is
+        R2L, draw the bar cursor on its right rather than on its left.
+
 2010-08-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * eval.c (Fdefmacro): Only obey one declaration.
diff --git a/src/bidi.c b/src/bidi.c
index 112d9b08b23..a6d4d1b2506 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -1533,7 +1533,7 @@ bidi_level_of_next_char (struct bidi_it *bidi_it)
 
          we want it to be displayed as
 
-             {RLO}STet{PDF}
+             {PDF}STet{RLO}
 
          not as
 
diff --git a/src/nsselect.m b/src/nsselect.m
index 597d6e76253..9e434515edf 100644
--- a/src/nsselect.m
+++ b/src/nsselect.m
@@ -542,8 +542,8 @@ DEFUN ("ns-store-cut-buffer-internal", Fns_store_cut_buffer_internal,
 void
 nxatoms_of_nsselect (void)
 {
-  NXPrimaryPboard = @"PrimarySelection";
-  NXSecondaryPboard = @"SecondarySelection";
+  NXPrimaryPboard = @"Selection";
+  NXSecondaryPboard = @"Secondary";
 }
 
 void
diff --git a/src/w32term.c b/src/w32term.c
index 947ed5c9d44..992538e0e88 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -4897,6 +4897,11 @@ x_draw_bar_cursor (struct window *w, struct glyph_row *row,
 
           w->phys_cursor_width = width;
 
+          /* If the character under cursor is R2L, draw the bar cursor
+             on the right of its glyph, rather than on the left.  */
+          if ((cursor_glyph->resolved_level & 1) != 0)
+            x += cursor_glyph->pixel_width - width;
+
           w32_fill_area (f, hdc, cursor_color, x,
                          WINDOW_TO_FRAME_PIXEL_Y (w, w->phys_cursor.y),
                          width, row->height);
diff --git a/src/xterm.c b/src/xterm.c
index 4325fb3d991..c049ce78913 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7152,14 +7152,20 @@ x_draw_bar_cursor (struct window *w, struct glyph_row *row, int width, enum text
 
       if (kind == BAR_CURSOR)
         {
+          int x = WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x);
+
           if (width < 0)
             width = FRAME_CURSOR_WIDTH (f);
           width = min (cursor_glyph->pixel_width, width);
 
           w->phys_cursor_width = width;
 
-          XFillRectangle (dpy, window, gc,
-                          WINDOW_TEXT_TO_FRAME_PIXEL_X (w, w->phys_cursor.x),
+          /* If the character under cursor is R2L, draw the bar cursor
+             on the right of its glyph, rather than on the left.  */
+          if ((cursor_glyph->resolved_level & 1) != 0)
+            x += cursor_glyph->pixel_width - width;
+
+          XFillRectangle (dpy, window, gc, x,
                           WINDOW_TO_FRAME_PIXEL_Y (w, w->phys_cursor.y),
                           width, row->height);
         }