diff options
Diffstat (limited to 'src/ex_docmd.c')
| -rw-r--r-- | src/ex_docmd.c | 70 |
1 files changed, 54 insertions, 16 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 30a5f3a8a..7ad5513bc 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -7892,7 +7892,6 @@ update_topline_cursor() ex_normal(eap) exarg_T *eap; { - oparg_T oa; int save_msg_scroll = msg_scroll; int save_restart_edit = restart_edit; int save_msg_didout = msg_didout; @@ -7996,30 +7995,17 @@ ex_normal(eap) */ do { - clear_oparg(&oa); - finish_op = FALSE; if (eap->addr_count != 0) { curwin->w_cursor.lnum = eap->line1++; curwin->w_cursor.col = 0; } - /* - * Stuff the argument into the typeahead buffer. - * Execute normal_cmd() until there is no typeahead left. - */ - ins_typebuf( + exec_normal_cmd( #ifdef FEAT_MBYTE arg != NULL ? arg : #endif - eap->arg, eap->forceit ? REMAP_NONE : REMAP_YES, 0, - TRUE, FALSE); - while ((!stuff_empty() || (!typebuf_typed() && typebuf.tb_len > 0)) - && !got_int) - { - update_topline_cursor(); - normal_cmd(&oa, FALSE); /* execute a Normal mode cmd */ - } + eap->arg, eap->forceit ? REMAP_NONE : REMAP_YES, FALSE); } while (eap->addr_count > 0 && eap->line1 <= eap->line2 && !got_int); } @@ -8085,6 +8071,35 @@ ex_stopinsert(eap) } #endif +#if defined(FEAT_EX_EXTRA) || defined(FEAT_MENU) || defined(PROTO) +/* + * Execute normal mode command "cmd". + * "remap" can be REMAP_NONE or REMAP_YES. + */ + void +exec_normal_cmd(cmd, remap, silent) + char_u *cmd; + int remap; + int silent; +{ + oparg_T oa; + + /* + * Stuff the argument into the typeahead buffer. + * Execute normal_cmd() until there is no typeahead left. + */ + clear_oparg(&oa); + finish_op = FALSE; + ins_typebuf(cmd, remap, 0, TRUE, silent); + while ((!stuff_empty() || (!typebuf_typed() && typebuf.tb_len > 0)) + && !got_int) + { + update_topline_cursor(); + normal_cmd(&oa, FALSE); /* execute a Normal mode cmd */ + } +} +#endif + #ifdef FEAT_FIND_ID static void ex_checkpath(eap) @@ -8742,6 +8757,17 @@ makeopens(fd, dirnow) } /* + * If there is an empty, unnamed buffer we will wipe it out later. + * Remember the buffer number. + */ + if (put_line(fd, "if expand('%') == '' && !&modified && line('$') <= 1 && getline(1) == ''") == FAIL) + return FAIL; + if (put_line(fd, " let s:wipebuf = bufnr('%')") == FAIL) + return FAIL; + if (put_line(fd, "endif") == FAIL) + return FAIL; + + /* * Now save the current files, current buffer first. */ if (put_line(fd, "set shortmess=aoO") == FAIL) @@ -8876,6 +8902,18 @@ makeopens(fd, dirnow) return FAIL; /* + * Wipe out an empty unnamed buffer we started in. + */ + if (put_line(fd, "if exists('s:wipebuf')") == FAIL) + return FAIL; + if (put_line(fd, " exe 'bwipe ' . s:wipebuf") == FAIL) + return FAIL; + if (put_line(fd, "endif") == FAIL) + return FAIL; + if (put_line(fd, "unlet! s:wipebuf") == FAIL) + return FAIL; + + /* * Restore window sizes again after jumping around in windows, because the * current window has a minimum size while others may not. */ |