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).

diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el
index e97e4f6d0672dae6e13e931e5475ea5f1a844f2c..528c7f955943a07a1a5d894b8ce5361cb2bcef1d 100644 (file)
--- 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