Mercurial > hg > xemacs-beta
diff src/fns.c @ 5468:a9094f28f9a9
Merge with trunk.
author | Mats Lidell <matsl@xemacs.org> |
---|---|
date | Wed, 19 Jan 2011 22:35:23 +0100 |
parents | 89331fa1c819 8608eadee6ba |
children | 0af042a0c116 |
line wrap: on
line diff
--- a/src/fns.c Fri Jan 14 23:32:08 2011 +0100 +++ b/src/fns.c Wed Jan 19 22:35:23 2011 +0100 @@ -3121,7 +3121,7 @@ Boolint test_not_unboundp = 1; check_test_func_t check_test = NULL; - PARSE_KEYWORDS (Fposition, nargs, args, 9, + PARSE_KEYWORDS (Ffind, nargs, args, 9, (test, if_, test_not, if_not, key, start, end, from_end, default_), (start = Qzero)); @@ -3130,26 +3130,11 @@ key, &test_not_unboundp); position (&object, item, sequence, check_test, test_not_unboundp, - test, key, start, end, from_end, Qnil, Qposition); + test, key, start, end, from_end, default_, Qposition); return object; } -DEFUN ("delete", Fdelete, 2, 2, 0, /* -Delete by side effect any occurrences of ELT as a member of LIST. -The modified LIST is returned. Comparison is done with `equal'. -If the first member of LIST is ELT, there is no way to remove it by side -effect; therefore, write `(setq foo (delete element foo))' to be sure -of changing the value of `foo'. -Also see: `remove'. -*/ - (elt, list)) -{ - EXTERNAL_LIST_LOOP_DELETE_IF (list_elt, list, - (internal_equal (elt, list_elt, 0))); - return list; -} - DEFUN ("old-delete", Fold_delete, 2, 2, 0, /* Delete by side effect any occurrences of ELT as a member of LIST. The modified LIST is returned. Comparison is done with `old-equal'. @@ -3164,20 +3149,6 @@ return list; } -DEFUN ("delq", Fdelq, 2, 2, 0, /* -Delete by side effect any occurrences of ELT as a member of LIST. -The modified LIST is returned. Comparison is done with `eq'. -If the first member of LIST is ELT, there is no way to remove it by side -effect; therefore, write `(setq foo (delq element foo))' to be sure of -changing the value of `foo'. -*/ - (elt, list)) -{ - EXTERNAL_LIST_LOOP_DELETE_IF (list_elt, list, - (EQ_WITH_EBOLA_NOTICE (elt, list_elt))); - return list; -} - DEFUN ("old-delq", Fold_delq, 2, 2, 0, /* Delete by side effect any occurrences of ELT as a member of LIST. The modified LIST is returned. Comparison is done with `old-eq'. @@ -11788,9 +11759,7 @@ DEFSUBR (Fposition); DEFSUBR (Ffind); - DEFSUBR (Fdelete); DEFSUBR (Fold_delete); - DEFSUBR (Fdelq); DEFSUBR (Fold_delq); DEFSUBR (FdeleteX); DEFSUBR (FremoveX);