[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99896: Fix after-string and image interaction bug (Bug#1336).

[Chong Yidong]

------------------------------------------------------------
revno: 99896
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Thu 2010-06-24 20:30:55 -0400
message:
  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).
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-06-23 08:22:36 +0000
+++ b/src/ChangeLog     2010-06-25 00:30:55 +0000
@@ -1,3 +1,8 @@
+2010-06-25  Chong Yidong  <address@hidden>
+
+       * 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  <address@hidden>
 
        * lread.c (read1): Signal error if #s is not followed by paren.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2010-05-27 15:42:50 +0000
+++ b/src/xdisp.c       2010-06-25 00:30:55 +0000
@@ -6429,6 +6429,7 @@
      struct it *it;
 {
   it->what = IT_IMAGE;
+  it->ignore_overlay_strings_at_pos_p = 0;
   return 1;
 }