diff options
| author | Era Eriksson <era+emacs@iki.fi> | 2015-02-05 14:52:03 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-02-05 14:52:03 -0500 |
| commit | 6aa04a5570b50a68665e69231f3e36b2a4625f40 (patch) | |
| tree | 71c5c3f494ce7f86fc1652174cb5b7074afef290 | |
| parent | f06902840eff62e83858a40b4e139b61d254107a (diff) | |
| download | emacs-6aa04a5570b50a68665e69231f3e36b2a4625f40.tar.gz emacs-6aa04a5570b50a68665e69231f3e36b2a4625f40.tar.bz2 emacs-6aa04a5570b50a68665e69231f3e36b2a4625f40.zip | |
* lisp/json.el (json-end-of-file): New error.
Fixes: debbugs:19768
(json-pop, json-read): Use it.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/json.el | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a1e43e14c7b..9838d68f7d3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-05 Era Eriksson <era+emacs@iki.fi> + + * json.el (json-end-of-file): New error (bug#19768). + (json-pop, json-read): Use it. + 2015-02-05 Kelly Dean <kelly@prtime.org> * help-mode.el (help-xref-interned): Pass BUFFER and FRAME to @@ -14384,7 +14389,7 @@ Change default to "# encoding: %s" to differentiate it from the default Ruby encoding comment template. -2013-11-20 era eriksson <era+emacsbugs@iki.fi> +2013-11-20 Era Eriksson <era+emacsbugs@iki.fi> * ses.el (ses-mode): Doc fix. (Bug#14748) diff --git a/lisp/json.el b/lisp/json.el index 68ab020c379..98974e67b7e 100644 --- a/lisp/json.el +++ b/lisp/json.el @@ -166,7 +166,7 @@ without indentation.") "Advance past the character at point, returning it." (let ((char (json-peek))) (if (eq char :json-eof) - (signal 'end-of-file nil) + (signal 'json-end-of-file nil) (json-advance) char))) @@ -186,6 +186,8 @@ without indentation.") (define-error 'json-string-format "Bad string format" 'json-error) (define-error 'json-key-format "Bad JSON object key" 'json-error) (define-error 'json-object-format "Bad JSON object" 'json-error) +(define-error 'json-end-of-file "End of file while parsing JSON" + '(end-of-file json-error)) @@ -554,7 +556,7 @@ Advances point just past JSON object." (if (functionp (car record)) (apply (car record) (cdr record)) (signal 'json-readtable-error record))) - (signal 'end-of-file nil)))) + (signal 'json-end-of-file nil)))) ;; Syntactic sugar for the reader |