From: Mark Oteiza <mvoteiza@udel.edu>
Date: Fri, 15 Sep 2017 19:37:25 +0000 (-0400)
Subject: * lisp/json.el (json-read-keyword): Revert previous change to catch EOL.
X-Git-Tag: emacs-26.0.90~173^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9785d3513741c598ae53aecafacbb9bca3e53e48;p=emacs.git

* lisp/json.el (json-read-keyword): Revert previous change to catch EOL.
---

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)