Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
7eab98da
Commit
7eab98da
authored
Mar 22, 2014
by
Daniel Colascione
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix keyword argument parsing. Please bootstrap.
parent
0ceba22e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
1 deletion
+20
-1
lisp/ChangeLog
lisp/ChangeLog
+7
-0
lisp/emacs-lisp/cl-macs.el
lisp/emacs-lisp/cl-macs.el
+2
-1
test/ChangeLog
test/ChangeLog
+5
-0
test/automated/cl-lib.el
test/automated/cl-lib.el
+6
-0
No files found.
lisp/ChangeLog
View file @
7eab98da
2014-03-23 Daniel Colascione <dancol@dancol.org>
* emacs-lisp/cl-macs.el (cl--do-arglist): Use a little `cl-loop'
list to look for keyword arguments instead of `memq', fixing
(Bug#3647) --- unfortunately, only for freshly-compiled code.
Please make bootstrap.
2014-03-23 Richard Stallman <rms@gnu.org>
* battery.el (battery-linux-sysfs): Search for each field
...
...
lisp/emacs-lisp/cl-macs.el
View file @
7eab98da
...
...
@@ -503,7 +503,8 @@ its argument list allows full Common Lisp conventions."
(
varg
(
if
(
consp
(
car
arg
))
(
cl-cadar
arg
)
(
car
arg
)))
(
def
(
if
(
cdr
arg
)
(
cadr
arg
)
(
or
(
car
cl--bind-defs
)
(
cadr
(
assq
varg
cl--bind-defs
)))))
(
look
`
(
memq
',karg
,
restarg
)))
(
look
`
(
cl-loop
for
cl--arg
on
,
restarg
by
#'
cddr
when
(
eq
(
car
cl--arg
)
',karg
)
return
cl--arg
)))
(
and
def
cl--bind-enquote
(
setq
def
`
',def
))
(
if
(
cddr
arg
)
(
let*
((
temp
(
or
(
nth
2
arg
)
(
make-symbol
"--cl-var--"
)))
...
...
test/ChangeLog
View file @
7eab98da
2014-03-23 Daniel Colascione <dancol@dancol.org>
* automated/cl-lib.el (cl-lib-keyword-names-versus-values): New
test: correct parsing of keyword arguments.
2014-03-23 Dmitry Gutov <dgutov@yandex.ru>
* automated/package-test.el (package-test-describe-package):
...
...
test/automated/cl-lib.el
View file @
7eab98da
...
...
@@ -195,4 +195,10 @@
(
should
(
eql
(
cl-mismatch
"Aa"
"aA"
)
0
))
(
should
(
eql
(
cl-mismatch
'
(
a
b
c
)
'
(
a
b
d
))
2
)))
(
ert-deftest
cl-lib-keyword-names-versus-values
()
(
should
(
equal
(
funcall
(
cl-function
(
lambda
(
&key
a
b
)
(
list
a
b
)))
:b
:a
:a
42
)
'
(
42
:a
))))
;;; cl-lib.el ends here
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