From e57ba47c5a80e8b364e41429839690d9c4971bac Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Mon, 17 Apr 2017 16:54:31 -0400
Subject: [PATCH] General cleanup + refactor

---
 core/autoload/packages.el          | 5 +++--
 modules/ui/doom-modeline/config.el | 5 ++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/autoload/packages.el b/core/autoload/packages.el
index 03bdc3c55..96ae6bd24 100644
--- a/core/autoload/packages.el
+++ b/core/autoload/packages.el
@@ -240,7 +240,7 @@ appropriate."
                     ('quelpa "QUELPA")
                     ('elpa "ELPA")))
                ('error
-                (message! (red "Error (%s): %s" (car pkg) ex)))))
+                (message! (red "Error installing %s: %s" (car pkg) ex)))))
 
            (message! (bold (green "Finished!")))
            (doom/reload)))))
@@ -281,7 +281,7 @@ appropriate."
                            (if result "Updated" "Failed to update")
                            (symbol-name (car pkg)))))
                ('error
-                (message! (bold (red "Error installing %s: %s" (car pkg) ex))))))
+                (message! (bold (red "Error updating %s: %s" (car pkg) ex))))))
 
            (message! (bold (green "Finished!")))
            (doom/reload)))))
@@ -325,6 +325,7 @@ appropriate."
 (defun doom/delete-package (package)
   "Prompts the user with a list of packages and deletes the selected package.
 Use this interactively. Use `doom-delete-package' for direct calls."
+  (declare (interactive-only t))
   (interactive
    (progn
      (doom-initialize)
diff --git a/modules/ui/doom-modeline/config.el b/modules/ui/doom-modeline/config.el
index 1d28fbc8c..c61d61838 100644
--- a/modules/ui/doom-modeline/config.el
+++ b/modules/ui/doom-modeline/config.el
@@ -180,8 +180,7 @@ active."
 ;; Show version string for multi-version managers like rvm, rbenv, pyenv, etc.
 (defvar-local +doom-modeline-env-version nil)
 (defvar-local +doom-modeline-env-command nil)
-(add-hook 'focus-in-hook  #'+doom-modeline|update-env)
-(add-hook 'find-file-hook #'+doom-modeline|update-env)
+(add-hook! '(focus-in-hook find-file-hook) #'+doom-modeline|update-env)
 (defun +doom-modeline|update-env ()
   (when +doom-modeline-env-command
     (let* ((default-directory (doom-project-root))
@@ -192,7 +191,7 @@ active."
 
 ;; Only support python and ruby for now
 (add-hook! 'python-mode-hook (setq +doom-modeline-env-command "python --version 2>&1 | cut -d' ' -f2"))
-(add-hook! 'ruby-mode-hook   (setq +doom-modeline-env-command "ruby --version 2>&1 | cut -d' ' -f2"))
+(add-hook! 'ruby-mode-hook   (setq +doom-modeline-env-command "ruby   --version 2>&1 | cut -d' ' -f2"))
 
 
 ;;