aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/getchar.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2019-05-27 12:01:35 +0200
committerGitHub <noreply@github.com>2019-05-27 12:01:35 +0200
commit69b3d5acd375e36a06474c6ebd2622cb0c2fcca5 (patch)
treef34ba1b9e0e138f86666e77280da66f6ca0687e3 /src/nvim/getchar.c
parentfb4d5a184678ab231da20ef559c8e423dfa54d6e (diff)
parent3c3b7844b95879bcfd86677df4cfac3edb0fb132 (diff)
downloadrneovim-69b3d5acd375e36a06474c6ebd2622cb0c2fcca5.tar.gz
rneovim-69b3d5acd375e36a06474c6ebd2622cb0c2fcca5.tar.bz2
rneovim-69b3d5acd375e36a06474c6ebd2622cb0c2fcca5.zip
Merge #10068 from janlazo/vim-8.1.0020
vim-patch:8.1.{20,995,1077}
Diffstat (limited to 'src/nvim/getchar.c')
-rw-r--r--src/nvim/getchar.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index ec14803a2e..ef522242c6 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -1100,7 +1100,7 @@ static void gotchars(char_u *chars, size_t len)
int c;
// remember how many chars were last recorded
- if (Recording) {
+ if (reg_recording != 0) {
last_recorded_len += len;
}
@@ -1109,7 +1109,7 @@ static void gotchars(char_u *chars, size_t len)
c = *s++;
updatescript(c);
- if (Recording) {
+ if (reg_recording != 0) {
char buf[2] = { (char)c, NUL };
add_buff(&recordbuff, buf, 1L);
}
@@ -1666,8 +1666,9 @@ static int vgetorpeek(int advance)
init_typebuf();
start_stuff();
- if (advance && typebuf.tb_maplen == 0)
- Exec_reg = FALSE;
+ if (advance && typebuf.tb_maplen == 0) {
+ reg_executing = 0;
+ }
do {
/*
* get a character: 1. from the stuffbuffer