From 7dc0320b2419e8338acf518d176c21deb9cecfbe Mon Sep 17 00:00:00 2001 From: Grant Shangreaux Date: Thu, 12 Nov 2020 21:19:56 -0600 Subject: Fix: persp-switch-buffer use ivy-switch-buffer as caller Using counsel-switch-buffer was causing issues with the all-the-icons-ivy integration, as well as preventing all of the ivy actions from showing up in the hydra menu. for example, killing marked buffers is not present in the actions if counsel-switch-buffer is used, but it does appear when the caller is ivy-switch-buffer this may cause issues for people that have further customization on the counsel-switch-buffer caller, but from what i can tell, the counsel-switch-buffer function doesn't even pass itself down as the caller in its implementation. --- perspective.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/perspective.el b/perspective.el index d790119..0b83e5d 100644 --- a/perspective.el +++ b/perspective.el @@ -1260,6 +1260,7 @@ PERSP-SET-IDO-BUFFERS)." (cl-remove-if #'null (mapcar #'buffer-name (persp-current-buffers))) :preselect (buffer-name (persp-other-buffer (current-buffer))) :keymap ivy-switch-buffer-map + :caller #'ivy-switch-buffer :action #'ivy--switch-buffer-action :matcher #'ivy--switch-buffer-matcher) ivy-params)) @@ -1293,8 +1294,7 @@ PERSP-SET-IDO-BUFFERS)." (declare-function counsel--switch-buffer-unwind "counsel.el") (declare-function counsel--switch-buffer-update-fn "counsel.el") (persp--switch-buffer-ivy-counsel-helper arg - (list :caller #'counsel-switch-buffer - :unwind #'counsel--switch-buffer-unwind + (list :unwind #'counsel--switch-buffer-unwind :update-fn #'counsel--switch-buffer-update-fn) #'counsel-switch-buffer)) -- cgit v1.0