vim-patch:7.4.1876 (#5848)

Problem:    Typing "k" at the hit-enter prompt has no effect.
Solution:   Don't assume recursive use of the prompt if a character was typed.
            (Hirohito Higashi)

a0055ad3a7
This commit is contained in:
lonerover 2017-01-01 00:27:11 +08:00 committed by Justin M. Keyes
parent c6a50ca82c
commit aa35cd9af0
2 changed files with 5 additions and 4 deletions

View File

@ -2030,9 +2030,10 @@ static int do_more_prompt(int typed_char)
int i; int i;
// We get called recursively when a timer callback outputs a message. In // We get called recursively when a timer callback outputs a message. In
// that case don't show another prompt. Also when at the hit-Enter prompt. // that case don't show another prompt. Also when at the hit-Enter prompt
if (entered || State == HITRETURN) { // and nothing was typed.
return false; if (entered || (State == HITRETURN && typed_char == 0)) {
return false;
} }
entered = true; entered = true;

View File

@ -564,7 +564,7 @@ static int included_patches[] = {
// 1879 NA // 1879 NA
// 1878 NA // 1878 NA
// 1877 NA // 1877 NA
// 1876, 1876,
1875, 1875,
// 1874 NA // 1874 NA
// 1873 NA // 1873 NA