Merge from emacs-24; up to 2012-11-26T19:56:14Z!monnier@iro.umontreal.ca

1 files changed, 5 insertions, 1 deletions

diff --git a/src/indent.c b/src/indent.c
index a3abf88feeb..327526eae2d 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -2025,7 +2025,11 @@ whether or not it is currently displayed in some window.  */)
           const char *s = SSDATA (it.string);
           const char *e = s + SBYTES (it.string);
 
-          disp_string_at_start_p = it.string_from_display_prop_p;
+          /* If it.area is anything but TEXT_AREA, we need not bother
+             about the display string, as it doesn't affect cursor
+             positioning.  */
+          disp_string_at_start_p =
+            it.string_from_display_prop_p && it.area == TEXT_AREA;
           while (s < e)
             {
               if (*s++ == '\n')