From 46a00dc4258ed0cf433cb25926cc846ecee87e11 Mon Sep 17 00:00:00 2001 From: Ian Dunn Date: Tue, 5 Apr 2016 09:02:58 -0400 Subject: [PATCH] Modified ivy to pass predicate when selecting buffers * ivy.el (ivy--buffer-list): Add PREDICATE parameter and pass to 'all-completions' (ivy--reset-state): Pass predicate parameter to 'ivy--buffer-list'. This allows 'read-buffer' to filter the buffers with the PREDICATE parameter. --- ivy.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ivy.el b/ivy.el index 8d25e28f6..415f54a68 100644 --- a/ivy.el +++ b/ivy.el @@ -1410,7 +1410,7 @@ This is useful for recursive `ivy-read'." (not (equal (ivy--get-action ivy-last) 'identity))) (setq initial-input nil)))) ((eq collection 'internal-complete-buffer) - (setq coll (ivy--buffer-list "" ivy-use-virtual-buffers))) + (setq coll (ivy--buffer-list "" ivy-use-virtual-buffers predicate))) (dynamic-collection (setq coll (funcall collection ivy-text))) ((or (functionp collection) @@ -2508,7 +2508,7 @@ CANDS is a list of strings." "List of regexps or functions matching buffer names to ignore." :type '(repeat (choice regexp function))) -(defun ivy--buffer-list (str &optional virtual) +(defun ivy--buffer-list (str &optional virtual predicate) "Return the buffers that match STR. When VIRTUAL is non-nil, add virtual buffers." (delete-dups @@ -2520,7 +2520,7 @@ When VIRTUAL is non-nil, add virtual buffers." (abbreviate-file-name default-directory))) (propertize x 'face 'ivy-remote) x)) - (all-completions str 'internal-complete-buffer)) + (all-completions str 'internal-complete-buffer predicate)) (and virtual (ivy--virtual-buffers))))) -- 2.39.2