thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 7.4.1636

Browse Source 
Problem:    When 'F' is in 'shortmess' the prompt for the encryption key isn't
            displayed. (Toothpik)
Solution:   Reset msg_silent.
This commit is contained in:
Bram Moolenaar
2016-03-22 20:31:13 +01:00
parent 6a06363861
commit 6135d0d803
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ex_getln.c
View File

@@ -1989,6 +1989,7 @@ getcmdline_prompt(
char_u *s; char_u *s;
struct cmdline_info save_ccline; struct cmdline_info save_ccline;
int msg_col_save = msg_col; int msg_col_save = msg_col;
int msg_silent_save = msg_silent;
save_cmdline(&save_ccline); save_cmdline(&save_ccline);
ccline.cmdprompt = prompt; ccline.cmdprompt = prompt;
@@ -1998,8 +1999,10 @@ getcmdline_prompt(
ccline.xp_arg = xp_arg; ccline.xp_arg = xp_arg;
ccline.input_fn = (firstc == '@'); ccline.input_fn = (firstc == '@');
# endif # endif
msg_silent = 0;
s = getcmdline(firstc, 1L, 0); s = getcmdline(firstc, 1L, 0);
restore_cmdline(&save_ccline); restore_cmdline(&save_ccline);
msg_silent = msg_silent_save;
/* Restore msg_col, the prompt from input() may have changed it. /* Restore msg_col, the prompt from input() may have changed it.
* But only if called recursively and the commandline is therefore being * 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, * restored to an old one; if not, the input() prompt stays on the screen,

2
src/version.c
View File

@@ -748,6 +748,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1636,
/**/ /**/
1635, 1635,
/**/ /**/