Commit 6aa04a55 authored by Era Eriksson's avatar Era Eriksson Committed by Stefan Monnier

* lisp/json.el (json-end-of-file): New error.

Fixes: debbugs:19768

(json-pop, json-read): Use it.
parent f0690284
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)
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment