comparison lisp/compat.el @ 5182:2e528066e2fc

Move #'sort*, #'fill, #'merge to C from cl-seq.el. lisp/ChangeLog addition: 2010-04-01 Aidan Kehoe <kehoea@parhasard.net> * cl-seq.el (fill, sort*, merge): Move these functions to fns.c. (stable-sort): Make this docstring reflect the argument names used in the #'sort* docstring. * cl-macs.el (stable-sort): Make #'stable-sort exactly equivalent to #'sort* in compiled code. * bytecomp.el (byte-compile-maybe-add-*): New macro, for functions like #'sort and #'mapcar that, to be strictly compatible, should only take two args, but in our implementation can take more, because they're aliases of #'sort* and #'mapcar*. (byte-compile-mapcar, byte-compile-sort, byte-compile-fillarray): Use this new macro. (map-into): Add a byte-compile method for #'map-into in passing. * apropos.el (apropos-print): Use #'sort* with a :key argument, now it's in C. * compat.el (extent-at): Ditto. * register.el (list-registers): Ditto. * package-ui.el (pui-list-packages): Ditto. * help.el (sorted-key-descriptions): Ditto. src/ChangeLog addition: 2010-03-31 Aidan Kehoe <kehoea@parhasard.net> * fns.c (STRING_DATA_TO_OBJECT_ARRAY) (BIT_VECTOR_TO_OBJECT_ARRAY, c_merge_predicate_key) (c_merge_predicate_nokey, list_merge, array_merge) (list_array_merge_into_list, list_list_merge_into_array) (list_array_merge_into_array, CHECK_KEY_ARGUMENT, Fmerge) (list_sort, array_sort, FsortX): Move #'sort*, #'fill, #'merge from cl-seq.el to C, extending the implementations of Fsort, Ffillarray, and merge() to do so. * keymap.c (keymap_submaps, map_keymap_sort_predicate) (describe_map_sort_predicate): Change the calling semantics of the C sort predicates to return a non-nil Lisp object if the first argument is less than the second, rather than C integers. * fontcolor-msw.c (sort_font_list_function): * fileio.c (build_annotations): * dired.c (Fdirectory_files): * abbrev.c (Finsert_abbrev_table_description): Call list_sort instead of Fsort, list_merge instead of merge() in these functions. man/ChangeLog addition: 2010-04-01 Aidan Kehoe <kehoea@parhasard.net> * lispref/lists.texi (Rearrangement): Update the documentation of #'sort here, now that it accepts any type of sequence and the KEY keyword argument. (Though this is probably now the wrong place for this function, given that.)
author Aidan Kehoe <kehoea@parhasard.net>
date Thu, 01 Apr 2010 20:22:50 +0100
parents 6728e641994e
children 308d34e9f07d
comparison
equal deleted inserted replaced
5181:a00bfbd64e0a 5182:2e528066e2fc
693 (if (extent-property (car tmp) property) 693 (if (extent-property (car tmp) property)
694 (setq ovls (cons (car tmp) ovls))) 694 (setq ovls (cons (car tmp) ovls)))
695 (setq tmp (cdr tmp))) 695 (setq tmp (cdr tmp)))
696 (setq ovls tmp 696 (setq ovls tmp
697 tmp nil)) 697 tmp nil))
698 (car-safe 698 (car (sort* ovls #'< :key #'extent-length))))
699 (sort ovls
700 (function
701 (lambda (a b)
702 (< (- (extent-end-position a) (extent-start-position a))
703 (- (extent-end-position b) (extent-start-position b)))))))))
704 699
705 (defun-compat map-extents (function &optional object from to 700 (defun-compat map-extents (function &optional object from to
706 maparg flags property value) 701 maparg flags property value)
707 (let ((tmp (overlays-in (or from (point-min)) 702 (let ((tmp (overlays-in (or from (point-min))
708 (or to (point-max)))) 703 (or to (point-max))))