mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-13 09:32:47 +00:00
Code Issues Releases Activity

Eliminate use of cl-concatenate in 'seq' package

Browse Source 
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
This commit is contained in:
Andrew Eggenberger 2020-02-27 21:43:47 -06:00 committed by Noam Postavsky
parent 363d927086
commit 3cbf4cb796
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/emacs-lisp/cl-extra.el
View File

@ -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.

6
lisp/emacs-lisp/seq.el
View File

@ -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.