patch 7.4.1636

Problem:    When 'F' is in 'shortmess' the prompt for the encryption key isn't
            displayed. (Toothpik)
Solution:   Reset msg_silent.

diff --git a/src/ex_getln.c b/src/ex_getln.c
index 8419d3f2c23def7abe8390b54dc5fb364a470671..740c4b6cf933ca70694f5652b7e722dbe587022e 100644 (file)
--- 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 75ae6149b8b26fd6c6ea6dd6a903ad7dda9fb5b2..d28ad946a213bf3f3485ac981db9eeec5b6dc06c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1636,
 /**/
     1635,
 /**/