diff options
| author | Bram Moolenaar <Bram@vim.org> | 2005-03-08 22:40:03 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2005-03-08 22:40:03 +0000 |
| commit | 111ff9f40e07f089686786346a57442f4f6dbc0f (patch) | |
| tree | 01ad404dc635a16c09e0e5800776804da249ee7a /src/ex_getln.c | |
| parent | 9be038da7d19675e5e86d4cd65ed5ce889f7ef80 (diff) | |
| download | vim-git-111ff9f40e07f089686786346a57442f4f6dbc0f.tar.gz | |
updated for version 7.0058
Diffstat (limited to 'src/ex_getln.c')
| -rw-r--r-- | src/ex_getln.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c index 4c6175b6f..53bff7588 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -172,6 +172,12 @@ getcmdline(firstc, count, indent) #endif expand_T xpc; long *b_im_ptr = NULL; +#if defined(FEAT_WILDMENU) || defined(FEAT_EVAL) || defined(FEAT_SEARCH_EXTRA) + /* Everything that may work recursively should save and restore the + * current command line in save_ccline. That includes update_screen(), a + * custom status line may invoke ":normal". */ + struct cmdline_info save_ccline; +#endif #ifdef FEAT_SNIFF want_sniff_request = 0; @@ -423,7 +429,9 @@ getcmdline(firstc, count, indent) p_ls = save_p_ls; p_wmh = save_p_wmh; last_status(FALSE); + save_cmdline(&save_ccline); update_screen(VALID); /* redraw the screen NOW */ + restore_cmdline(&save_ccline); redrawcmd(); save_p_ls = -1; } @@ -613,7 +621,6 @@ getcmdline(firstc, count, indent) #ifdef FEAT_EVAL else if (c == 'e') { - struct cmdline_info save_ccline; char_u *p = NULL; /* @@ -1061,8 +1068,6 @@ getcmdline(firstc, count, indent) new_cmdpos = -1; if (c == '=') { - struct cmdline_info save_ccline; - if (ccline.cmdfirstc == '=')/* can't do this recursively */ { beep_flush(); @@ -1665,7 +1670,10 @@ cmdline_changed: } validate_cursor(); + save_cmdline(&save_ccline); update_screen(NOT_VALID); + restore_cmdline(&save_ccline); + msg_starthere(); redrawcmdline(); did_incsearch = TRUE; |