aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2021-02-13 16:10:53 +0200
committerEli Zaretskii2021-02-13 16:10:53 +0200
commitc535fe647c02ccde424340dc8ceae75922443ca5 (patch)
tree86c4e3f27b3ab19497b4009775316f40226ebbf3 /src
parent1680a1c0945cb0aa7e0e16867a9dacb8316cbf33 (diff)
downloademacs-c535fe647c02ccde424340dc8ceae75922443ca5.tar.gz
emacs-c535fe647c02ccde424340dc8ceae75922443ca5.zip
; * src/json.c (Fjson_parse_string): Fix the doc string.
Diffstat (limited to 'src')
-rw-r--r--src/json.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/json.c b/src/json.c
index 3562e175cfa..3f1d27ad7fb 100644
--- a/src/json.c
+++ b/src/json.c
@@ -928,14 +928,14 @@ json_to_lisp (json_t *json, const struct json_configuration *conf)
928 928
929DEFUN ("json-parse-string", Fjson_parse_string, Sjson_parse_string, 1, MANY, 929DEFUN ("json-parse-string", Fjson_parse_string, Sjson_parse_string, 1, MANY,
930 NULL, 930 NULL,
931 doc: /* Parse the JSON STRING into a Lisp object. This is 931 doc: /* Parse the JSON STRING into a Lisp object.
932essentially the reverse operation of `json-serialize', which see. The 932This is essentially the reverse operation of `json-serialize', which
933returned object will be the JSON null value, the JSON false value, t, 933see. The returned object will be the JSON null value, the JSON false
934a number, a string, a vector, a list, a hashtable, an alist, or a 934value, t, a number, a string, a vector, a list, a hashtable, an alist,
935plist. Its elements will be further objects of these types. If there 935or a plist. Its elements will be further objects of these types. If
936are duplicate keys in an object, all but the last one are ignored. If 936there are duplicate keys in an object, all but the last one are
937STRING doesn't contain a valid JSON object, this function signals an 937ignored. If STRING doesn't contain a valid JSON object, this function
938error of type `json-parse-error'. 938signals an error of type `json-parse-error'.
939 939
940The arguments ARGS are a list of keyword/argument pairs: 940The arguments ARGS are a list of keyword/argument pairs:
941 941