diff src/lisp.h @ 5190:1c1d8843de5e

merge
author Ben Wing <ben@xemacs.org>
date Mon, 05 Apr 2010 00:18:49 -0500
parents b65692aa90d8 2e528066e2fc
children 71ee43b8a74d
line wrap: on
line diff
--- a/src/lisp.h	Sun Apr 04 23:46:50 2010 -0500
+++ b/src/lisp.h	Mon Apr 05 00:18:49 2010 -0500
@@ -5170,15 +5170,21 @@
 EXFUN (Freplace_list, 2);
 MODULE_API EXFUN (Freverse, 1);
 EXFUN (Fsafe_length, 1);
-EXFUN (Fsort, 2);
 EXFUN (Fstring_equal, 2);
 EXFUN (Fstring_lessp, 2);
 EXFUN (Fsubseq, 3);
 EXFUN (Fvalid_plist_p, 1);
 
-Lisp_Object list_sort (Lisp_Object, Lisp_Object,
-		       int (*) (Lisp_Object, Lisp_Object, Lisp_Object));
-Lisp_Object merge (Lisp_Object, Lisp_Object, Lisp_Object);
+Lisp_Object list_merge (Lisp_Object org_l1, Lisp_Object org_l2,
+                        Lisp_Object (*c_predicate) (Lisp_Object o1,
+                                                    Lisp_Object o2,
+                                                    Lisp_Object pred,
+                                                    Lisp_Object keyf),
+                        Lisp_Object predicate, Lisp_Object key_func);
+Lisp_Object list_sort (Lisp_Object list,
+                       Lisp_Object (*c_predicate) (Lisp_Object, Lisp_Object, 
+                                                   Lisp_Object, Lisp_Object),
+                       Lisp_Object predicate, Lisp_Object key_func);
 
 void bump_string_modiff (Lisp_Object);
 Lisp_Object memq_no_quit (Lisp_Object, Lisp_Object);