diff options
| author | Eli Zaretskii | 2011-07-28 02:44:45 -0400 |
|---|---|---|
| committer | Eli Zaretskii | 2011-07-28 02:44:45 -0400 |
| commit | 350c992fe3f2180e11aea5ad8baee24e728a085b (patch) | |
| tree | 46e1c95af8d351ad9fb5f90ae554ce5a5165e307 /src | |
| parent | 5266b4bb6079efcf14e5d4fc633636a65c4b7e80 (diff) | |
| download | emacs-350c992fe3f2180e11aea5ad8baee24e728a085b.tar.gz emacs-350c992fe3f2180e11aea5ad8baee24e728a085b.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/xdisp.c | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2625c6f9aad..bfc06b35cc2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2011-07-28 Eli Zaretskii <eliz@fencepost.gnu.org> | ||
| 2 | |||
| 3 | * xdisp.c (compute_display_string_pos): Don't use cached display | ||
| 4 | string position if the buffer had its restriction changed. | ||
| 5 | (Bug#9184) | ||
| 6 | |||
| 1 | 2011-07-28 Paul Eggert <eggert@cs.ucla.edu> | 7 | 2011-07-28 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 8 | ||
| 3 | * callproc.c (Fcall_process): Use 'volatile' to avoid vfork clobbering. | 9 | * 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, | |||
| 3182 | b = XBUFFER (object); | 3182 | b = XBUFFER (object); |
| 3183 | if (b == cached_disp_buffer | 3183 | if (b == cached_disp_buffer |
| 3184 | && BUF_MODIFF (b) == cached_disp_modiff | 3184 | && BUF_MODIFF (b) == cached_disp_modiff |
| 3185 | && BUF_OVERLAY_MODIFF (b) == cached_disp_overlay_modiff) | 3185 | && BUF_OVERLAY_MODIFF (b) == cached_disp_overlay_modiff |
| 3186 | && !b->clip_changed) | ||
| 3186 | { | 3187 | { |
| 3187 | if (cached_prev_pos >= 0 | 3188 | if (cached_prev_pos >= 0 |
| 3188 | && cached_prev_pos < charpos && charpos <= cached_disp_pos) | 3189 | && cached_prev_pos < charpos && charpos <= cached_disp_pos) |