[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111007: Fix bug #13108 introduced by the fix to bug #12930.

[Eli Zaretskii]

------------------------------------------------------------
revno: 111007
fixes bug: http://debbugs.gnu.org/13108
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Fri 2012-12-07 17:28:20 +0200
message:
  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.
modified:
  src/ChangeLog
  src/indent.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-12-07 09:45:03 +0000
+++ b/src/ChangeLog     2012-12-07 15:28:20 +0000
@@ -1,3 +1,9 @@
+2012-12-07  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * editfns.c (Fcompare_buffer_substrings): Reword doc-string.

=== modified file 'src/indent.c'
--- a/src/indent.c      2012-11-21 19:28:14 +0000
+++ b/src/indent.c      2012-12-07 15:28:20 +0000
@@ -2034,7 +2034,11 @@
          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')