andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/json.el (json-alist-p): Only return non-nil if the alist has

Browse source 
simple keys.

Fixes: debbugs:13518
This commit is contained in:
Simon Schubert 2013-11-25 00:49:37 +02:00 • committed by Dmitry Gutov
parent 64e415297c
commit 7c1bf12e5c
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2013-11-24 Simon Schubert <2@0x2c.org>
* json.el (json-alist-p): Only return non-nil if the alist has
simple keys (Bug#13518).
2013-11-22 Mihir Rege <mihirrege@gmail.com> (tiny change)
* progmodes/js.el (js--ctrl-statement-indentation): Fix indent

5
lisp/json.el
View file

@ -126,9 +126,10 @@ without indentation.")
(mapconcat 'identity strings separator))
(defun json-alist-p (list)
"Non-null if and only if LIST is an alist."
"Non-null if and only if LIST is an alist with simple keys."
(while (consp list)
(setq list (if (consp (car list))
(setq list (if (and (consp (car list))
(atom (caar list)))
(cdr list)
'not-alist)))
(null list))