aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorChong Yidong2010-12-06 01:54:52 -0500
committerChong Yidong2010-12-06 01:54:52 -0500
commitd8b2a96214c9b53ab914901fdde71f5b0a931678 (patch)
treeb460510f4b2cc856332affb7c7ae2796d04acdb4 /src/ChangeLog
parent0afb6242c77237cd2cc1f0e623b08e20488c5b74 (diff)
downloademacs-d8b2a96214c9b53ab914901fdde71f5b0a931678.tar.gz
emacs-d8b2a96214c9b53ab914901fdde71f5b0a931678.zip
Fix crash with invisible text and overlays (Bug#7016).
* src/dispextern.h (struct it): New member overlay_strings_charpos. * src/xdisp.c (next_overlay_string, load_overlay_strings): Record the charpos where we computed n_overlay_strings. (next_overlay_string): Load overlay strings at recorded position, which may not be the same as the iterator's charpos (Bug#7016).
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d10b5d194a9..3293ec08da5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
12010-12-06 Chong Yidong <cyd@stupidchicken.com>
2
3 * dispextern.h (struct it): New member overlay_strings_charpos.
4
5 * xdisp.c (next_overlay_string, load_overlay_strings): Record the
6 charpos where we computed n_overlay_strings.
7 (next_overlay_string): Load overlay strings at recorded position,
8 which may not be the same as the iterator's charpos (Bug#7016).
9
12010-12-05 Jan Djärv <jan.h.d@swipnet.se> 102010-12-05 Jan Djärv <jan.h.d@swipnet.se>
2 11
3 * nsterm.m (ns_dumpglyphs_image): If drawing cursor, fill background 12 * nsterm.m (ns_dumpglyphs_image): If drawing cursor, fill background