[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/gnus-cloud c47ffc1 02/15: Merge branch 'master' of
From: |
Teodor Zlatanov |
Subject: |
[Emacs-diffs] scratch/gnus-cloud c47ffc1 02/15: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs |
Date: |
Tue, 5 Jul 2016 02:22:47 +0000 (UTC) |
branch: scratch/gnus-cloud
commit c47ffc10f69c56de1bcc814185380a79fb521d89
Merge: 2f7e8fa 3a1e3b4
Author: Ted Zlatanov <address@hidden>
Commit: Ted Zlatanov <address@hidden>
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
src/indent.c | 4 ++++
src/xdisp.c | 3 +--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/indent.c b/src/indent.c
index 5d7c6ae..bc59239 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -2178,6 +2178,7 @@ whether or not it is currently displayed in some window.
*/)
if (nlines <= 0)
{
it.vpos = vpos_init;
+ it.current_y = 0;
/* Do this even if LINES is 0, so that we move back to the
beginning of the current line as we ought. */
if ((nlines < 0 && IT_CHARPOS (it) > 0)
@@ -2187,6 +2188,7 @@ whether or not it is currently displayed in some window.
*/)
else if (overshoot_handled)
{
it.vpos = vpos_init;
+ it.current_y = 0;
move_it_by_lines (&it, min (PTRDIFF_MAX, nlines));
}
else
@@ -2200,6 +2202,7 @@ whether or not it is currently displayed in some window.
*/)
while (IT_CHARPOS (it) <= it_start)
{
it.vpos = 0;
+ it.current_y = 0;
move_it_by_lines (&it, 1);
}
if (nlines > 1)
@@ -2208,6 +2211,7 @@ whether or not it is currently displayed in some window.
*/)
else /* it_start = ZV */
{
it.vpos = 0;
+ it.current_y = 0;
move_it_by_lines (&it, min (PTRDIFF_MAX, nlines));
/* We could have some display or overlay string at ZV,
in which case it.vpos will be nonzero now, while
diff --git a/src/xdisp.c b/src/xdisp.c
index 2d0d677..d05eca1 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -8609,8 +8609,7 @@ move_it_in_display_line_to (struct it *it,
&& it->dpvec + it->current.dpvec_index + 1 >= it->dpend)))
/* If there's a line-/wrap-prefix, handle it. */
- if (it->hpos == 0 && it->method == GET_FROM_BUFFER
- && it->current_y < it->last_visible_y)
+ if (it->hpos == 0 && it->method == GET_FROM_BUFFER)
handle_line_prefix (it);
if (IT_CHARPOS (*it) < CHARPOS (this_line_min_pos))
- [Emacs-diffs] scratch/gnus-cloud updated (1a30c81 -> 1eefc9c), Teodor Zlatanov, 2016/07/04
- [Emacs-diffs] scratch/gnus-cloud c47ffc1 02/15: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs,
Teodor Zlatanov <=
- [Emacs-diffs] scratch/gnus-cloud 8fa2a11 06/15: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/04
- [Emacs-diffs] scratch/gnus-cloud 6141547 03/15: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/04
- [Emacs-diffs] scratch/gnus-cloud 1eefc9c 15/15: Protect from null gnus-cloud-sequence, again, Teodor Zlatanov, 2016/07/04
- [Emacs-diffs] scratch/gnus-cloud 08ca49d 07/15: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/04
- [Emacs-diffs] scratch/gnus-cloud c5ea255 14/15: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/04
- [Emacs-diffs] scratch/gnus-cloud 7404048 05/15: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/04
- [Emacs-diffs] scratch/gnus-cloud 526cbfe 11/15: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/04
- [Emacs-diffs] scratch/gnus-cloud 477b396 09/15: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/04
- [Emacs-diffs] scratch/gnus-cloud c69220c 04/15: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/04
- [Emacs-diffs] scratch/gnus-cloud 5950ff5 12/15: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Teodor Zlatanov, 2016/07/04