diff options
| author | Mark Oteiza <mvoteiza@udel.edu> | 2017-09-15 15:37:25 -0400 |
|---|---|---|
| committer | Mark Oteiza <mvoteiza@udel.edu> | 2017-09-15 15:38:44 -0400 |
| commit | 9785d3513741c598ae53aecafacbb9bca3e53e48 (patch) | |
| tree | 54631834676d55ef56704e8fb1fbcf9fd8735b5a /lisp | |
| parent | 541b596bf155ceb17958e1d122920f6bb1a1ab58 (diff) | |
| download | emacs-9785d3513741c598ae53aecafacbb9bca3e53e48.tar.gz | |
* lisp/json.el (json-read-keyword): Revert previous change to catch EOL.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/json.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/json.el b/lisp/json.el index b13ec781b48..d5f05fed95f 100644 --- a/lisp/json.el +++ b/lisp/json.el @@ -305,7 +305,7 @@ KEYWORD is the keyword expected." (json-advance)) keyword) (json-skip-whitespace) - (unless (memq (following-char) '(?\] ?, ?})) + (unless (looking-at "\\([],}]\\|$\\)") (signal 'json-unknown-keyword (list (save-excursion (backward-word-strictly 1) |