From be2061c7a0a1434d982af9a49661cc3a84a83bc1 Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Sun, 16 Oct 2016 22:00:48 -0400 Subject: [PATCH] purpose: replace use-package :after by (require ...) Also move :config to :init --- .../spacemacs-purpose-popwin/spacemacs-purpose-popwin.el | 2 ++ layers/+spacemacs/spacemacs-purpose/packages.el | 7 +------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/layers/+spacemacs/spacemacs-purpose/local/spacemacs-purpose-popwin/spacemacs-purpose-popwin.el b/layers/+spacemacs/spacemacs-purpose/local/spacemacs-purpose-popwin/spacemacs-purpose-popwin.el index 9dcbafae1..07eeda1b5 100644 --- a/layers/+spacemacs/spacemacs-purpose/local/spacemacs-purpose-popwin/spacemacs-purpose-popwin.el +++ b/layers/+spacemacs/spacemacs-purpose/local/spacemacs-purpose-popwin/spacemacs-purpose-popwin.el @@ -4,6 +4,8 @@ ;;; Code: +(require 'window-purpose) + (defconst pupo--direction-to-purpose '((left . popl) (right . popr) (top . popt) diff --git a/layers/+spacemacs/spacemacs-purpose/packages.el b/layers/+spacemacs/spacemacs-purpose/packages.el index 5bbd39277..cc1c24b50 100644 --- a/layers/+spacemacs/spacemacs-purpose/packages.el +++ b/layers/+spacemacs/spacemacs-purpose/packages.el @@ -83,12 +83,7 @@ (use-package spacemacs-purpose-popwin ;; don't load spacemacs-purpose-popwin if popwin is excluded. ;; can't wrap `spacemacs-purpose/init-purpose-popwin' in a top-level `when' - ;; spacemacs-purpose-popwin needs to be configured after popwin and - ;; window-purpose. popwin is guaranteed to run before - ;; spacemacs-purpose-popwin due to alphabetic order, but for window-purpose - ;; we need to use :after - :after window-purpose - :config + :init (progn (pupo-mode) ;; override popwin commands with pupo commands