1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00

* lisp/emacs-lisp/seq.el (seq-concatenate): Unautoload (merge fix).

gitmerge-skip-regexp does not handle line breaks.
This commit is contained in:
Glenn Morris 2021-01-15 09:38:20 +00:00
parent b4b98a044b
commit 0a26f47915

View file

@ -284,9 +284,6 @@ 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.