From 85c28444b37bbe2bdd5bf81c834aa640d1765b26 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sun, 6 Aug 2017 16:30:53 +0200
Subject: [PATCH] General cleanup & refactor

---
 core/autoload/packages.el            | 4 ++--
 core/core-ui.el                      | 4 ++--
 core/test/autoload-buffers.el        | 2 +-
 modules/feature/workspaces/config.el | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/autoload/packages.el b/core/autoload/packages.el
index 57594771e..aaf2cd3cd 100644
--- a/core/autoload/packages.el
+++ b/core/autoload/packages.el
@@ -51,8 +51,8 @@ list, whose car is NAME, and cdr the current version list and latest version
 list of the package."
   (cl-assert (symbolp name) t)
   (doom-initialize-packages)
-  (when-let (pkg (assq name package-alist))
-    (let* ((old-version (package-desc-version (cadr pkg)))
+  (when-let (desc (cadr (assq name package-alist)))
+    (let* ((old-version (package-desc-version desc))
            (new-version
             (pcase (doom-package-backend name)
               ('quelpa
diff --git a/core/core-ui.el b/core/core-ui.el
index f076766cc..8772d2da8 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -148,7 +148,7 @@ local value, whether or not it's permanent-local. Therefore, we cycle
 ;; undo/redo changes to Emacs' window layout
 (defvar winner-dont-bind-my-keys t) ; I'll bind keys myself
 (autoload 'winner-mode "winner" nil t)
-(add-hook 'doom-init-hook #'winner-mode)
+(add-hook 'doom-init-ui-hook #'winner-mode)
 
 ;; highlight matching delimiters
 (setq show-paren-delay 0.1
@@ -185,7 +185,7 @@ local value, whether or not it's permanent-local. Therefore, we cycle
 ;; Getting themes to remain consistent across GUI Emacs, terminal Emacs and
 ;; daemon Emacs is hairy.
 ;;
-;; + Running `+doom|init-ui' directly sorts out the initial GUI frame.
+;; + Running `doom|init-ui' directly sorts out the initial GUI frame.
 ;; + Attaching it to `after-make-frame-functions' sorts out daemon Emacs.
 ;; + Waiting for 0.1s in `doom|reload-ui-in-daemon' fixes daemon Emacs started
 ;;   with `server-start' in an interactive session of Emacs AND in tty Emacs.
diff --git a/core/test/autoload-buffers.el b/core/test/autoload-buffers.el
index 3f94dad35..b4ba44aa6 100644
--- a/core/test/autoload-buffers.el
+++ b/core/test/autoload-buffers.el
@@ -64,7 +64,7 @@
     (switch-to-buffer a)
     (should (eq (current-buffer) a))
     (should (eq (selected-window) (get-buffer-window a)))
-    (split-window)
+    (split-window nil 1)
     (switch-to-buffer b)
     (should (eq (current-buffer) b))
     (should (eq (selected-window) (get-buffer-window b)))
diff --git a/modules/feature/workspaces/config.el b/modules/feature/workspaces/config.el
index 3744e0e47..808e9ac95 100644
--- a/modules/feature/workspaces/config.el
+++ b/modules/feature/workspaces/config.el
@@ -41,7 +41,7 @@ renamed.")
         persp-auto-save-opt (if noninteractive 0 1))
 
   ;; Bootstrap
-  (add-hook 'doom-init-hook #'+workspaces|init)
+  (add-hook 'doom-post-init-hook #'+workspaces|init)
   (add-hook 'after-make-frame-functions #'+workspaces|init)
 
   (define-key persp-mode-map [remap delete-window] #'+workspace/close-window-or-workspace)