summaryrefslogtreecommitdiff
path: root/test/lisp/json-tests.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2018-03-20 08:59:39 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2018-03-20 08:59:39 -0700
commita5f190dd658419e9328a846a1044b8294a7632d9 (patch)
tree551602b98e8d918935d9e36d5f03daafbc710305 /test/lisp/json-tests.el
parent97608c60b8e0d01d59d51e32a9fdbd2bb3e2da58 (diff)
parent23527013c79607ba19536ccce85725a91b0033a5 (diff)
downloademacs-a5f190dd658419e9328a846a1044b8294a7632d9.tar.gz
Merge from origin/emacs-26
23527013c7 ; Rewrap doc string 4328d5f744 Correct Info link markup 2fb52abd9e Improve documentation of 'with-help-window' ec08c62f03 Minor improvements in building.texi 663aafe1ff * lisp/textmodes/bibtex.el (bibtex-mark-entry): activate mark 05781b2e88 ; Spelling fix aa40014ba3 * doc/emacs/building.texi (Starting GUD): Mention 'guiler'. 23072e468f Yet more proofreading of the Emacs manual ba5a372540 * doc/emacs/rmail.texi: Fix broken link. 6b2210cc29 ; Spelling fix 067c8c4f5b Fix recently-added POP doc glitch fb3dc0e8aa More proofreading of the Emacs manual a776ce7be6 Fix typo in the Emacs manual's VC chapter 7f27d42f0b Pass json-readtable-error data as a list (bug#30489) 10bd3b3af8 Improve word motion docs (Bug#30815) 2b8507fbdc Replace "carriage-return" by "carriage return" in manuals 2616cd94f1 Minor copyedits in mule.texi 36a1d52814 Fix problems caused by fontconfig-2.13.0
Diffstat (limited to 'test/lisp/json-tests.el')
-rw-r--r--test/lisp/json-tests.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/lisp/json-tests.el b/test/lisp/json-tests.el
index 47f8047b349..ea562e8b134 100644
--- a/test/lisp/json-tests.el
+++ b/test/lisp/json-tests.el
@@ -309,7 +309,8 @@ Point is moved to beginning of the buffer."
(json-tests--with-temp-buffer ""
(should-error (json-read) :type 'json-end-of-file))
(json-tests--with-temp-buffer "xxx"
- (should-error (json-read) :type 'json-readtable-error)))
+ (let ((err (should-error (json-read) :type 'json-readtable-error)))
+ (should (equal (cdr err) '(?x))))))
(ert-deftest test-json-read-from-string ()
(let ((json-string "{ \"a\": 1 }"))