From a4801bec7b07c9a7d029018dc89d8e66d42c4207 Mon Sep 17 00:00:00 2001 From: Eric Zhang Date: Mon, 11 Mar 2019 01:39:36 +0800 Subject: [PATCH] Fix magit conflicting with golden-ratio --- CHANGELOG.develop | 1 + layers/+source-control/git/packages.el | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/CHANGELOG.develop b/CHANGELOG.develop index a2bcebe86..d5845d4e6 100644 --- a/CHANGELOG.develop +++ b/CHANGELOG.develop @@ -1266,6 +1266,7 @@ Other: - Added magit buffers to useless buffers (thanks to Thomas de BeauchĂȘne) - Fixed magint blame function name (thanks to Bjarke Vad Andersen) - Show magit-log-select and diff in two windows (thanks to duianto) +- Fix magit conflicting with golden-ratio (thanks Eric Zhang) **** Go - Improved go test output buffer behavior (thanks to Denis Bernard) - Configurable extra arguments to go test (thanks to Ian Clark) diff --git a/layers/+source-control/git/packages.el b/layers/+source-control/git/packages.el index 0d8ab8349..c2a5392cc 100644 --- a/layers/+source-control/git/packages.el +++ b/layers/+source-control/git/packages.el @@ -21,6 +21,7 @@ git-link git-messenger git-timemachine + golden-ratio (helm-git-grep :requires helm) (helm-gitignore :requires helm) magit @@ -31,6 +32,11 @@ transient )) +(defun git/pre-init-golden-ratio () + (spacemacs|use-package-add-hook golden-ratio + :post-config + (add-to-list 'golden-ratio-exclude-buffer-names " *transient*"))) + (defun git/pre-init-evil-magit () (spacemacs|use-package-add-hook magit :post-config