summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/seq.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2021-01-14 07:50:28 -0800
committerGlenn Morris <rgm@gnu.org>2021-01-14 07:50:28 -0800
commitc83590b12114a0958c8e26846c87c84f492405bc (patch)
tree3352fc89c72c6b68501f4d66d2828a8377320d8e /lisp/emacs-lisp/seq.el
parent4ad332d844b5b441c05c617304853e80a4714d51 (diff)
parent488204cdc64b6a130042ecc64d59c4538287b81d (diff)
downloademacs-c83590b12114a0958c8e26846c87c84f492405bc.tar.gz
emacs-c83590b12114a0958c8e26846c87c84f492405bc.tar.bz2
emacs-c83590b12114a0958c8e26846c87c84f492405bc.zip
Merge from origin/emacs-27
488204cdc6 (origin/emacs-27) Remove one of recently added warnings ab... 55bc1560ac Fix assertion failure in window_box_height (Bug#45737) 27743e9e70 Fix cl-concatenate inlining 32a3758c84 Fix infloop in 'pixel-scroll-mode' 74d18957b8 Fix inhibiting the default.el loading in user init file
Diffstat (limited to 'lisp/emacs-lisp/seq.el')
-rw-r--r--lisp/emacs-lisp/seq.el3
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/emacs-lisp/seq.el b/lisp/emacs-lisp/seq.el
index 31c15fea90d..64d7e533751 100644
--- a/lisp/emacs-lisp/seq.el
+++ b/lisp/emacs-lisp/seq.el
@@ -284,6 +284,9 @@ sorted. FUNCTION must be a function of one argument."
(cl-defmethod seq-reverse ((sequence sequence))
(reverse sequence))
+;; We are autoloading seq-concatenate because cl-concatenate needs
+;; that when it's inlined, per the cl-proclaim in cl-macs.el.
+;;;###autoload
(cl-defgeneric seq-concatenate (type &rest sequences)
"Concatenate SEQUENCES into a single sequence of type TYPE.
TYPE must be one of following symbols: vector, string or list.