Mercurial > hg > xemacs-beta

comparison src/lisp.h @ 5470:0af042a0c116

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with trunk.
author Mats Lidell <matsl@xemacs.org>
date Mon, 07 Feb 2011 21:22:17 +0100
parents a9094f28f9a9 94bbd4792049
children 00e79bbbe48f
comparison
equal deleted inserted replaced
5469:2a8a04f73c15 5470:0af042a0c116
4718 4718
4719 MODULE_API DECLARE_DOESNT_RETURN (throw_or_bomb_out (Lisp_Object, 4719 MODULE_API DECLARE_DOESNT_RETURN (throw_or_bomb_out (Lisp_Object,
4720 Lisp_Object, int, 4720 Lisp_Object, int,
4721 Lisp_Object, Lisp_Object)); 4721 Lisp_Object, Lisp_Object));
4722 4722
4723 MODULE_API DECLARE_DOESNT_RETURN (throw_or_bomb_out_unsafe (Lisp_Object,
4724 Lisp_Object, int,
4725 Lisp_Object, Lisp_Object));
4726
4723 MODULE_API DECLARE_DOESNT_RETURN (signal_error_1 (Lisp_Object, Lisp_Object)); 4727 MODULE_API DECLARE_DOESNT_RETURN (signal_error_1 (Lisp_Object, Lisp_Object));
4724 void maybe_signal_error_1 (Lisp_Object, Lisp_Object, Lisp_Object, 4728 void maybe_signal_error_1 (Lisp_Object, Lisp_Object, Lisp_Object,
4725 Error_Behavior); 4729 Error_Behavior);
4726 Lisp_Object maybe_signal_continuable_error_1 (Lisp_Object, Lisp_Object, 4730 Lisp_Object maybe_signal_continuable_error_1 (Lisp_Object, Lisp_Object,
4727 Lisp_Object, Error_Behavior); 4731 Lisp_Object, Error_Behavior);
5240 EXFUN (Fstring_equal, 2); 5244 EXFUN (Fstring_equal, 2);
5241 EXFUN (Fstring_lessp, 2); 5245 EXFUN (Fstring_lessp, 2);
5242 EXFUN (Fsubseq, 3); 5246 EXFUN (Fsubseq, 3);
5243 EXFUN (Fvalid_plist_p, 1); 5247 EXFUN (Fvalid_plist_p, 1);
5244 5248
5249 extern Boolint check_lss_key_car (Lisp_Object, Lisp_Object, Lisp_Object,
5250 Lisp_Object);
5251 extern Boolint check_string_lessp_nokey (Lisp_Object, Lisp_Object,
5252 Lisp_Object, Lisp_Object);
5253
5254 typedef Boolint (*check_test_func_t) (Lisp_Object test, Lisp_Object key,
5255 Lisp_Object item, Lisp_Object elt);
5256
5245 Lisp_Object list_merge (Lisp_Object org_l1, Lisp_Object org_l2, 5257 Lisp_Object list_merge (Lisp_Object org_l1, Lisp_Object org_l2,
5246 Lisp_Object (*c_predicate) (Lisp_Object o1, 5258 check_test_func_t check_merge,
5247 Lisp_Object o2,
5248 Lisp_Object pred,
5249 Lisp_Object keyf),
5250 Lisp_Object predicate, Lisp_Object key_func); 5259 Lisp_Object predicate, Lisp_Object key_func);
5251 Lisp_Object list_sort (Lisp_Object list, 5260 Lisp_Object list_sort (Lisp_Object list,
5252 Lisp_Object (*c_predicate) (Lisp_Object, Lisp_Object, 5261 check_test_func_t check_merge,
5253 Lisp_Object, Lisp_Object),
5254 Lisp_Object predicate, Lisp_Object key_func); 5262 Lisp_Object predicate, Lisp_Object key_func);
5255 5263
5256 void bump_string_modiff (Lisp_Object); 5264 void bump_string_modiff (Lisp_Object);
5257 Lisp_Object memq_no_quit (Lisp_Object, Lisp_Object); 5265 Lisp_Object memq_no_quit (Lisp_Object, Lisp_Object);
5258 Lisp_Object assoc_no_quit (Lisp_Object, Lisp_Object); 5266 Lisp_Object assoc_no_quit (Lisp_Object, Lisp_Object);