Fix bug #17585 with incorrect vertical motion when linum-mode is on.

 src/xdisp.c (move_it_in_display_line_to): Don't record wrap position
 if we are iterating over an object that generates glyphs for
 marginal areas.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2ef383c7b499e503a31440e652877df62a6b6616..dc3002b9a97e08046fa164455486d47521ac3eed 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-05-25  Eli Zaretskii  <eliz@gnu.org>
+
+       * xdisp.c (move_it_in_display_line_to): Don't record wrap position
+       if we are iterating over an object that generates glyphs for
+       marginal areas.  (Bug#17585)
+
 2014-05-24  Paul Eggert  <eggert@cs.ucla.edu>
 
        * xdisp.c (safe__call1, safe__eval): Now static.

diff --git a/src/xdisp.c b/src/xdisp.c
index 6cdc50ac589f8c0df6a659bf4344a40983163ff0..1a5c29ac5bed35a9ae5756fb3d19f5b166503657 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -8556,7 +8556,7 @@ move_it_in_display_line_to (struct it *it,
        }
       else
        {
-         if (it->line_wrap == WORD_WRAP)
+         if (it->line_wrap == WORD_WRAP && it->area == TEXT_AREA)
            {
              if (IT_DISPLAYING_WHITESPACE (it))
                may_wrap = 1;