From: Jim Porter <jporterbugs@gmail.com>
Date: Wed, 16 Oct 2024 17:44:35 +0000 (-0700)
Subject: Fix Eshell's evaluation of empty 'progn' forms
X-Git-Tag: archive/raspbian/1%30.1+1-3+rpi1^2~2^2~20^2~350
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d3c94102266fa1fe167f699a92b9064c02b63d4f;p=emacs.git

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