upstream

3 files changed, 12 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f1691252778..44b8e168031 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2011-09-07  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (move_it_in_display_line_to): Call RESTORE_IT on ppos_it
+        only under bidi iteration.
+
+2011-09-07  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (xg_make_tool_item): Insert comment about eventbox.
+
 2011-09-06  Paul Eggert  <eggert@cs.ucla.edu>
 
         isnan: Fix porting problem to Solaris 10 with bundled gcc.
diff --git a/src/gtkutil.c b/src/gtkutil.c
index c154797735e..04d05d2a630 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -4219,6 +4219,7 @@ xg_make_tool_item (FRAME_PTR f,
   GtkToolItem *ti = gtk_tool_item_new ();
   GtkWidget *vb = horiz ? gtk_hbox_new (FALSE, 0) : gtk_vbox_new (FALSE, 0);
   GtkWidget *wb = gtk_button_new ();
+  /* The eventbox is here so we can have tooltips on disabled items.  */
   GtkWidget *weventbox = gtk_event_box_new ();
 
   if (wimage && !text_image)
diff --git a/src/xdisp.c b/src/xdisp.c
index 2d255bd0e39..2aa0dee02b8 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -8170,7 +8170,8 @@ move_it_in_display_line_to (struct it *it,
                       && !saw_smaller_pos
                       && IT_CHARPOS (*it) > to_charpos))
                 {
-                  if (!at_eob_p && IT_CHARPOS (ppos_it) < ZV)
+                  if (it->bidi_p
+                      && !at_eob_p && IT_CHARPOS (ppos_it) < ZV)
                     RESTORE_IT (it, &ppos_it, ppos_data);
                   result = MOVE_POS_MATCH_OR_ZV;
                   break;