diff options
| author | Eli Zaretskii | 2019-04-13 10:07:15 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2019-04-13 10:07:15 +0300 |
| commit | 2475687d2f0ca6a605d091bb7acb723d0dace27b (patch) | |
| tree | 977ae5a872959d149f09e759a20a0a5370ce1379 /doc | |
| parent | 7ddd08bd3ebc48998062a7d29274cf080256a48f (diff) | |
| download | emacs-2475687d2f0ca6a605d091bb7acb723d0dace27b.tar.gz emacs-2475687d2f0ca6a605d091bb7acb723d0dace27b.zip | |
Improve documentation changes of a recent commit
* doc/lispref/text.texi (Parsing JSON): Improve wording of the
documentation of 'json-parse-string' and 'json-parse-buffer'.
* src/json.c (Fjson_parse_string, Fjson_parse_buffer): Doc fix.
(Bug#34763)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lispref/text.texi | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index b46ee647862..e8de8177e30 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi | |||
| @@ -5156,8 +5156,11 @@ as in @code{json-parse-string}. | |||
| 5156 | 5156 | ||
| 5157 | @defun json-parse-string string &rest args | 5157 | @defun json-parse-string string &rest args |
| 5158 | This function parses the JSON value in @var{string}, which must be a | 5158 | This function parses the JSON value in @var{string}, which must be a |
| 5159 | Lisp string. The argument @var{args} is a list of keyword/argument | 5159 | Lisp string. If @var{string} doesn't contain a valid JSON object, |
| 5160 | pairs. The following keywords are accepted: | 5160 | this function signals the @code{json-parse-error} error. |
| 5161 | |||
| 5162 | The argument @var{args} is a list of keyword/argument pairs. The | ||
| 5163 | following keywords are accepted: | ||
| 5161 | 5164 | ||
| 5162 | @table @code | 5165 | @table @code |
| 5163 | @item :object-type | 5166 | @item :object-type |
| @@ -5186,9 +5189,9 @@ keyword @code{false}. It defaults to the symbol @code{:false}. | |||
| 5186 | @defun json-parse-buffer &rest args | 5189 | @defun json-parse-buffer &rest args |
| 5187 | This function reads the next JSON value from the current buffer, | 5190 | This function reads the next JSON value from the current buffer, |
| 5188 | starting at point. It moves point to the position immediately after | 5191 | starting at point. It moves point to the position immediately after |
| 5189 | the value if a value could be read and converted to Lisp; otherwise it | 5192 | the value if contains a valid JSON object; otherwise it signals the |
| 5190 | doesn't move point. The arguments @var{args} are interpreted as in | 5193 | @code{json-parse-error} error and doesn't move point. The arguments |
| 5191 | @code{json-parse-string}. | 5194 | @var{args} are interpreted as in @code{json-parse-string}. |
| 5192 | @end defun | 5195 | @end defun |
| 5193 | 5196 | ||
| 5194 | @node JSONRPC | 5197 | @node JSONRPC |