Fix bug #9184 with org-agenda crashing under bidi redisplay.

 src/xdisp.c (compute_display_string_pos): Don't use cached display
 string position if the buffer had its restriction changed.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2625c6f9aad6842b6a01f84645873fc1fe128466..bfc06b35cc24eae2269904278f5c49f50ac72c96 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-28  Eli Zaretskii  <eliz@fencepost.gnu.org>
+
+       * xdisp.c (compute_display_string_pos): Don't use cached display
+       string position if the buffer had its restriction changed.
+       (Bug#9184)
+
 2011-07-28  Paul Eggert  <eggert@cs.ucla.edu>
 
        * callproc.c (Fcall_process): Use 'volatile' to avoid vfork clobbering.

diff --git a/src/xdisp.c b/src/xdisp.c
index 8f352561719e0a50659e5444f7c559fa12266c05..84c75bd91d99af31bac5de6ec9326bef00dc5a88 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3182,7 +3182,8 @@ compute_display_string_pos (struct text_pos *position,
        b = XBUFFER (object);
       if (b == cached_disp_buffer
          && BUF_MODIFF (b) == cached_disp_modiff
-         && BUF_OVERLAY_MODIFF (b) == cached_disp_overlay_modiff)
+         && BUF_OVERLAY_MODIFF (b) == cached_disp_overlay_modiff
+         && !b->clip_changed)
        {
          if (cached_prev_pos >= 0
              && cached_prev_pos < charpos && charpos <= cached_disp_pos)