diff src/ex_getln.c @ 13790:dd6a63e3e7c4 v8.0.1767

patch 8.0.1767: with 'incsearch' text may jump up and down commit https://github.com/vim/vim/commit/9d34d90210ba52ebaf45973282e5921f5af364c7 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Apr 27 22:18:12 2018 +0200 patch 8.0.1767: with 'incsearch' text may jump up and down Problem: With 'incsearch' text may jump up and down. () Solution: Besides w_botline also save and restore w_empty_rows. (closes # 2530)
author Christian Brabandt <cb@256bit.org>
date Fri, 27 Apr 2018 22:30:06 +0200
parents 75e35ebdb7a4
children 0e9b2971d7c3
line wrap: on
line diff
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -237,8 +237,9 @@ getcmdline(
     int		old_topfill;
     int		init_topfill = curwin->w_topfill;
 # endif
-    linenr_T	old_botline;
+    linenr_T	old_botline, old_empty_rows;
     linenr_T	init_botline = curwin->w_botline;
+    linenr_T	init_empty_rows = curwin->w_empty_rows;
     int		did_incsearch = FALSE;
     int		incsearch_postponed = FALSE;
 #endif
@@ -291,6 +292,7 @@ getcmdline(
     old_topfill = curwin->w_topfill;
 # endif
     old_botline = curwin->w_botline;
+    old_empty_rows = curwin->w_empty_rows;
 #endif
 
     /*
@@ -1075,6 +1077,7 @@ getcmdline(
 			old_topfill = init_topfill;
 # endif
 			old_botline = init_botline;
+			old_empty_rows = init_empty_rows;
 		    }
 #endif
 		    redrawcmd();
@@ -1804,6 +1807,7 @@ getcmdline(
 			old_topfill = curwin->w_topfill;
 # endif
 			old_botline = curwin->w_botline;
+			old_empty_rows = curwin->w_empty_rows;
 			update_screen(NOT_VALID);
 			redrawcmdline();
 		    }
@@ -2020,6 +2024,7 @@ cmdline_changed:
 	    curwin->w_topfill = old_topfill;
 # endif
 	    curwin->w_botline = old_botline;
+	    curwin->w_empty_rows = old_empty_rows;
 	    changed_cline_bef_curs();
 	    update_topline();
 
@@ -2114,6 +2119,7 @@ returncmd:
 	curwin->w_topfill = old_topfill;
 # endif
 	curwin->w_botline = old_botline;
+	curwin->w_empty_rows = old_empty_rows;
 	highlight_match = FALSE;
 	validate_cursor();	/* needed for TAB */
 	redraw_all_later(SOME_VALID);