Merge from trunk.

1 files changed, 9 insertions, 9 deletions

diff --git a/src/window.c b/src/window.c
index 04fea6b9bf6..96b1144acf2 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1379,7 +1379,7 @@ if it isn't already recorded.  */)
       if (it.current_y < it.last_visible_y)
         move_it_past_eol (&it);
       value = make_number (IT_CHARPOS (it));
-      bidi_unshelve_cache (itdata);
+      bidi_unshelve_cache (itdata, 0);
 
       if (old_buffer)
         set_buffer_internal (old_buffer);
@@ -4273,7 +4273,7 @@ window_scroll_pixel_based (Lisp_Object window, int n, int whole, int noerror)
         }
 
       start = it.current.pos;
-      bidi_unshelve_cache (itdata);
+      bidi_unshelve_cache (itdata, 0);
     }
   else if (auto_window_vscroll_p)
     {
@@ -4417,7 +4417,7 @@ window_scroll_pixel_based (Lisp_Object window, int n, int whole, int noerror)
             }
           else
             {
-              bidi_unshelve_cache (itdata);
+              bidi_unshelve_cache (itdata, 0);
               if (noerror)
                 return;
               else if (n < 0)   /* could happen with empty buffers */
@@ -4434,7 +4434,7 @@ window_scroll_pixel_based (Lisp_Object window, int n, int whole, int noerror)
             w->vscroll = 0;
           else
             {
-              bidi_unshelve_cache (itdata);
+              bidi_unshelve_cache (itdata, 0);
               if (noerror)
                 return;
               else
@@ -4583,7 +4583,7 @@ window_scroll_pixel_based (Lisp_Object window, int n, int whole, int noerror)
             SET_PT_BOTH (charpos, bytepos);
         }
     }
-  bidi_unshelve_cache (itdata);
+  bidi_unshelve_cache (itdata, 0);
 }
 
 
@@ -5010,7 +5010,7 @@ displayed_window_lines (struct window *w)
   start_display (&it, w, start);
   move_it_vertically (&it, height);
   bottom_y = line_bottom_y (&it);
-  bidi_unshelve_cache (itdata);
+  bidi_unshelve_cache (itdata, 0);
 
   /* rms: On a non-window display,
      the value of it.vpos at the bottom of the screen
@@ -5116,7 +5116,7 @@ and redisplay normally--don't erase and redraw the frame.  */)
           move_it_vertically_backward (&it, window_box_height (w) / 2);
           charpos = IT_CHARPOS (it);
           bytepos = IT_BYTEPOS (it);
-          bidi_unshelve_cache (itdata);
+          bidi_unshelve_cache (itdata, 0);
         }
       else if (iarg < 0)
         {
@@ -5164,7 +5164,7 @@ and redisplay normally--don't erase and redraw the frame.  */)
             }
           if (h <= 0)
             {
-              bidi_unshelve_cache (itdata);
+              bidi_unshelve_cache (itdata, 0);
               return Qnil;
             }
 
@@ -5187,7 +5187,7 @@ and redisplay normally--don't erase and redraw the frame.  */)
           charpos = IT_CHARPOS (it);
           bytepos = IT_BYTEPOS (it);
 
-          bidi_unshelve_cache (itdata);
+          bidi_unshelve_cache (itdata, 0);
         }
       else
         {