From: Glenn Morris <rgm@gnu.org>
Date: Fri, 15 Jan 2021 09:38:20 +0000 (+0000)
Subject: * lisp/emacs-lisp/seq.el (seq-concatenate): Unautoload (merge fix).
X-Git-Tag: emacs-28.0.90~4266
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0a26f479152bbc3967f52d1d00efc663b58939b5;p=emacs.git

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

gitmerge-skip-regexp does not handle line breaks.
---

diff --git a/lisp/emacs-lisp/seq.el b/lisp/emacs-lisp/seq.el
index 64d7e533751..31c15fea90d 100644
--- a/lisp/emacs-lisp/seq.el
+++ b/lisp/emacs-lisp/seq.el
@@ -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.