From 0aff548b9cdffbe404b42a22dd02f154cb762ba7 Mon Sep 17 00:00:00 2001 From: Jim Porter Date: Sun, 11 Dec 2022 20:19:57 -0800 Subject: [PATCH 3/3] ; Rename 'eshell-flatten-args' token to 'eshell-splice-immediately' This is for symmetry with 'eshell-splice-args' (which performs a splice later on). Since this is just an internal symbol not exposed to users, changing it is safe. * lisp/eshell/esh-arg.el (eshell-parse-arguments, eshell-finish-arg): Use 'eshell-splice-immediately'. --- lisp/eshell/esh-arg.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/eshell/esh-arg.el b/lisp/eshell/esh-arg.el index 0b175be713e..87121196715 100644 --- a/lisp/eshell/esh-arg.el +++ b/lisp/eshell/esh-arg.el @@ -301,7 +301,8 @@ eshell-finish-arg (setq eshell-current-argument (car arguments)) (cl-assert (and (not eshell-arg-listified) (not eshell-current-modifiers))) - (setq eshell-current-argument (cons 'eshell-flatten-args arguments)))) + (setq eshell-current-argument + (cons 'eshell-splice-immediately arguments)))) (throw 'eshell-arg-done t)) (defun eshell-quote-argument (string) @@ -342,7 +343,8 @@ eshell-parse-arguments (buffer-substring here (point-max)))) (when arg (nconc args - (if (eq (car-safe arg) 'eshell-flatten-args) + (if (eq (car-safe arg) + 'eshell-splice-immediately) (cdr arg) (list arg)))))))) (throw 'eshell-incomplete (if (listp delim) -- 2.25.1