To: vim_dev@googlegroups.com Subject: Patch 7.4.1636 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1636 Problem: When 'F' is in 'shortmess' the prompt for the encryption key isn't displayed. (Toothpik) Solution: Reset msg_silent. Files: src/ex_getln.c *** ../vim-7.4.1635/src/ex_getln.c 2016-03-19 22:50:38.419595003 +0100 --- src/ex_getln.c 2016-03-22 20:26:28.833313489 +0100 *************** *** 1989,1994 **** --- 1989,1995 ---- 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,2005 **** --- 1999,2008 ---- 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, *** ../vim-7.4.1635/src/version.c 2016-03-21 23:18:49.345362408 +0100 --- src/version.c 2016-03-22 20:27:49.044522827 +0100 *************** *** 750,751 **** --- 750,753 ---- { /* Add new patch number below this line */ + /**/ + 1636, /**/ -- hundred-and-one symptoms of being an internet addict: 93. New mail alarm on your palmtop annoys other churchgoers. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///