procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Give 'when-let' and 'when-let*' their own Edebug specification.

Browse source 
The Edebug specification of 'if-let' and 'if-let*' doesn't work if the
body is empty.  While that's a pathological case, it's not wrong per
se, and could arguably happen due to macro expansion.

* lisp/emacs-lisp/subr-x.el (when-let*, when-let): Don't reuse Edebug
specification from 'if-let*' and 'if-let'.
This commit is contained in:
Philipp Stephani 2021-05-22 13:29:50 +02:00
parent 91fa95bde0
commit 33a52cb458
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/emacs-lisp/subr-x.el
View file

@ -139,7 +139,9 @@ This is like `if-let' but doesn't handle a VARLIST of the form
"Bind variables according to VARLIST and conditionally evaluate BODY.
This is like `when-let' but doesn't handle a VARLIST of the form
\(SYMBOL SOMETHING) specially."
(declare (indent 1) (debug if-let*))
(declare (indent 1)
(debug ((&rest [&or symbolp (symbolp form) (form)])
body)))
(list 'if-let* varlist (macroexp-progn body)))
(defmacro and-let* (varlist &rest body)
@ -190,7 +192,10 @@ Evaluate each binding in turn, stopping if a binding value is nil.
If all are non-nil, return the value of the last form in BODY.
The variable list SPEC is the same as in `if-let'."
(declare (indent 1) (debug if-let))
(declare (indent 1)
(debug ([&or (symbolp form) ; must be first, Bug#48489
(&rest [&or symbolp (symbolp form) (form)])]
body)))
(list 'if-let spec (macroexp-progn body)))
(defsubst hash-table-empty-p (hash-table)