General refactors & appease byte-compiler

core/autoload/packages.el

@@ -210,7 +210,8 @@ ones."
   "Return an alist mapping package names (strings) to pinned commits (strings)."
   (let (alist)
     (dolist (package doom-packages alist)
-      (with-plist! (cdr package) (recipe modules disable ignore pin unpin)
+      (cl-destructuring-bind (_ &key disable ignore pin unpin &allow-other-keys)
+          package
         (when (and (not ignore)
                    (not disable)
                    (or pin unpin))
@@ -223,7 +224,9 @@ ones."
   "Return an alist mapping package names (strings) to pinned commits (strings)."
   (let (alist)
     (dolist (package doom-packages alist)
-      (with-plist! (cdr package) (recipe modules disable ignore pin unpin)
+      (cl-destructuring-bind
+          (_ &key recipe disable ignore pin unpin &allow-other-keys)
+          package
         (when (and (not ignore)
                    (not disable)
                    (or unpin

core/autoload/projects.el

@@ -1,6 +1,8 @@
 ;;; core/autoload/projects.el -*- lexical-binding: t; -*-
 
-(defvar projectile-project-root nil)
+(defvar projectile-enable-caching)
+(defvar projectile-project-root)
+(defvar projectile-require-project-root)
 
 ;;;###autoload (autoload 'projectile-relevant-known-projects "projectile")
 

core/autoload/scratch.el

@@ -96,6 +96,7 @@ following:
 ;;
 ;;; Commands
 
+(defvar projectile-enable-caching)
 ;;;###autoload
 (defun doom/open-scratch-buffer (&optional arg project-p)
   "Pop up a persistent scratch buffer.

core/autoload/text.el

@@ -117,34 +117,37 @@ in some cases."
 ;;; Commands
 
 (defun doom--bol-bot-eot-eol (&optional pos)
-  (let* ((bol (if visual-line-mode
+  (save-excursion
-                  (save-excursion
+    (when pos
-                    (beginning-of-visual-line)
+      (goto-char pos))
-                    (point))
+    (let* ((bol (if visual-line-mode
-                (line-beginning-position)))
+                    (save-excursion
-         (bot (save-excursion
+                      (beginning-of-visual-line)
-                (goto-char bol)
+                      (point))
-                (skip-chars-forward " \t\r")
+                  (line-beginning-position)))
-                (point)))
+           (bot (save-excursion
-         (eol (if visual-line-mode
+                  (goto-char bol)
-                  (save-excursion (end-of-visual-line) (point))
+                  (skip-chars-forward " \t\r")
-                (line-end-position)))
+                  (point)))
-         (eot (or (save-excursion
+           (eol (if visual-line-mode
-                    (if (not comment-use-syntax)
+                    (save-excursion (end-of-visual-line) (point))
-                        (progn
+                  (line-end-position)))
-                          (goto-char bol)
+           (eot (or (save-excursion
-                          (when (re-search-forward comment-start-skip eol t)
+                      (if (not comment-use-syntax)
-                            (or (match-end 1) (match-beginning 0))))
+                          (progn
-                      (goto-char eol)
+                            (goto-char bol)
-                      (while (and (doom-point-in-comment-p)
+                            (when (re-search-forward comment-start-skip eol t)
-                                  (> (point) bol))
+                              (or (match-end 1) (match-beginning 0))))
-                        (backward-char))
+                        (goto-char eol)
-                      (skip-chars-backward " " bol)
+                        (while (and (doom-point-in-comment-p)
-                      (unless (or (eq (char-after) 32) (eolp))
+                                    (> (point) bol))
-                        (forward-char))
+                          (backward-char))
-                      (point)))
+                        (skip-chars-backward " " bol)
-                  eol)))
+                        (unless (or (eq (char-after) 32) (eolp))
-    (list bol bot eot eol)))
+                          (forward-char))
+                        (point)))
+                    eol)))
+      (list bol bot eot eol))))
 
 (defvar doom--last-backward-pt nil)
 ;;;###autoload
@@ -154,7 +157,7 @@ beginning of the line. The opposite of
 `doom/forward-to-last-non-comment-or-eol'."
   (interactive "d")
   (let ((pt (or point (point))))
-    (cl-destructuring-bind (bol bot _eot eol)
+    (cl-destructuring-bind (bol bot _eot _eol)
         (doom--bol-bot-eot-eol pt)
       (cond ((> pt bot)
              (goto-char bot))

modules/app/calendar/autoload.el

@@ -3,9 +3,9 @@
 (defvar +calendar--wconf nil)
 
 (defun +calendar--init ()
-  (if-let* ((win (cl-loop for win in (doom-visible-windows)
+  (if-let (win (cl-find-if (lambda (b) (string-match-p "^\\*cfw:" (buffer-name b)))
-                          if (string-match-p "^\\*cfw:" (buffer-name (window-buffer win)))
+                           (doom-visible-windows)
-                          return win)))
+                           :key #'window-buffer))
       (select-window win)
     (call-interactively +calendar-open-function)))
 

modules/editor/evil/config.el

@@ -126,7 +126,7 @@ directives. By default, this only recognizes C directives.")
                  (count-lines (point-min) (point-max))
                  (buffer-size)))))
 
-  ;; 'gq' moves the cursor to the beginning of selection. Disable this, since
+  ;; '=' moves the cursor to the beginning of selection. Disable this, since
   ;; it's more disruptive than helpful.
   (defadvice! +evil--dont-move-cursor-a (orig-fn &rest args)
     :around #'evil-indent

modules/term/eshell/autoload/company.el

@@ -3,6 +3,7 @@
 
 ;; REVIEW Refactor me
 
+(defvar pcomplete-suffix-list)
 (defvar company-pcomplete-available 'unknown)
 
 (defun company-pcomplete--prefix ()