[Emacs-diffs] master 32f80eb: Fix definition of whitespace in JSON

[Philipp Stephani]

branch: master
commit 32f80eb678c4dc6335063cc39975bbce2766829a
Author: Philipp Stephani <address@hidden>
Commit: Philipp Stephani <address@hidden>

    Fix definition of whitespace in JSON
    
    See
    https://lists.gnu.org/archive/html/emacs-devel/2017-05/msg00115.html.
    
    * lisp/json.el (json-skip-whitespace): Fix definition.
    * test/lisp/json-tests.el (test-json-skip-whitespace): Adapt unit
    test.
---
 lisp/json.el            | 6 +++++-
 test/lisp/json-tests.el | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lisp/json.el b/lisp/json.el
index 5f403a4..3def94c 100644
--- a/lisp/json.el
+++ b/lisp/json.el
@@ -206,7 +206,11 @@ Unlike `reverse', this keeps the property-value pairs 
intact."
 
 (defun json-skip-whitespace ()
   "Skip past the whitespace at point."
-  (skip-chars-forward "\t\r\n\f\b "))
+  ;; See
+  ;; https://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf
+  ;; or https://tools.ietf.org/html/rfc7159#section-2 for the
+  ;; definition of whitespace in JSON.
+  (skip-chars-forward "\t\r\n "))
 
 
 
diff --git a/test/lisp/json-tests.el b/test/lisp/json-tests.el
index 38672de..c6bd295 100644
--- a/test/lisp/json-tests.el
+++ b/test/lisp/json-tests.el
@@ -89,7 +89,10 @@ Point is moved to beginning of the buffer."
 (ert-deftest test-json-skip-whitespace ()
   (json-tests--with-temp-buffer "\t\r\n\f\b { \"a\": 1 }"
     (json-skip-whitespace)
-    (should (equal (char-after (point)) ?{))))
+    (should (equal (char-after) ?\f)))
+  (json-tests--with-temp-buffer "\t\r\n\t { \"a\": 1 }"
+    (json-skip-whitespace)
+    (should (equal (char-after) ?{))))
 
 ;;; Paths