aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/getchar.c6
-rw-r--r--src/nvim/popupmnu.c2
-rw-r--r--src/nvim/version.c4
3 files changed, 10 insertions, 2 deletions
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index 0d61172d69..c3f6e2c2b6 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -2209,6 +2209,12 @@ static int vgetorpeek(int advance)
}
if (c < 0)
continue; /* end of input script reached */
+
+ // Allow mapping for just typed characters. When we get here c
+ // is the number of extra bytes and typebuf.tb_len is 1.
+ for (n = 1; n <= c; n++) {
+ typebuf.tb_noremap[typebuf.tb_off + n] = RM_YES;
+ }
typebuf.tb_len += c;
/* buffer full, don't map */
diff --git a/src/nvim/popupmnu.c b/src/nvim/popupmnu.c
index f4e60ddde9..19b92c5789 100644
--- a/src/nvim/popupmnu.c
+++ b/src/nvim/popupmnu.c
@@ -541,7 +541,9 @@ static int pum_set_selected(int n, int repeat)
if ((p_pvh > 0) && (p_pvh < g_do_tagpreview)) {
g_do_tagpreview = p_pvh;
}
+ RedrawingDisabled++;
resized = prepare_tagpreview(false);
+ RedrawingDisabled--;
g_do_tagpreview = 0;
if (curwin->w_p_pvw) {
diff --git a/src/nvim/version.c b/src/nvim/version.c
index eac494389b..581f057f7c 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -213,7 +213,7 @@ static int included_patches[] = {
//385,
//384 NA
383,
- //382,
+ 382,
381,
//380 NA
379,
@@ -234,7 +234,7 @@ static int included_patches[] = {
364,
//363,
362,
- //361,
+ 361,
//360,
//359,
358,