Skip to content

Commit 2b7e9b4

Browse files
committed
updated for version 7.3.1309
Problem: When a script defines a function the flag to wait for the user to hit enter is reset. Solution: Restore the flag. (Yasuhiro Matsumoto) Except when the user was typing the function.
1 parent 286f4ea commit 2b7e9b4

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

src/eval.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21108,6 +21108,7 @@ ex_function(eap)
2110821108
int j;
2110921109
int c;
2111021110
int saved_did_emsg;
21111+
int saved_wait_return = need_wait_return;
2111121112
char_u *name = NULL;
2111221113
char_u *p;
2111321114
char_u *arg;
@@ -21439,7 +21440,10 @@ ex_function(eap)
2143921440
for (;;)
2144021441
{
2144121442
if (KeyTyped)
21443+
{
2144221444
msg_scroll = TRUE;
21445+
saved_wait_return = FALSE;
21446+
}
2144321447
need_wait_return = FALSE;
2144421448
sourcing_lnum_off = sourcing_lnum;
2144521449

@@ -21750,6 +21754,7 @@ ex_function(eap)
2175021754
vim_free(fudi.fd_newkey);
2175121755
vim_free(name);
2175221756
did_emsg |= saved_did_emsg;
21757+
need_wait_return |= saved_wait_return;
2175321758
}
2175421759

2175521760
/*

src/os_unix.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6129,7 +6129,6 @@ save_patterns(num_pat, pat, num_file, file)
61296129
}
61306130
#endif
61316131

6132-
61336132
/*
61346133
* Return TRUE if the string "p" contains a wildcard that mch_expandpath() can
61356134
* expand.

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -728,6 +728,8 @@ static char *(features[]) =
728728

729729
static int included_patches[] =
730730
{ /* Add new patch number below this line */
731+
/**/
732+
1309,
731733
/**/
732734
1308,
733735
/**/

0 commit comments

Comments
 (0)