General cleanup

core/core-defuns.el

@@ -190,8 +190,8 @@ Examples:
 (after! evil
   (defalias 'ex! 'evil-ex-define-cmd)
 
-  ;; NOTE evil-mode doesn't read local `evil-ex-commands', and will
-  ;; not autocomplete local commands.
+  ;; NOTE evil-mode doesn't read local `evil-ex-commands', and will not
+  ;; autocomplete local commands.
   (defun ex-local! (cmd fn)
     "Define a buffer-local ex command."
     (unless (local-variable-p 'evil-ex-commands)

core/core-eval.el

@@ -63,7 +63,6 @@
         :n "k" 'evil-previous-line
         :n "h" 'evil-backward-char
         :n "l" 'evil-forward-char
-        ;; FIXME Greedy command buffer always grabs focus
         :m "n" 'realgud:cmd-next
         :m "b" 'realgud:cmd-break
         :m "B" 'realgud:cmd-clear

core/core-ui.el

@@ -97,9 +97,8 @@
   :init (add-hook! (prog-mode markdown-mode) 'hl-line-mode)
   :config
   ;; Doesn't seem to play nice in emacs 25+
-  (when (< emacs-major-version 25)
-    (setq hl-line-sticky-flag nil
-          global-hl-line-sticky-flag nil))
+  (setq hl-line-sticky-flag nil
+        global-hl-line-sticky-flag nil)
 
   (defvar-local doom--hl-line-mode nil)
   (defun doom|hl-line-on ()  (if doom--hl-line-mode (hl-line-mode +1)))
@@ -394,9 +393,11 @@ anzu to be enabled."
                                                      'doom-flycheck-warning
                                                    'mode-line))))))))))
 
+  (defvar *pad-active (pl/percent-xpm powerline-height 100 0 100 0 3 "#00B3EF" nil))
+  (defvar *pad-inactive (pl/percent-xpm powerline-height 100 0 100 0 3 nil nil))
   (spaceline-define-segment *pad
     "Padding, to ensure the mode-line is `powerline-height' pixels tall"
-    (pl/percent-xpm powerline-height 100 0 100 0 3 (if active "#00B3EF") nil)
+    (if active *pad-active *pad-inactive)
     :tight t)
 
   (spaceline-compile
@@ -441,9 +442,10 @@ anzu to be enabled."
     :tight t
     :face 'mode-line)
 
+  (defvar *eldoc-pad-xpm (pl/percent-xpm powerline-height 100 0 100 0 3 "#B3EF00" nil))
   (spaceline-define-segment *eldoc-pad
     "Padding, to ensure the mode-line is `powerline-height' pixels tall"
-    (pl/percent-xpm powerline-height 100 0 100 0 3 "#B3EF00" nil)
+    *eldoc-pad-xpm
     :tight t
     :face 'mode-line)
 

core/core-vcs.el

@@ -68,6 +68,7 @@
             (select-window (get-buffer-window doom-prev-buffer)))
           (switch-to-buffer b)))
 
+  ;; Prevent magit and evil-snipe conflicts
   (add-hook 'magit-mode-hook 'turn-off-evil-snipe-override-mode)
 
   (require 'evil-magit)

core/core-yasnippet.el

@@ -43,9 +43,7 @@
   ;; Strip out whitespace before a line selection
   (add-hook 'yas-before-expand-snippet-hook 'doom|yas-before-expand)
   ;; Fix previous hook persisting yas-selected-text between expansions
-  (add-hook 'yas-after-exit-snippet-hook 'doom|yas-after-expand)
-  ;; Suppress yasnippet with helm
-  (after! helm (push 'helm-alive-p yas-dont-activate-functions)))
+  (add-hook 'yas-after-exit-snippet-hook 'doom|yas-after-expand))
 
 (use-package auto-yasnippet
   :commands (aya-create aya-expand aya-open-line aya-persist-snippet)

core/defuns/defuns-popups.el

@@ -144,7 +144,6 @@ the display (unless DONT-REDRAW is non-nil)."
                           doom-popup-rules))))
     (setq doom-last-popup (current-buffer))
     (setq-local doom-popup-rule rules)
-    ;; (set-window-dedicated-p (selected-window) doom-popup-mode)
     (unless (memq :noesc rules)
       (make-local-variable 'doom-popup-mode-map)
       (let ((map doom-popup-mode-map))