From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sat, 13 Feb 2016 06:35:04 +0000 (+1100)
Subject: Remove the gnus-merge alias
X-Git-Tag: emacs-26.0.90~2577
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9bcefcf0b0bcb860f432299c8e6cf109d07ee8ef;p=emacs.git

Remove the gnus-merge alias

* lisp/gnus/gnus-util.el (gnus-merge): Remove.
---

diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 5fb566e8886..2c87ba1573a 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -8614,7 +8614,7 @@ fetched for this group."
 	(gnus-agent nil)
 	(gnus-read-all-available-headers t))
     (setq gnus-newsgroup-headers
-	  (gnus-merge
+	  (cl-merge
 	   'list gnus-newsgroup-headers
 	   (gnus-fetch-headers articles nil t)
 	   'gnus-article-sort-by-number))
@@ -9026,7 +9026,7 @@ non-numeric or nil fetch the number specified by the
 	    (gnus-sorted-nunion gnus-newsgroup-unreads new-unreads))
       (setq gnus-newsgroup-headers
             (gnus-delete-duplicate-headers
-             (gnus-merge
+             (cl-merge
               'list gnus-newsgroup-headers new-headers
               'gnus-article-sort-by-number)))
       (setq gnus-newsgroup-articles
@@ -12844,10 +12844,10 @@ returned."
 						(mail-header-number h))
 					      gnus-newsgroup-headers)))
     (setq gnus-newsgroup-headers
-	  (gnus-merge 'list
-		      gnus-newsgroup-headers
-		      (gnus-fetch-headers articles nil t)
-		      'gnus-article-sort-by-number))
+	  (cl-merge 'list
+		    gnus-newsgroup-headers
+		    (gnus-fetch-headers articles nil t)
+		    'gnus-article-sort-by-number))
     (setq gnus-newsgroup-articles
 	  (gnus-sorted-nunion gnus-newsgroup-articles articles))
     ;; Suppress duplicates?
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index eadf04dfe71..23c6cd92cfb 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -1609,21 +1609,6 @@ sequence, this is like `mapcar'.  With several, it is like the Common Lisp
 	   (cdr ,result)))
     `(mapcar ,function ,seq1)))
 
-(if (fboundp 'merge)
-    (defalias 'gnus-merge 'merge)
-  ;; Adapted from cl-seq.el
-  (defun gnus-merge (type list1 list2 pred)
-    "Destructively merge lists LIST1 and LIST2 to produce a new list.
-Argument TYPE is for compatibility and ignored.
-Ordering of the elements is preserved according to PRED, a `less-than'
-predicate on the elements."
-    (let ((res nil))
-      (while (and list1 list2)
-	(if (funcall pred (car list2) (car list1))
-	    (push (pop list2) res)
-	  (push (pop list1) res)))
-      (nconc (nreverse res) list1 list2))))
-
 (defun gnus-emacs-version ()
   "Stringified Emacs version."
   (let* ((lst (if (listp gnus-user-agent)