Fix bug #13108 introduced by the fix to bug #12930.

 src/indent.c (Fvertical_motion): If a display string will be
 displayed on the left or the right margin, don't consider it as a
 factor in cursor positioning.

diff --git a/src/ChangeLog b/src/ChangeLog
index f9edb03..1cca404 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2012-12-07  Eli Zaretskii  <eliz@gnu.org>
+
+       * indent.c (Fvertical_motion): If a display string will be
+       displayed on the left or the right margin, don't consider it as a
+       factor in cursor positioning.  (Bug#13108)
+
 2012-12-07  Martin Rudalics  <rudalics@gmx.at>
 
        * editfns.c (Fcompare_buffer_substrings): Reword doc-string.

diff --git a/src/indent.c b/src/indent.c
index 3332228..eb10580 100644 (file)
--- a/src/indent.c
+++ b/src/indent.c
@@ -2034,7 +2034,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')