Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
7c1bf12e
Commit
7c1bf12e
authored
Nov 25, 2013
by
Simon Schubert
Committed by
Dmitry Gutov
Nov 25, 2013
Browse files
* lisp/json.el (json-alist-p): Only return non-nil if the alist has
simple keys. Fixes: debbugs:13518
parent
64e41529
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/json.el
lisp/json.el
+3
-2
No files found.
lisp/ChangeLog
View file @
7c1bf12e
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
...
...
lisp/json.el
View file @
7c1bf12e
...
...
@@ -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
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment