diff options
| author | Glenn Morris <rgm@gnu.org> | 2021-01-15 09:38:20 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2021-01-15 09:38:20 +0000 |
| commit | 0a26f479152bbc3967f52d1d00efc663b58939b5 (patch) | |
| tree | 3f48c6f10cf0cdf33fee9c410a0b9658c5dc7aec | |
| parent | b4b98a044b4c40e78500d39e805427873b5e4bd7 (diff) | |
| download | emacs-0a26f479152bbc3967f52d1d00efc663b58939b5.tar.gz | |
* lisp/emacs-lisp/seq.el (seq-concatenate): Unautoload (merge fix).
gitmerge-skip-regexp does not handle line breaks.
| -rw-r--r-- | lisp/emacs-lisp/seq.el | 3 |
1 files changed, 0 insertions, 3 deletions
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. |