aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/edit.c4
-rw-r--r--src/nvim/marktree.c3
2 files changed, 2 insertions, 5 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index cebd08af28..3e57bc8599 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -574,10 +574,8 @@ static int insert_check(VimState *state)
foldCheckClose();
}
- int cmdchar_todo = s->cmdchar;
if (bt_prompt(curbuf)) {
- init_prompt(cmdchar_todo);
- cmdchar_todo = NUL;
+ init_prompt(s->cmdchar);
}
// If we inserted a character at the last position of the last line in the
diff --git a/src/nvim/marktree.c b/src/nvim/marktree.c
index 52e602cd94..25b07366d7 100644
--- a/src/nvim/marktree.c
+++ b/src/nvim/marktree.c
@@ -197,7 +197,7 @@ static inline void split_node(MarkTree *b, mtnode_t *x, const int i)
// x must not be a full node (even if there might be internal space)
static inline void marktree_putp_aux(MarkTree *b, mtnode_t *x, mtkey_t k)
{
- int i = x->n - 1;
+ int i;
if (x->level == 0) {
i = marktree_getp_aux(x, k, 0);
if (i != x->n - 1) {
@@ -905,7 +905,6 @@ continue_same_node:
refkey(b, itr->node, itr->i);
refkey(b, enditr->node, enditr->i);
} else {
- past_right = true;
break;
}
}