From c36e127ec56e521c1be7b739e991a9e09ed259f1 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Tue, 15 May 2018 13:42:52 +0200
Subject: [PATCH] Rethink core package deferral hooks

Ensure they are available exactly when they can be useful, but no
sooner.
---
 core/core-editor.el | 8 ++++----
 core/core-ui.el     | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/core-editor.el b/core/core-editor.el
index 24c782b2c..844863ba2 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -71,7 +71,7 @@ fundamental-mode) for performance sake."
 
 ;; revert buffers for changed files
 (def-package! autorevert
-  :defer doom-after-switch-buffer-hook
+  :defer doom-before-switch-buffer-hook
   :config
   (setq auto-revert-verbose nil)
   (global-auto-revert-mode +1))
@@ -88,7 +88,7 @@ fundamental-mode) for performance sake."
 
 ;; persistent point location in buffers
 (def-package! saveplace
-  :defer doom-after-switch-buffer-hook
+  :defer doom-before-switch-buffer-hook
   :config
   (setq save-place-file (concat doom-cache-dir "saveplace"))
   (defun doom*recenter-on-load-saveplace (&rest _)
@@ -132,7 +132,7 @@ fundamental-mode) for performance sake."
 
 ;; Auto-close delimiters and blocks as you type
 (def-package! smartparens
-  :defer doom-after-switch-buffer-hook
+  :defer doom-before-switch-buffer-hook
   :config
   (require 'smartparens-config)
   (setq sp-highlight-pair-overlay nil
@@ -151,7 +151,7 @@ fundamental-mode) for performance sake."
 
 ;; Branching undo
 (def-package! undo-tree
-  :defer pre-command-hook
+  :defer doom-after-switch-buffer-hook
   :config
   ;; persistent undo history is known to cause undo history corruption, which
   ;; can be very destructive! So disable it!
diff --git a/core/core-ui.el b/core/core-ui.el
index a7e61093c..9ab5ad7c8 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -281,13 +281,13 @@ DEFAULT is non-nil, set the default mode-line for all buffers."
 
 ;; undo/redo changes to Emacs' window layout
 (def-package! winner
-  :defer doom-after-switch-buffer-hook
+  :defer doom-before-switch-window-hook
   :preface (defvar winner-dont-bind-my-keys t) ; I'll bind keys myself
   :config (winner-mode +1))
 
 ;; highlight matching delimiters
 (def-package! paren
-  :defer pre-command-hook
+  :defer doom-before-switch-buffer-hook
   :config
   (setq show-paren-delay 0.1
         show-paren-highlight-openparen t