From d3c94102266fa1fe167f699a92b9064c02b63d4f Mon Sep 17 00:00:00 2001 From: Jim Porter Date: Wed, 16 Oct 2024 10:44:35 -0700 Subject: [PATCH] Fix Eshell's evaluation of empty 'progn' forms Do not merge to master. * lisp/eshell/esh-cmd.el (eshell-do-eval): Make sure we evaluate to 'nil' for 'progn' forms with no body (bug#73722). --- lisp/eshell/esh-cmd.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el index e97e4f6d067..528c7f95594 100644 --- a/lisp/eshell/esh-cmd.el +++ b/lisp/eshell/esh-cmd.el @@ -1266,7 +1266,7 @@ have been replaced by constants." (setq args (cdr args))))) (cond ((eq (car form) 'progn) - (car (last form))) + (car (last (cdr form)))) ((eq (car form) 'prog1) (cadr form)) (t -- 2.30.2