aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/eval/decode.c
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2016-03-12 13:47:34 +0300
committerZyX <kp-pav@yandex.ru>2016-04-18 02:48:20 +0300
commitc129f6cfafc77d3f6e22b2ac11b5c8f2cec033d3 (patch)
treeb40e1c23690bf9ddffff8722d2b7019247bdd41a /src/nvim/eval/decode.c
parentd06c2a1b1846a96a45625ad5472a235b2d249933 (diff)
downloadrneovim-c129f6cfafc77d3f6e22b2ac11b5c8f2cec033d3.tar.gz
rneovim-c129f6cfafc77d3f6e22b2ac11b5c8f2cec033d3.tar.bz2
rneovim-c129f6cfafc77d3f6e22b2ac11b5c8f2cec033d3.zip
eval/decode: Accept `\r` as space character
Diffstat (limited to 'src/nvim/eval/decode.c')
-rw-r--r--src/nvim/eval/decode.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/nvim/eval/decode.c b/src/nvim/eval/decode.c
index 2e9bf8fbac..10dd36c137 100644
--- a/src/nvim/eval/decode.c
+++ b/src/nvim/eval/decode.c
@@ -617,7 +617,7 @@ int json_decode_string(const char *const buf, const size_t buf_len,
{
const char *p = buf;
const char *const e = buf + buf_len;
- while (p < e && (*p == ' ' || *p == '\t' || *p == '\n')) {
+ while (p < e && (*p == ' ' || *p == TAB || *p == NL || *p == CAR)) {
p++;
}
if (p == e) {
@@ -730,7 +730,8 @@ json_decode_string_cycle_start:
}
case ' ':
case TAB:
- case NL: {
+ case NL:
+ case CAR: {
continue;
}
case 'n': {
@@ -870,7 +871,8 @@ json_decode_string_after_cycle:
switch (*p) {
case NL:
case ' ':
- case TAB: {
+ case TAB:
+ case CAR: {
break;
}
default: {