summaryrefslogtreecommitdiffstats
path: root/src/move.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-03-27 23:02:07 +0200
committerBram Moolenaar <Bram@vim.org>2017-03-27 23:02:07 +0200
commitd5d37537d1fa46fd468bd378af2006dd09840f38 (patch)
treea0319f63b4739528379f52ad116b6aa5f78f6b90 /src/move.c
parent980128c369451450743bdb90a67588fa72ec4b07 (diff)
patch 8.0.0515: ml_get errors in silent Ex modev8.0.0515
Problem: ml_get errors in silent Ex mode. (Dominique Pelle) Solution: Clear valid flags when setting the cursor. Set the topline when not in full screen mode.
Diffstat (limited to 'src/move.c')
-rw-r--r--src/move.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/move.c b/src/move.c
index 3d6d2ec8f4..f058b73106 100644
--- a/src/move.c
+++ b/src/move.c
@@ -177,11 +177,9 @@ update_topline(void)
int save_so = p_so;
#endif
- if (!screen_valid(TRUE))
- return;
-
- /* If the window height is zero just use the cursor line. */
- if (curwin->w_height == 0)
+ /* If there is no valid screen and when the window height is zero just use
+ * the cursor line. */
+ if (!screen_valid(TRUE) || curwin->w_height == 0)
{
curwin->w_topline = curwin->w_cursor.lnum;
curwin->w_botline = curwin->w_topline;
@@ -2592,6 +2590,7 @@ halfpage(int flag, linenr_T Prenum)
n = (curwin->w_p_scr <= curwin->w_height) ?
curwin->w_p_scr : curwin->w_height;
+ update_topline();
validate_botline();
room = curwin->w_empty_rows;
#ifdef FEAT_DIFF