diff options
| author | Eli Zaretskii | 2021-02-13 16:10:53 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2021-02-13 16:10:53 +0200 |
| commit | c535fe647c02ccde424340dc8ceae75922443ca5 (patch) | |
| tree | 86c4e3f27b3ab19497b4009775316f40226ebbf3 /src/json.c | |
| parent | 1680a1c0945cb0aa7e0e16867a9dacb8316cbf33 (diff) | |
| download | emacs-c535fe647c02ccde424340dc8ceae75922443ca5.tar.gz emacs-c535fe647c02ccde424340dc8ceae75922443ca5.zip | |
; * src/json.c (Fjson_parse_string): Fix the doc string.
Diffstat (limited to 'src/json.c')
| -rw-r--r-- | src/json.c | 16 |
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 | ||
| 929 | DEFUN ("json-parse-string", Fjson_parse_string, Sjson_parse_string, 1, MANY, | 929 | DEFUN ("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. |
| 932 | essentially the reverse operation of `json-serialize', which see. The | 932 | This is essentially the reverse operation of `json-serialize', which |
| 933 | returned object will be the JSON null value, the JSON false value, t, | 933 | see. The returned object will be the JSON null value, the JSON false |
| 934 | a number, a string, a vector, a list, a hashtable, an alist, or a | 934 | value, t, a number, a string, a vector, a list, a hashtable, an alist, |
| 935 | plist. Its elements will be further objects of these types. If there | 935 | or a plist. Its elements will be further objects of these types. If |
| 936 | are duplicate keys in an object, all but the last one are ignored. If | 936 | there are duplicate keys in an object, all but the last one are |
| 937 | STRING doesn't contain a valid JSON object, this function signals an | 937 | ignored. If STRING doesn't contain a valid JSON object, this function |
| 938 | error of type `json-parse-error'. | 938 | signals an error of type `json-parse-error'. |
| 939 | 939 | ||
| 940 | The arguments ARGS are a list of keyword/argument pairs: | 940 | The arguments ARGS are a list of keyword/argument pairs: |
| 941 | 941 | ||