Mercurial > hg > xemacs-beta
diff src/lisp.h @ 5470:0af042a0c116
Merge with trunk.
| author | Mats Lidell <matsl@xemacs.org> |
|---|---|
| date | Mon, 07 Feb 2011 21:22:17 +0100 |
| parents | a9094f28f9a9 94bbd4792049 |
| children | 00e79bbbe48f |
line wrap: on
line diff
--- a/src/lisp.h Sat Jan 22 00:59:20 2011 +0100 +++ b/src/lisp.h Mon Feb 07 21:22:17 2011 +0100 @@ -4720,6 +4720,10 @@ Lisp_Object, int, Lisp_Object, Lisp_Object)); +MODULE_API DECLARE_DOESNT_RETURN (throw_or_bomb_out_unsafe (Lisp_Object, + Lisp_Object, int, + Lisp_Object, Lisp_Object)); + MODULE_API DECLARE_DOESNT_RETURN (signal_error_1 (Lisp_Object, Lisp_Object)); void maybe_signal_error_1 (Lisp_Object, Lisp_Object, Lisp_Object, Error_Behavior); @@ -5242,15 +5246,19 @@ EXFUN (Fsubseq, 3); EXFUN (Fvalid_plist_p, 1); +extern Boolint check_lss_key_car (Lisp_Object, Lisp_Object, Lisp_Object, + Lisp_Object); +extern Boolint check_string_lessp_nokey (Lisp_Object, Lisp_Object, + Lisp_Object, Lisp_Object); + +typedef Boolint (*check_test_func_t) (Lisp_Object test, Lisp_Object key, + Lisp_Object item, Lisp_Object elt); + 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), + check_test_func_t check_merge, 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), + check_test_func_t check_merge, Lisp_Object predicate, Lisp_Object key_func); void bump_string_modiff (Lisp_Object);