Commit a08caf95 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

*** empty log message ***

parent f8db4c01
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
"General text sorting routine to divide buffer into records and sort them. "General text sorting routine to divide buffer into records and sort them.
Arguments are REVERSE NEXTRECFUN ENDRECFUN &optional STARTKEYFUN ENDKEYFUN. Arguments are REVERSE NEXTRECFUN ENDRECFUN &optional STARTKEYFUN ENDKEYFUN.
We consider this portion of the buffer to be divided into disjoint pieces We divide the accessible portion of the buffer into disjoint pieces
called sort records. A portion of each sort record (perhaps all of it) called sort records. A portion of each sort record (perhaps all of it)
is designated as the sort key. The records are rearranged in the buffer is designated as the sort key. The records are rearranged in the buffer
in order by their sort keys. The records may or may not be contiguous. in order by their sort keys. The records may or may not be contiguous.
...@@ -50,49 +50,51 @@ It should move point to the end of the record. ...@@ -50,49 +50,51 @@ It should move point to the end of the record.
STARTKEYFUN may moves from the start of the record to the start of the key. STARTKEYFUN may moves from the start of the record to the start of the key.
It may return either return a non-nil value to be used as the key, or It may return either return a non-nil value to be used as the key, or
else the key will be the substring between the values of point after else the key is the substring between the values of point after
STARTKEYFUN and ENDKEYFUN are called. If STARTKEYFUN is nil, the key STARTKEYFUN and ENDKEYFUN are called. If STARTKEYFUN is nil, the key
starts at the beginning of the record. starts at the beginning of the record.
ENDKEYFUN moves from the start of the sort key to the end of the sort key. ENDKEYFUN moves from the start of the sort key to the end of the sort key.
ENDKEYFUN may be nil if STARTKEYFUN returns a value or if it would be the ENDKEYFUN may be nil if STARTKEYFUN returns a value or if it would be the
same as ENDRECFUN." same as ENDRECFUN."
(save-excursion ;; Heuristically try to avoid messages if sorting a small amt of text.
(message "Finding sort keys...") (let ((messages (> (- (point-max) (point-min)) 50000)))
(let* ((sort-lists (sort-build-lists nextrecfun endrecfun (save-excursion
startkeyfun endkeyfun)) (if messages (message "Finding sort keys..."))
(old (reverse sort-lists))) (let* ((sort-lists (sort-build-lists nextrecfun endrecfun
(if (null sort-lists) startkeyfun endkeyfun))
() (old (reverse sort-lists)))
(or reverse (setq sort-lists (nreverse sort-lists))) (if (null sort-lists)
(message "Sorting records...") ()
(setq sort-lists (or reverse (setq sort-lists (nreverse sort-lists)))
(if (fboundp 'sortcar) (if messages (message "Sorting records..."))
(sortcar sort-lists (setq sort-lists
(cond ((numberp (car (car sort-lists))) (if (fboundp 'sortcar)
;; This handles both ints and floats. (sortcar sort-lists
'<) (cond ((numberp (car (car sort-lists)))
((consp (car (car sort-lists))) ;; This handles both ints and floats.
'buffer-substring-lessp) '<)
(t ((consp (car (car sort-lists)))
'string<))) 'buffer-substring-lessp)
(sort sort-lists (t
(cond ((numberp (car (car sort-lists))) 'string<)))
(function (sort sort-lists
(lambda (a b) (cond ((numberp (car (car sort-lists)))
(< (car a) (car b))))) (function
((consp (car (car sort-lists))) (lambda (a b)
(function (< (car a) (car b)))))
(lambda (a b) ((consp (car (car sort-lists)))
(buffer-substring-lessp (car a) (car b))))) (function
(t (lambda (a b)
(function (buffer-substring-lessp (car a) (car b)))))
(lambda (a b) (t
(string< (car a) (car b))))))))) (function
(if reverse (setq sort-lists (nreverse sort-lists))) (lambda (a b)
(message "Reordering buffer...") (string< (car a) (car b)))))))))
(sort-reorder-buffer sort-lists old))) (if reverse (setq sort-lists (nreverse sort-lists)))
(message "Reordering buffer... Done")) (if messages (message "Reordering buffer..."))
(sort-reorder-buffer sort-lists old)))
(if messages (message "Reordering buffer... Done"))))
nil) nil)
;; Parse buffer into records using the arguments as Lisp expressions; ;; Parse buffer into records using the arguments as Lisp expressions;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment