[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-30 d3c94102266: Fix Eshell's evaluation of empty 'progn' forms
From: |
Jim Porter |
Subject: |
emacs-30 d3c94102266: Fix Eshell's evaluation of empty 'progn' forms |
Date: |
Wed, 16 Oct 2024 14:03:53 -0400 (EDT) |
branch: emacs-30
commit d3c94102266fa1fe167f699a92b9064c02b63d4f
Author: Jim Porter <jporterbugs@gmail.com>
Commit: Jim Porter <jporterbugs@gmail.com>
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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-30 d3c94102266: Fix Eshell's evaluation of empty 'progn' forms,
Jim Porter <=