diff options
| author | Mark Oteiza | 2017-09-15 15:37:25 -0400 |
|---|---|---|
| committer | Mark Oteiza | 2017-09-15 15:38:44 -0400 |
| commit | 9785d3513741c598ae53aecafacbb9bca3e53e48 (patch) | |
| tree | 54631834676d55ef56704e8fb1fbcf9fd8735b5a | |
| parent | 541b596bf155ceb17958e1d122920f6bb1a1ab58 (diff) | |
| download | emacs-9785d3513741c598ae53aecafacbb9bca3e53e48.tar.gz emacs-9785d3513741c598ae53aecafacbb9bca3e53e48.zip | |
* lisp/json.el (json-read-keyword): Revert previous change to catch EOL.
| -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." | |||
| 305 | (json-advance)) | 305 | (json-advance)) |
| 306 | keyword) | 306 | keyword) |
| 307 | (json-skip-whitespace) | 307 | (json-skip-whitespace) |
| 308 | (unless (memq (following-char) '(?\] ?, ?})) | 308 | (unless (looking-at "\\([],}]\\|$\\)") |
| 309 | (signal 'json-unknown-keyword | 309 | (signal 'json-unknown-keyword |
| 310 | (list (save-excursion | 310 | (list (save-excursion |
| 311 | (backward-word-strictly 1) | 311 | (backward-word-strictly 1) |