diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-10-13 00:13:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-13 00:13:39 +0200 |
| commit | 51937e1322de0e4348c217947c117f54f3c664c3 (patch) | |
| tree | 65be4944976933d8c096cff724c10636b7c102b2 /src/nvim/ex_docmd.c | |
| parent | e9fd1244b799ab4fc79cc734e780aceaa79c4a04 (diff) | |
| parent | 6b7faf22f4c2a7cdfeae5a8bd72674252a7740d7 (diff) | |
| download | rneovim-51937e1322de0e4348c217947c117f54f3c664c3.tar.gz rneovim-51937e1322de0e4348c217947c117f54f3c664c3.tar.bz2 rneovim-51937e1322de0e4348c217947c117f54f3c664c3.zip | |
Merge #5470 from justinmk/pr5445
Diffstat (limited to 'src/nvim/ex_docmd.c')
| -rw-r--r-- | src/nvim/ex_docmd.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index 45407b7f12..9f83688e1e 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -6726,11 +6726,6 @@ do_exedit ( old_curwin == NULL ? curwin : NULL); } else if ((eap->cmdidx != CMD_split && eap->cmdidx != CMD_vsplit) || *eap->arg != NUL) { - // ":edit <blank>" is a no-op in terminal buffers. #2822 - if (curbuf->terminal != NULL && eap->cmdidx == CMD_edit && *eap->arg == NUL) { - return; - } - /* Can't edit another file when "curbuf_lock" is set. Only ":edit" * can bring us here, others are stopped earlier. */ if (*eap->arg != NUL && curbuf_locked()) @@ -7921,9 +7916,8 @@ static void ex_normal(exarg_T *eap) if (force_restart_edit) { force_restart_edit = false; } else { - // some function called was aware of ex_normal and decided to override the - // value of restart_edit anyway. So far only used in terminal mode(see - // terminal_enter() in edit.c) + // Some function (terminal_enter()) was aware of ex_normal and decided to + // override the value of restart_edit anyway. restart_edit = save_restart_edit; } p_im = save_insertmode; |