From a7d45a52218a22cb46133c62fc3a12c7d2073344 Mon Sep 17 00:00:00 2001 From: duianto Date: Thu, 3 Oct 2019 17:09:01 +0200 Subject: [PATCH] [ivy] Fix spacemacs/layouts-ts-close-other Problem: It called: (spacemacs/helm-persp-close) Solution: Call (spacemacs/ivy-spacemacs-layout-close-other) when ivy is used. --- CHANGELOG.develop | 1 + layers/+spacemacs/spacemacs-layouts/funcs.el | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.develop b/CHANGELOG.develop index c95acb2e8..af3d64ce7 100644 --- a/CHANGELOG.develop +++ b/CHANGELOG.develop @@ -1085,6 +1085,7 @@ Other: - Replaced deprecated =avy--generic-jump= with =avy-jump= (thanks to Dominik Schrempf) - Switch recreated messages buffer to =evil-normal-state= (thanks to duianto) + - Fixed =spacemacs/layouts-ts-close-other= with =ivy= (thanks to duianto) *** Layer changes and fixes **** Agda - Fixes diff --git a/layers/+spacemacs/spacemacs-layouts/funcs.el b/layers/+spacemacs/spacemacs-layouts/funcs.el index aea0d69db..02380c0d7 100644 --- a/layers/+spacemacs/spacemacs-layouts/funcs.el +++ b/layers/+spacemacs/spacemacs-layouts/funcs.el @@ -200,7 +200,10 @@ ask the user if a new layout should be created." (defun spacemacs/layouts-ts-close-other () (interactive) - (call-interactively 'spacemacs/helm-persp-close) + (cond ((configuration-layer/layer-used-p 'helm) + (spacemacs/helm-persp-close)) + ((configuration-layer/layer-used-p 'ivy) + (spacemacs/ivy-spacemacs-layout-close-other))) (spacemacs/layouts-transient-state/body)) (defun spacemacs/layouts-ts-kill ()