* gnus-util.el (gnus-merge): Added "type" argument to match CL

merge and gnus-sum.el's expectations.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a413d0b..989e4e7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-22  Paul Jarc  <prj@po.cwru.edu>
+
+       * gnus-util.el (gnus-merge): Added "type" argument to match CL
+       merge and gnus-sum.el's expectations.
+
 2003-04-21  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus-art.el (gnus-button-url-regexp): Added nntp.
@@ -64,8 +69,8 @@
 
        * nnmail.el (nnmail-split-fancy-with-parent): docstring fix
 
-       * gnus-registry.el (gnus-registry-clear) 
-       (gnus-registry-fetch-group, gnus-registry-grep-in-list) 
+       * gnus-registry.el (gnus-registry-clear)
+       (gnus-registry-fetch-group, gnus-registry-grep-in-list)
        (gnus-registry-split-fancy-with-parent): new functions
        (gnus-register-spool-action, gnus-register-action): simplified the format
        (gnus-registry): new customization group
@@ -86,7 +91,7 @@
 
 2003-04-17  Mike Woolley  <mike@ariel.co.uk>
 
-       * gnus-sum.el (gnus-sum-thread-tree-false-root): New variable. 
+       * gnus-sum.el (gnus-sum-thread-tree-false-root): New variable.
 
 2003-04-15  Michael Shields  <shields@msrl.com>
 
@@ -117,9 +122,9 @@
 
 2003-04-16  Teodor Zlatanov  <tzz@lifelogs.com>
 
-       * gnus-registry.el (gnus-register-action) 
-       (gnus-register-spool-action, hashtable-to-alist) 
-       (gnus-registry-translate-from-alist, alist-to-hashtable) 
+       * gnus-registry.el (gnus-register-action)
+       (gnus-register-spool-action, hashtable-to-alist)
+       (gnus-registry-translate-from-alist, alist-to-hashtable)
        (gnus-registry-translate-to-alist, gnus-registry-headers-hashtb):
        new variables and function fixes
 

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index 48b09f7..9dd8acf 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -1394,7 +1394,7 @@ sequence, this is like `mapcar'.  With several, it is like the Common Lisp
 (if (fboundp 'merge)
     (defalias 'gnus-merge 'merge)
   ;; Adapted from cl-seq.el
-  (defun gnus-merge (list1 list2 pred)
+  (defun gnus-merge (type list1 list2 pred)
     "Destructively merge lists LIST1 and LIST2 to produce a new list.
 Ordering of the elements is preserved according to PRED, a `less-than'
 predicate on the elements."