diff options
| author | Stefan Kangas | 2022-08-09 15:37:53 +0200 |
|---|---|---|
| committer | Stefan Kangas | 2022-08-09 15:37:53 +0200 |
| commit | d3f6edf5aa0a7083efa2dd08ed3eb7d8709689c8 (patch) | |
| tree | a10bc6f8406533399cef286a4d44eab3681eeaa7 | |
| parent | 24795e45e5fab6e2f699582662f9be7c5c6e25f8 (diff) | |
| download | emacs-d3f6edf5aa0a7083efa2dd08ed3eb7d8709689c8.tar.gz emacs-d3f6edf5aa0a7083efa2dd08ed3eb7d8709689c8.zip | |
Make ibuffer-split-list obsolete in favor of seq-group-by
* lisp/ibuf-ext.el (ibuffer-split-list): Make obsolete in favor of
'seq-group-by'.
(ibuffer-generate-filter-groups): Don't use above obsolete
function.
| -rw-r--r-- | lisp/ibuf-ext.el | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el index 822ecbdd99d..3fa17e583d2 100644 --- a/lisp/ibuf-ext.el +++ b/lisp/ibuf-ext.el | |||
| @@ -63,15 +63,10 @@ | |||
| 63 | (setq tail (cdr tail))) | 63 | (setq tail (cdr tail))) |
| 64 | (nreverse new))) | 64 | (nreverse new))) |
| 65 | 65 | ||
| 66 | (defun ibuffer-split-list (ibuffer-split-list-fn ibuffer-split-list-elts) | 66 | (defun ibuffer-split-list (fn elts) |
| 67 | (let ((hip-crowd nil) | 67 | (declare (obsolete seq-group-by "29.1")) |
| 68 | (lamers nil)) | 68 | (let ((res (seq-group-by fn elts))) |
| 69 | (dolist (ibuffer-split-list-elt ibuffer-split-list-elts) | 69 | (list (cdr (assq t res)) (cdr (assq nil res))))) |
| 70 | (if (funcall ibuffer-split-list-fn ibuffer-split-list-elt) | ||
| 71 | (push ibuffer-split-list-elt hip-crowd) | ||
| 72 | (push ibuffer-split-list-elt lamers))) | ||
| 73 | ;; Too bad Emacs Lisp doesn't have multiple values. | ||
| 74 | (list (nreverse hip-crowd) (nreverse lamers)))) | ||
| 75 | 70 | ||
| 76 | (defcustom ibuffer-never-show-predicates nil | 71 | (defcustom ibuffer-never-show-predicates nil |
| 77 | "A list of predicates (a regexp or function) for buffers not to display. | 72 | "A list of predicates (a regexp or function) for buffers not to display. |
| @@ -769,11 +764,12 @@ specification, with the same structure as an element of the list | |||
| 769 | (i 0)) | 764 | (i 0)) |
| 770 | (dolist (filtergroup filter-group-alist) | 765 | (dolist (filtergroup filter-group-alist) |
| 771 | (let ((filterset (cdr filtergroup))) | 766 | (let ((filterset (cdr filtergroup))) |
| 772 | (cl-destructuring-bind (hip-crowd lamers) | 767 | (let* ((res (seq-group-by (lambda (bufmark) |
| 773 | (ibuffer-split-list (lambda (bufmark) | 768 | (ibuffer-included-in-filters-p (car bufmark) |
| 774 | (ibuffer-included-in-filters-p (car bufmark) | 769 | filterset)) |
| 775 | filterset)) | 770 | bmarklist)) |
| 776 | bmarklist) | 771 | (hip-crowd (cdr (assq t res))) |
| 772 | (lamers (cdr (assq nil res)))) | ||
| 777 | (aset vec i hip-crowd) | 773 | (aset vec i hip-crowd) |
| 778 | (cl-incf i) | 774 | (cl-incf i) |
| 779 | (setq bmarklist lamers)))) | 775 | (setq bmarklist lamers)))) |