[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 0a26f47: * lisp/emacs-lisp/seq.el (seq-concatenate): Unautoload (
From: |
Glenn Morris |
Subject: |
master 0a26f47: * lisp/emacs-lisp/seq.el (seq-concatenate): Unautoload (merge fix). |
Date: |
Fri, 15 Jan 2021 04:38:54 -0500 (EST) |
branch: master
commit 0a26f479152bbc3967f52d1d00efc663b58939b5
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>
* lisp/emacs-lisp/seq.el (seq-concatenate): Unautoload (merge fix).
gitmerge-skip-regexp does not handle line breaks.
---
lisp/emacs-lisp/seq.el | 3 ---
1 file changed, 3 deletions(-)
diff --git a/lisp/emacs-lisp/seq.el b/lisp/emacs-lisp/seq.el
index 64d7e53..31c15fe 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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 0a26f47: * lisp/emacs-lisp/seq.el (seq-concatenate): Unautoload (merge fix).,
Glenn Morris <=