diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2014-05-25 17:18:46 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2014-05-25 17:18:46 +0300 |
| commit | 285c68bcf54373b7e78f2914f711bd4ce8a30b2f (patch) | |
| tree | 94d40547a22b518966268e0b03fced8918846b7e /src | |
| parent | 12ddce5508fb7dd8e1457d17665503e84187ecc5 (diff) | |
| download | emacs-285c68bcf54373b7e78f2914f711bd4ce8a30b2f.tar.gz | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/xdisp.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2ef383c7b49..dc3002b9a97 100644 --- 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 6cdc50ac589..1a5c29ac5be 100644 --- 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; |