Minor refactor, across the board

Do you see the board? Now look at the other side. That's how far this
refactor extends.

Yes.

modules/ui/doom-modeline/config.el

@@ -55,17 +55,18 @@
 
 (add-hook 'window-configuration-change-hook #'+doom-modeline|set-selected-window)
 (add-hook 'doom-after-switch-window-hook #'+doom-modeline|set-selected-window)
-(if (not (boundp 'after-focus-change-function))
-    (progn
-      (add-hook 'focus-in-hook  #'+doom-modeline|set-selected-window)
-      (add-hook 'focus-out-hook #'+doom-modeline|unset-selected-window))
-  (defun +doom-modeline|refresh-frame ()
-    (setq +doom-modeline-current-window nil)
-    (cl-loop for frame in (frame-list)
-             if (eq (frame-focus-state frame) t)
-             return (setq +doom-modeline-current-window (frame-selected-window frame)))
-    (force-mode-line-update))
-  (add-function :after after-focus-change-function #'+doom-modeline|refresh-frame))
+(with-no-warnings
+  (if (not (boundp 'after-focus-change-function))
+      (progn
+        (add-hook 'focus-in-hook  #'+doom-modeline|set-selected-window)
+        (add-hook 'focus-out-hook #'+doom-modeline|unset-selected-window))
+    (defun +doom-modeline|refresh-frame ()
+      (setq +doom-modeline-current-window nil)
+      (cl-loop for frame in (frame-list)
+               if (eq (frame-focus-state frame) t)
+               return (setq +doom-modeline-current-window (frame-selected-window frame)))
+      (force-mode-line-update))
+    (add-function :after after-focus-change-function #'+doom-modeline|refresh-frame)))
 
 
 ;;

modules/ui/neotree/config.el

@@ -40,7 +40,7 @@
     :quit 'current :select t)
 
   (after! winner
-    (cl-pushnew neo-buffer-name winner-boring-buffers))
+    (add-to-list 'winner-boring-buffers neo-buffer-name))
 
   ;; The cursor always sits at bol. `+neotree*fix-cursor' and
   ;; `+neotree*indent-cursor' change that behavior, so that the cursor is always

modules/ui/popup/autoload/popup.el

@@ -1,13 +1,5 @@
 ;;; ui/popup/autoload/popup.el -*- lexical-binding: t; -*-
 
-(defvar +popup--populate-wparams (not EMACS26+))
-(defvar +popup--inhibit-transient nil)
-(defvar +popup--inhibit-select nil)
-(defvar +popup--old-display-buffer-alist nil)
-(defvar +popup--remember-last t)
-(defvar +popup--last nil)
-(defvar-local +popup--timer nil)
-
 (defun +popup--remember (windows)
   "Remember WINDOWS (a list of windows) for later restoration."
   (cl-assert (cl-every #'windowp windows) t)

modules/ui/popup/config.el

@@ -24,6 +24,14 @@ Modifying this has no effect, unless done before ui/popup loads.")
   "Size of the margins to give popup windows. Set this to nil to disable margin
 adjustment.")
 
+(defvar +popup--populate-wparams (not EMACS26+))
+(defvar +popup--inhibit-transient nil)
+(defvar +popup--inhibit-select nil)
+(defvar +popup--old-display-buffer-alist nil)
+(defvar +popup--remember-last t)
+(defvar +popup--last nil)
+(defvar-local +popup--timer nil)
+
 
 ;;
 ;; Global modes

modules/ui/pretty-code/autoload.el

@@ -289,7 +289,7 @@ Use the :iosevka property to enable (or disable) it regardless.")
         (tail (cdr l)))
     (cond ((not (consp l)) '())
           ((not (consp tail))  (list head))
-          ((cons head (cons nil (+pretty-code--icon-to-char tail)))))))
+          ((cons head (cons glue (+pretty-code--icon-to-char tail)))))))
 
 ;;;###autodef
 (defun set-pretty-symbols! (modes &rest plist)