IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge #9053 from janlazo/vim-8.1.0433

Browse Source
This commit is contained in:
Justin M. Keyes 2018-09-26 08:13:21 +02:00 committed by GitHub
commit fc18fad74f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/nvim/ex_getln.c
View File

@ -793,9 +793,11 @@ static int command_line_execute(VimState *state, int key)
no_mapping--; no_mapping--;
// CTRL-\ e doesn't work when obtaining an expression, unless it // CTRL-\ e doesn't work when obtaining an expression, unless it
// is in a mapping. // is in a mapping.
if (s->c != Ctrl_N && s->c != Ctrl_G && (s->c != 'e' if (s->c != Ctrl_N
|| (ccline.cmdfirstc == '=' && s->c != Ctrl_G
&& KeyTyped))) { && (s->c != 'e'
|| (ccline.cmdfirstc == '=' && KeyTyped)
|| cmdline_star > 0)) {
vungetc(s->c); vungetc(s->c);
s->c = Ctrl_BSL; s->c = Ctrl_BSL;
} else if (s->c == 'e') { } else if (s->c == 'e') {
@ -1350,7 +1352,8 @@ static int command_line_handle_key(CommandLineState *s)
// a new one... // a new one...
new_cmdpos = -1; new_cmdpos = -1;
if (s->c == '=') { if (s->c == '=') {
if (ccline.cmdfirstc == '=') { // can't do this recursively if (ccline.cmdfirstc == '=' // can't do this recursively
|| cmdline_star > 0) { // or when typing a password
beep_flush(); beep_flush();
s->c = ESC; s->c = ESC;
} else { } else {
@ -5587,6 +5590,9 @@ static struct cmdline_info *get_ccline_ptr(void)
*/ */
char_u *get_cmdline_str(void) char_u *get_cmdline_str(void)
{ {
if (cmdline_star > 0) {
return NULL;
}
struct cmdline_info *p = get_ccline_ptr(); struct cmdline_info *p = get_ccline_ptr();
if (p == NULL) if (p == NULL)