Mercurial > vim

comparison src/ex_getln.c @ 8694:f2e81ae5ab48 v7.4.1636

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 59866aabe737
children 3daf70d22168
comparison
equal deleted inserted replaced
8693:118a0378ccd3 8694:f2e81ae5ab48
1987 char_u *xp_arg) /* user-defined expansion argument */ 1987 char_u *xp_arg) /* user-defined expansion argument */
1988 { 1988 {
1989 char_u *s; 1989 char_u *s;
1990 struct cmdline_info save_ccline; 1990 struct cmdline_info save_ccline;
1991 int msg_col_save = msg_col; 1991 int msg_col_save = msg_col;
1992 int msg_silent_save = msg_silent;
1992 1993
1993 save_cmdline(&save_ccline); 1994 save_cmdline(&save_ccline);
1994 ccline.cmdprompt = prompt; 1995 ccline.cmdprompt = prompt;
1995 ccline.cmdattr = attr; 1996 ccline.cmdattr = attr;
1996 # ifdef FEAT_EVAL 1997 # ifdef FEAT_EVAL
1997 ccline.xp_context = xp_context; 1998 ccline.xp_context = xp_context;
1998 ccline.xp_arg = xp_arg; 1999 ccline.xp_arg = xp_arg;
1999 ccline.input_fn = (firstc == '@'); 2000 ccline.input_fn = (firstc == '@');
2000 # endif 2001 # endif
2002 msg_silent = 0;
2001 s = getcmdline(firstc, 1L, 0); 2003 s = getcmdline(firstc, 1L, 0);
2002 restore_cmdline(&save_ccline); 2004 restore_cmdline(&save_ccline);
2005 msg_silent = msg_silent_save;
2003 /* Restore msg_col, the prompt from input() may have changed it. 2006 /* Restore msg_col, the prompt from input() may have changed it.
2004 * But only if called recursively and the commandline is therefore being 2007 * But only if called recursively and the commandline is therefore being
2005 * restored to an old one; if not, the input() prompt stays on the screen, 2008 * restored to an old one; if not, the input() prompt stays on the screen,
2006 * so we need its modified msg_col left intact. */ 2009 * so we need its modified msg_col left intact. */
2007 if (ccline.cmdbuff != NULL) 2010 if (ccline.cmdbuff != NULL)