Appease byte-compiler

core/autoload/buffers.el

@@ -125,7 +125,7 @@ buffers. If there's nothing left, switch to `doom-fallback-buffer'. See
            ;; `switch-to-prev-buffer' properly update buffer list order.
            (cl-loop with move-func =
                     (if (> n 0) #'switch-to-next-buffer #'switch-to-prev-buffer)
-                    for _i to 20
+                    for i to 20
                     while (not (memq (current-buffer) buffers))
                     do
                     (dotimes (_i (abs n))

core/autoload/popups.el

@@ -1,5 +1,7 @@
 ;;; core/autoload/popups.el -*- lexical-binding: t; -*-
 
+(defvar doom-popup-remember-history)
+
 ;;;###autoload
 (defun doom-popup-p (&optional target)
   "Return TARGET (a window) if TARGET (a window or buffer) is a popup. Uses

core/core-popups.el

@@ -412,12 +412,7 @@ the command buffer."
     (advice-add #'helm-ag--edit :around #'doom*helm-ag-edit)))
 
 
-(after! help-mode
+(defsubst doom--switch-from-popup (location)
-  ;; Help buffers use `other-window' to decide where to open followed links,
-  ;; which can be unpredictable. It should *only* replace the original buffer we
-  ;; opened the popup from. To fix this these three button types need to be
-  ;; redefined to set aside the popup before following a link.
-  (defsubst doom--switch-from-popup (location)
   (doom/popup-close)
   (switch-to-buffer (car location) nil t)
   (if (not (cdr location))
@@ -425,6 +420,11 @@ the command buffer."
     (goto-char (cdr location))
     (recenter)))
 
+(after! help-mode
+  ;; Help buffers use `other-window' to decide where to open followed links,
+  ;; which can be unpredictable. It should *only* replace the original buffer we
+  ;; opened the popup from. To fix this these three button types need to be
+  ;; redefined to set aside the popup before following a link.
   (define-button-type 'help-function-def
     :supertype 'help-xref
     'help-function