emacs-27 3cbf4cb 1/2: Eliminate use of cl-concatenate in 'seq' package

[Noam Postavsky]

branch: emacs-27
commit 3cbf4cb79600ade39a186f31448e56e0e6fdd364
Author: Andrew Eggenberger <address@hidden>
Commit: Noam Postavsky <address@hidden>

    Eliminate use of cl-concatenate in 'seq' package
    
    Fixes (Bug#39761) by making cl-extra dependent on seq rather than
    vice versa.
    * lisp/emacs-lisp/seq.el (seq-concatenate): Move cl-concatenate's
    code here instead of calling it.
    * lisp/emacs-lisp/cl-extra.el (cl-concatenate): Use cl-concatenate.
    
    Copyright-paperwork-exempt: yes
---
 lisp/emacs-lisp/cl-extra.el | 6 +-----
 lisp/emacs-lisp/seq.el      | 6 +++++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el
index e3dabdf..e9bfe8d 100644
--- a/lisp/emacs-lisp/cl-extra.el
+++ b/lisp/emacs-lisp/cl-extra.el
@@ -556,11 +556,7 @@ too large if positive or too small if negative)."
 (defun cl-concatenate (type &rest sequences)
   "Concatenate, into a sequence of type TYPE, the argument SEQUENCEs.
 \n(fn TYPE SEQUENCE...)"
-  (pcase type
-    ('vector (apply #'vconcat sequences))
-    ('string (apply #'concat sequences))
-    ('list (apply #'append (append sequences '(nil))))
-    (_ (error "Not a sequence type name: %S" type))))
+  (seq-concatenate type sequences))
 
 ;;; List functions.
 
diff --git a/lisp/emacs-lisp/seq.el b/lisp/emacs-lisp/seq.el
index 0b946dd..629a7a5 100644
--- a/lisp/emacs-lisp/seq.el
+++ b/lisp/emacs-lisp/seq.el
@@ -285,7 +285,11 @@ sorted.  FUNCTION must be a function of one argument."
 TYPE must be one of following symbols: vector, string or list.
 
 \n(fn TYPE SEQUENCE...)"
-  (apply #'cl-concatenate type (seq-map #'seq-into-sequence sequences)))
+  (pcase type
+    ('vector (apply #'vconcat sequences))
+    ('string (apply #'concat sequences))
+    ('list (apply #'append (append sequences '(nil))))
+    (_ (error "Not a sequence type name: %S" type))))
 
 (cl-defgeneric seq-into-sequence (sequence)
   "Convert SEQUENCE into a sequence.