From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 28 Jul 2011 06:44:45 +0000 (-0400)
Subject: Fix bug #9184 with org-agenda crashing under bidi redisplay.
X-Git-Tag: emacs-pretest-24.0.90~104^2~159^2~7
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=350c992fe3f2180e11aea5ad8baee24e728a085b;p=emacs.git

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 2625c6f9aad..bfc06b35cc2 100644
--- 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 8f352561719..84c75bd91d9 100644
--- 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)