Use `flatten-tree' in Tramp

* lisp/net/tramp-compat.el (tramp-compat-flatten-tree): New defun.
(tramp-compat-flatten-list): Remove.

* lisp/net/tramp-sudoedit.el (tramp-sudoedit-send-command): Use it.

diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el
index df0e0887b4a8f68c49ee5675b05e157e8585424b..e1bd18b0a9074bf0c67aaca89f906d7782e37824 100644 (file)
--- a/lisp/net/tramp-compat.el
+++ b/lisp/net/tramp-compat.el
@@ -264,24 +264,25 @@ If NAME is a remote file name, the local part of NAME is unquoted."
 A nil value for either argument stands for the current time."
     (equal (or t1 (current-time)) (or t2 (current-time)))))
 
+(if (fboundp 'flatten-tree)
+    (defalias 'tramp-compat-flatten-tree 'flatten-tree)
+  (defun tramp-compat-flatten-tree (tree)
+    "Take TREE and \"flatten\" it."
+    (let (elems)
+      (setq tree (list tree))
+      (while (let ((elem (pop tree)))
+               (cond ((consp elem)
+                      (setq tree (cons (car elem) (cons (cdr elem) tree))))
+                     (elem
+                      (push elem elems)))
+               tree))
+      (nreverse elems))))
+
 (add-hook 'tramp-unload-hook
          (lambda ()
            (unload-feature 'tramp-loaddefs 'force)
            (unload-feature 'tramp-compat 'force)))
 
-;; There does not exist a common `flatten-list' yet, this is discussed
-;; in Bug#33309.  For the time being we implement our own version,
-;; derived from `eshell-flatten-list'.
-(defun tramp-compat-flatten-list (args)
-  "Flatten any lists within ARGS, so that there are no sublists."
-  (let ((new-list (list t)))
-    (dolist (a args)
-      (if (and (listp a)
-              (listp (cdr a)))
-         (nconc new-list (tramp-compat-flatten-list a))
-       (nconc new-list (list a))))
-    (cdr new-list)))
-
 (provide 'tramp-compat)
 
 ;;; TODO:

diff --git a/lisp/net/tramp-sudoedit.el b/lisp/net/tramp-sudoedit.el
index 08fc79de95012a72ce759f0c54b9ff5b0f3a5e57..3d25e13073d9519cf1c162f73eaa7c496bc864ec 100644 (file)
--- a/lisp/net/tramp-sudoedit.el
+++ b/lisp/net/tramp-sudoedit.el
@@ -798,13 +798,13 @@ in case of error, t otherwise."
           (user (or (tramp-file-name-user vec) ""))
           (spec (format-spec-make ?h host ?u user))
           (args (append
-                 (tramp-compat-flatten-list
+                 (tramp-compat-flatten-tree
                   (mapcar
                    (lambda (x)
                      (setq x (mapcar (lambda (y) (format-spec y spec)) x))
                      (unless (member "" x) x))
                    login))
-                 (tramp-compat-flatten-list (delq nil args))))
+                 (tramp-compat-flatten-tree (delq nil args))))
           (delete-exited-processes t)
           (process-connection-type tramp-process-connection-type)
           (p (apply #'start-process