[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r117154: Fix bug #17585 with incorrect vertical m
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-24 r117154: Fix bug #17585 with incorrect vertical motion when linum-mode is on. |
Date: |
Sun, 25 May 2014 14:19:40 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117154
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17585
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Sun 2014-05-25 17:18:46 +0300
message:
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.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/xdisp.c xdisp.c-20091113204419-o5vbwnq5f7feedwu-240
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-05-24 21:28:43 +0000
+++ b/src/ChangeLog 2014-05-25 14:18:46 +0000
@@ -1,3 +1,9 @@
+2014-05-25 Eli Zaretskii <address@hidden>
+
+ * 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 <address@hidden>
* xdisp.c (safe__call1, safe__eval): Now static.
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2014-05-24 21:28:43 +0000
+++ b/src/xdisp.c 2014-05-25 14:18:46 +0000
@@ -8556,7 +8556,7 @@
}
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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r117154: Fix bug #17585 with incorrect vertical motion when linum-mode is on.,
Eli Zaretskii <=