aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/json.el
diff options
context:
space:
mode:
authorK. Handa2015-09-01 20:46:15 +0900
committerK. Handa2015-09-01 20:46:15 +0900
commit3e0e2339cd379eeba8d9bc758f2e8e574144e252 (patch)
tree9d119efed6e52e5c24dbd84836148157271799a8 /lisp/json.el
parent524eeb2e5e158d98ea52fe5ebe4768c4433ba8b2 (diff)
parentff0a92f6461941902eb9e974bdd2ff9adacb7bc4 (diff)
downloademacs-3e0e2339cd379eeba8d9bc758f2e8e574144e252.tar.gz
emacs-3e0e2339cd379eeba8d9bc758f2e8e574144e252.zip
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'lisp/json.el')
-rw-r--r--lisp/json.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/json.el b/lisp/json.el
index eaf8596a6dc..5392a13f9e0 100644
--- a/lisp/json.el
+++ b/lisp/json.el
@@ -286,7 +286,7 @@ representation will be parsed correctly."
286(defun json-read-string () 286(defun json-read-string ()
287 "Read the JSON string at point." 287 "Read the JSON string at point."
288 (unless (char-equal (json-peek) ?\") 288 (unless (char-equal (json-peek) ?\")
289 (signal 'json-string-format (list "doesn't start with '\"'!"))) 289 (signal 'json-string-format (list "doesnt start with \"!")))
290 ;; Skip over the '"' 290 ;; Skip over the '"'
291 (json-advance) 291 (json-advance)
292 (let ((characters '()) 292 (let ((characters '())