changeset 8694:f2e81ae5ab48 v7.4.1636

commit https://github.com/vim/vim/commit/6135d0d803084f6c2dd8672df1bef4c6e58f9e19 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Mar 22 20:31:13 2016 +0100 patch 7.4.1636 Problem: When 'F' is in 'shortmess' the prompt for the encryption key isn't displayed. (Toothpik) Solution: Reset msg_silent.
author Christian Brabandt <cb@256bit.org>
date Tue, 22 Mar 2016 20:45:05 +0100
parents 118a0378ccd3
children 5e284f488e40
files src/ex_getln.c src/version.c
diffstat 2 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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,
--- 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,