mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-17 19:30:38 -08:00
Code Issues Projects Releases Wiki Activity

Fix wrong value of when and unless with empty body (bug#74215)

Browse source 
* lisp/subr.el (when, unless): Return nil when the body is empty.
Reported by Brennan Vincent.
* test/lisp/subr-tests.el (subr-test-when): Add test cases.

(cherry picked from commit 9ee9154247)
This commit is contained in:
Mattias Engdegård 2024-11-06 13:29:23 +01:00 • committed by Eli Zaretskii
parent 3231af3727
commit e88309eef3
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/subr.el
View file

@ -299,7 +299,7 @@ value of last one, or nil if there are none."
(if body (if body
(list 'if cond (cons 'progn body)) (list 'if cond (cons 'progn body))
(macroexp-warn-and-return (format-message "`when' with empty body") (macroexp-warn-and-return (format-message "`when' with empty body")
cond '(empty-body when) t))) (list 'progn cond nil) '(empty-body when) t)))
(defmacro unless (cond &rest body) (defmacro unless (cond &rest body)
"If COND yields nil, do BODY, else return nil. "If COND yields nil, do BODY, else return nil.
@ -309,7 +309,7 @@ value of last one, or nil if there are none."
(if body (if body
(cons 'if (cons cond (cons nil body))) (cons 'if (cons cond (cons nil body)))
(macroexp-warn-and-return (format-message "`unless' with empty body") (macroexp-warn-and-return (format-message "`unless' with empty body")
cond '(empty-body unless) t))) (list 'progn cond nil) '(empty-body unless) t)))
(defsubst subr-primitive-p (object) (defsubst subr-primitive-p (object)
"Return t if OBJECT is a built-in primitive written in C. "Return t if OBJECT is a built-in primitive written in C.

6
test/lisp/subr-tests.el
View file

@ -454,7 +454,11 @@
x))) x)))
(should (= x 2))) (should (= x 2)))
(should (equal (macroexpand-all '(when a b c d)) (should (equal (macroexpand-all '(when a b c d))
'(if a (progn b c d))))) '(if a (progn b c d))))
(with-suppressed-warnings ((empty-body when unless))
(should (equal (when t) nil))
(should (equal (unless t) nil))
(should (equal (unless nil) nil))))
(ert-deftest subr-test-xor () (ert-deftest subr-test-xor ()
"Test `xor'." "Test `xor'."