From 337b6179df852350b52409fd3806e4b47ab2875b Mon Sep 17 00:00:00 2001
From: Matthew Malcomson <hardenedapple@gmail.com>
Date: Sat, 1 Apr 2017 20:50:29 +0100
Subject: 'pastetoggle': support value >1 char (#6421)

If we `set pastetoggle=abcde`, and manually type it, then `vgetorpeek()`
sees part of the option before it has all been inserted into the
typebuffer.
To signify this it sets `keylen = KEYLEN_PART_KEY`, but the condition
about whether to return the current key from `vgetorpeek()` only checks
for `keylen = KEYLEN_PART_MAP`.
Add a check for `KEYLEN_PART_KEY` to account for the `'pastetoggle'`
option.
---
 src/nvim/getchar.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nvim/getchar.c')

diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index 7143819e21..b83681ad01 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -1903,7 +1903,7 @@ static int vgetorpeek(int advance)
           }
 
           if ((mp == NULL || max_mlen >= mp_match_len)
-              && keylen != KEYLEN_PART_MAP) {
+              && keylen != KEYLEN_PART_MAP && keylen != KEYLEN_PART_KEY) {
             // No matching mapping found or found a non-matching mapping that
             // matches at least what the matching mapping matched
             keylen = 0;
-- 
cgit 


From 12fc1defd6a1b13d1f801173e0b6a1cef28527ae Mon Sep 17 00:00:00 2001
From: Björn Linse <bjorn.linse@gmail.com>
Date: Sat, 15 Apr 2017 11:19:40 +0200
Subject: ops: fix i<c-r> with multi-byte text (#6524)

---
 src/nvim/getchar.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/nvim/getchar.c')

diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index b83681ad01..3b248c4bc6 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -302,13 +302,13 @@ static void add_num_buff(buffheader_T *buf, long n)
  */
 static void add_char_buff(buffheader_T *buf, int c)
 {
-  char bytes[MB_MAXBYTES + 1];
+  uint8_t bytes[MB_MAXBYTES + 1];
 
   int len;
   if (IS_SPECIAL(c)) {
     len = 1;
   } else {
-    len = (*mb_char2bytes)(c, (char_u *)bytes);
+    len = mb_char2bytes(c, bytes);
   }
 
   for (int i = 0; i < len; i++) {
-- 
cgit 


From d88ae748b51963d0188fe41f0abd6ea208bd2eef Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 20:29:19 +0300
Subject: getchar: Fix if block indentation

---
 src/nvim/getchar.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/nvim/getchar.c')

diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index 3b248c4bc6..e056ff488c 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -1849,11 +1849,12 @@ static int vgetorpeek(int advance)
                     mp_match = mp;
                     mp_match_len = keylen;
                   }
-                } else
-                /* No match; may have to check for
-                 * termcode at next character. */
-                if (max_mlen < mlen)
-                  max_mlen = mlen;
+                } else {
+                  // No match; may have to check for termcode at next character.
+                  if (max_mlen < mlen) {
+                    max_mlen = mlen;
+                  }
+                }
               }
             }
 
-- 
cgit 


From c2f3e361c52ec4e7149ea1d8c6a1202e0873da8e Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Wed, 19 Apr 2017 19:11:50 +0300
Subject: *: Add comment to all C files

---
 src/nvim/getchar.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/nvim/getchar.c')

diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index e056ff488c..9d32df5a68 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /*
  * getchar.c
  *
-- 
cgit