Mercurial > hg > xemacs-beta
comparison 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 |
comparison
equal
deleted
inserted
replaced
5189:b65692aa90d8 | 5190:1c1d8843de5e |
---|---|
5168 EXFUN (Frassq, 2); | 5168 EXFUN (Frassq, 2); |
5169 EXFUN (Fremassq, 2); | 5169 EXFUN (Fremassq, 2); |
5170 EXFUN (Freplace_list, 2); | 5170 EXFUN (Freplace_list, 2); |
5171 MODULE_API EXFUN (Freverse, 1); | 5171 MODULE_API EXFUN (Freverse, 1); |
5172 EXFUN (Fsafe_length, 1); | 5172 EXFUN (Fsafe_length, 1); |
5173 EXFUN (Fsort, 2); | |
5174 EXFUN (Fstring_equal, 2); | 5173 EXFUN (Fstring_equal, 2); |
5175 EXFUN (Fstring_lessp, 2); | 5174 EXFUN (Fstring_lessp, 2); |
5176 EXFUN (Fsubseq, 3); | 5175 EXFUN (Fsubseq, 3); |
5177 EXFUN (Fvalid_plist_p, 1); | 5176 EXFUN (Fvalid_plist_p, 1); |
5178 | 5177 |
5179 Lisp_Object list_sort (Lisp_Object, Lisp_Object, | 5178 Lisp_Object list_merge (Lisp_Object org_l1, Lisp_Object org_l2, |
5180 int (*) (Lisp_Object, Lisp_Object, Lisp_Object)); | 5179 Lisp_Object (*c_predicate) (Lisp_Object o1, |
5181 Lisp_Object merge (Lisp_Object, Lisp_Object, Lisp_Object); | 5180 Lisp_Object o2, |
5181 Lisp_Object pred, | |
5182 Lisp_Object keyf), | |
5183 Lisp_Object predicate, Lisp_Object key_func); | |
5184 Lisp_Object list_sort (Lisp_Object list, | |
5185 Lisp_Object (*c_predicate) (Lisp_Object, Lisp_Object, | |
5186 Lisp_Object, Lisp_Object), | |
5187 Lisp_Object predicate, Lisp_Object key_func); | |
5182 | 5188 |
5183 void bump_string_modiff (Lisp_Object); | 5189 void bump_string_modiff (Lisp_Object); |
5184 Lisp_Object memq_no_quit (Lisp_Object, Lisp_Object); | 5190 Lisp_Object memq_no_quit (Lisp_Object, Lisp_Object); |
5185 Lisp_Object assoc_no_quit (Lisp_Object, Lisp_Object); | 5191 Lisp_Object assoc_no_quit (Lisp_Object, Lisp_Object); |
5186 Lisp_Object assq_no_quit (Lisp_Object, Lisp_Object); | 5192 Lisp_Object assq_no_quit (Lisp_Object, Lisp_Object); |