]> git.eshelyaron.com Git - emacs.git/commitdiff
; Rename 'eshell-flatten-args' token to 'eshell-splice-immediately'
authorJim Porter <jporterbugs@gmail.com>
Mon, 12 Dec 2022 04:19:57 +0000 (20:19 -0800)
committerJim Porter <jporterbugs@gmail.com>
Fri, 16 Dec 2022 05:41:03 +0000 (21:41 -0800)
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

index 0b175be713e86de189e1fa20888344dfecd85b85..871211967156e101f6d79c426709cf95c88fd1cf 100644 (file)
@@ -301,7 +301,8 @@ argument list in place of the value of the current argument."
         (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 @@ Point is left at the end of the 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)