aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2016-02-03 21:55:42 +0300
committerZyX <kp-pav@yandex.ru>2016-04-18 02:45:49 +0300
commit57700def795156ce93526bf12e95a56d90c39206 (patch)
treedf31243dbbe6c866f7a69f97a15eb9a8fa257924
parent5814e29cdbe370a417d654dbd18620849aa00a09 (diff)
downloadrneovim-57700def795156ce93526bf12e95a56d90c39206.tar.gz
rneovim-57700def795156ce93526bf12e95a56d90c39206.tar.bz2
rneovim-57700def795156ce93526bf12e95a56d90c39206.zip
doc: Update documentation regarding converting from/to &encoding
-rw-r--r--runtime/doc/eval.txt9
1 files changed, 6 insertions, 3 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 4676080536..ee8ede2b91 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -4324,7 +4324,9 @@ join({list} [, {sep}]) *join()*
jsondecode({expr}) *jsondecode()*
Convert {expr} from JSON object. Accepts |readfile()|-style
list as the input, as well as regular string. May output any
- Vim value. In the following cases it will output
+ Vim value. When 'encoding' is not UTF-8 string is converted
+ from UTF-8 to 'encoding', failing conversion fails
+ jsondecode(). In the following cases it will output
|msgpack-special-dict|:
1. Dictionary contains duplicate key.
2. Dictionary contains empty key.
@@ -4334,8 +4336,9 @@ jsondecode({expr}) *jsondecode()*
jsonencode({expr}) *jsonencode()*
Convert {expr} into a JSON string. Accepts
- |msgpack-special-dict| as the input. Will not convert
- |Funcref|s, mappings with non-string keys (can be created as
+ |msgpack-special-dict| as the input. Converts from 'encoding'
+ to UTF-8 when encoding strings. Will not convert |Funcref|s,
+ mappings with non-string keys (can be created as
|msgpack-special-dict|), values with self-referencing
containers, strings which contain non-UTF-8 characters,
pseudo-UTF-8 strings which contain codepoints reserved for