aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/edit.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2016-10-09 16:00:12 +0200
committerJustin M. Keyes <justinkz@gmail.com>2016-10-12 21:37:08 +0200
commit6b7faf22f4c2a7cdfeae5a8bd72674252a7740d7 (patch)
tree3200dd0b3f164c51d451bc5901b17d6d71b59dfa /src/nvim/edit.c
parent538255c228acb59b6596011627abd2f6e0fa67d1 (diff)
downloadrneovim-6b7faf22f4c2a7cdfeae5a8bd72674252a7740d7.tar.gz
rneovim-6b7faf22f4c2a7cdfeae5a8bd72674252a7740d7.tar.bz2
rneovim-6b7faf22f4c2a7cdfeae5a8bd72674252a7740d7.zip
main.c: "BufReadCmd term://": Skip existing terminal.
Check `exists('b:term_title')` to avoid the BufReadCmd for already-initialized :terminal buffers. Move the test for `:argadd`. Add a test for `:edit<CR>`. Tweak comments and code style.
Diffstat (limited to 'src/nvim/edit.c')
-rw-r--r--src/nvim/edit.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index 892748ff5c..51c9fb1556 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -1286,10 +1286,9 @@ bool edit(int cmdchar, bool startln, long count)
{
if (curbuf->terminal) {
if (ex_normal_busy) {
- // don't enter terminal mode from `ex_normal`, which can result in all
- // kinds of havoc(such as terminal mode recursiveness). Instead, set a
- // flag that allow us to force-set the value of `restart_edit` before
- // `ex_normal` returns
+ // Do not enter terminal mode from ex_normal(), which would cause havoc
+ // (such as terminal-mode recursiveness). Instead set a flag to force-set
+ // the value of `restart_edit` before `ex_normal` returns.
restart_edit = 'i';
force_restart_edit = true;
} else {