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

Fixes: debbugs:19768
(json-pop, json-read): Use it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a1e43e14c7bf07faf8b3bbe4dd35e0c0b1db3b93..9838d68f7d32618c5dd6782c6d94fffb35169c22 100644 (file)
--- 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 68ab020c37963634ca10da94e0d555d79d8576bf..98974e67b7e304088c4baf21804b1df8b73bbd21 100644 (file)
--- 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))
 
 \f
 
@@ -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