summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ex_cmds.c5
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index a3226d25c..545e06dbd 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -4158,6 +4158,7 @@ ex_substitute(exarg_T *eap)
{
char_u *orig_line = NULL;
int len_change = 0;
+ int save_p_lz = p_lz;
#ifdef FEAT_FOLDING
int save_p_fen = curwin->w_p_fen;
@@ -4168,6 +4169,9 @@ ex_substitute(exarg_T *eap)
temp = RedrawingDisabled;
RedrawingDisabled = 0;
+ // avoid calling update_screen() in vgetorpeek()
+ p_lz = FALSE;
+
if (new_start != NULL)
{
// There already was a substitution, we would
@@ -4243,6 +4247,7 @@ ex_substitute(exarg_T *eap)
msg_didout = FALSE; // don't scroll up
msg_col = 0;
gotocmdline(TRUE);
+ p_lz = save_p_lz;
// restore the line
if (orig_line != NULL)
diff --git a/src/version.c b/src/version.c
index aa86cab49..8dccaf280 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2361,
+/**/
2360,
/**/
2359,