Mercurial > emacs

changeset 109276:3f57ce01b15a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix after-string and image interaction bug (Bug#1336). * xdisp.c (next_element_from_image): Ensure that after-strings are read the next time we hit handle_stop (Bug#1336).
author Chong Yidong <cyd@stupidchicken.com>
date Thu, 24 Jun 2010 20:30:55 -0400
parents a85c2c80290c
children 8591e48339c7
files src/ChangeLog src/xdisp.c
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Thu Jun 24 15:05:47 2010 -0400
+++ b/src/ChangeLog	Thu Jun 24 20:30:55 2010 -0400
@@ -1,3 +1,8 @@
+2010-06-25  Chong Yidong  <cyd@stupidchicken.com>
+
+	* xdisp.c (next_element_from_image): Ensure that after-strings are
+	read the next time we hit handle_stop (Bug#1336).
+
 2010-06-23  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* lread.c (read1): Signal error if #s is not followed by paren.
--- a/src/xdisp.c	Thu Jun 24 15:05:47 2010 -0400
+++ b/src/xdisp.c	Thu Jun 24 20:30:55 2010 -0400
@@ -6429,6 +6429,7 @@
      struct it *it;
 {
   it->what = IT_IMAGE;
+  it->ignore_overlay_strings_at_pos_p = 0;
   return 1;
 }