Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

; * lisp/eshell/esh-cmd.el (eshell-lisp-command): Simplify.

Browse source
This commit is contained in:
Jim Porter 2025-07-20 16:05:00 -07:00
parent dc38f05757
commit cb2de76614
1 changed files with 24 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
lisp/eshell/esh-cmd.el
View file

@ -1585,36 +1585,30 @@ a string naming a Lisp function."
(setq eshell-last-arguments args)
(let* ((eshell-ensure-newline-p t)
(command-form-p (functionp object))
(result
(if command-form-p
(let ((numeric (not (get object
'eshell-no-numeric-conversions)))
(fname-args (get object 'eshell-filename-arguments)))
(when (or numeric fname-args)
(while args
(let ((arg (car args)))
(cond
((and numeric (eshell--numeric-string-p arg))
;; If any of the arguments are flagged as
;; numbers waiting for conversion, convert
;; them now.
(setcar args (string-to-number arg)))
((and fname-args (stringp arg)
(string-equal arg "~"))
;; If any of the arguments match "~",
;; prepend "./" to treat it as a regular
;; file name.
(setcar args (concat "./" arg)))))
(setq args (cdr args))))
(setq eshell-last-command-name
(concat "#<function " (symbol-name object) ">"))
(eshell-apply* #'eshell-print-maybe-n
#'eshell-error-maybe-n
object eshell-last-arguments))
(setq eshell-last-command-name "#<Lisp object>")
(eshell-eval* #'eshell-print-maybe-n
#'eshell-error-maybe-n
object))))
result)
(if command-form-p
(let ((numeric (not (get object 'eshell-no-numeric-conversions)))
(fname-args (get object 'eshell-filename-arguments)))
(when (or numeric fname-args)
(while args
(let ((arg (car args)))
(cond
((and numeric (eshell--numeric-string-p arg))
;; If any of the arguments are flagged as numbers
;; waiting for conversion, convert them now.
(setcar args (string-to-number arg)))
((and fname-args (stringp arg)
(string-equal arg "~"))
;; If any of the arguments match "~", prepend "./"
;; to treat it as a regular file name.
(setcar args (concat "./" arg)))))
(setq args (cdr args))))
(setq eshell-last-command-name
(concat "#<function " (symbol-name object) ">")))
(setq eshell-last-command-name "#<Lisp object>"))
(setq result (eshell-exec-lisp
#'eshell-print-maybe-n #'eshell-error-maybe-n
object eshell-last-arguments (not command-form-p)))
(when (memq eshell-in-pipeline-p '(nil last))
(eshell-set-exit-info
;; If `eshell-lisp-form-nil-is-failure' is non-nil, Lisp forms