From ea3c147d2dcb65840ad5ec5c4d8786d36a5ea0dc Mon Sep 17 00:00:00 2001 From: Jim Porter Date: Sun, 13 Mar 2022 15:36:37 +0100 Subject: [PATCH] Fix evaluation of negated argument predicates in Eshell * lisp/eshell/em-pred.el (eshell-add-pred-func): Let-bind 'pred' so the lambdas see the original value (bug#54369). --- lisp/eshell/em-pred.el | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lisp/eshell/em-pred.el b/lisp/eshell/em-pred.el index 216c71f59e4..970329e12a9 100644 --- a/lisp/eshell/em-pred.el +++ b/lisp/eshell/em-pred.el @@ -360,12 +360,12 @@ resultant list of strings." (defun eshell-add-pred-func (pred funcs negate follow) "Add the predicate function PRED to FUNCS." - (if negate - (setq pred (lambda (file) - (not (funcall pred file))))) - (if follow - (setq pred (lambda (file) - (funcall pred (file-truename file))))) + (when negate + (setq pred (let ((pred pred)) + (lambda (file) (not (funcall pred file)))))) + (when follow + (setq pred (let ((pred pred)) + (lambda (file) (funcall pred (file-truename file)))))) (cons pred funcs)) (defun eshell-pred-user-or-group (mod-char mod-type attr-index get-id-func) -- 2.39.5