diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-03-22 20:31:13 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-03-22 20:31:13 +0100 |
| commit | 6135d0d803084f6c2dd8672df1bef4c6e58f9e19 (patch) | |
| tree | 7e8bba97b24991b4b4d17d35cbe327ad8648187e | |
| parent | 6a06363861fcc6beca6e06b39385da411ce58633 (diff) | |
| download | vim-git-6135d0d803084f6c2dd8672df1bef4c6e58f9e19.tar.gz | |
patch 7.4.1636v7.4.1636
Problem: When 'F' is in 'shortmess' the prompt for the encryption key isn't
displayed. (Toothpik)
Solution: Reset msg_silent.
| -rw-r--r-- | src/ex_getln.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c index 8419d3f2c..740c4b6cf 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -1989,6 +1989,7 @@ getcmdline_prompt( char_u *s; struct cmdline_info save_ccline; int msg_col_save = msg_col; + int msg_silent_save = msg_silent; save_cmdline(&save_ccline); ccline.cmdprompt = prompt; @@ -1998,8 +1999,10 @@ getcmdline_prompt( ccline.xp_arg = xp_arg; ccline.input_fn = (firstc == '@'); # endif + msg_silent = 0; s = getcmdline(firstc, 1L, 0); restore_cmdline(&save_ccline); + msg_silent = msg_silent_save; /* Restore msg_col, the prompt from input() may have changed it. * But only if called recursively and the commandline is therefore being * restored to an old one; if not, the input() prompt stays on the screen, diff --git a/src/version.c b/src/version.c index 75ae6149b..d28ad946a 100644 --- a/src/version.c +++ b/src/version.c @@ -749,6 +749,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1636, +/**/ 1635, /**/ 1634, |