1 files changed, 42 insertions, 32 deletions

diff --git a/modules/dashboard-config.el b/modules/dashboard-config.el
index d5aa501d..c7ff39dc 100644
--- a/modules/dashboard-config.el
+++ b/modules/dashboard-config.el
@@ -73,6 +73,7 @@
 ;; External package commands invoked by launchers.
 (declare-function mu4e "mu4e")
 (declare-function pearl-list-issues "pearl")
+(declare-function wttrin "wttrin")
 
 ;; ------------------------ Dashboard Bookmarks Override -----------------------
 ;; overrides the bookmark insertion from the dashboard package to provide an
@@ -84,38 +85,47 @@
 (defvar dashboard-bookmarks-item-format "%s"
   "Format to use when showing the base of the file name.")
 
-;; `el' is bound dynamically by dashboard's section-insertion machinery, which the
-;; override below plugs into.  Declare it so the byte-compiler reads the
-;; references as that special variable rather than a free variable.  The name is
-;; dashboard's, not ours, so the missing-prefix lint is suppressed rather than
-;; renamed (renaming would break the dynamic binding dashboard supplies).
-(with-suppressed-warnings ((lexical el))
-  (defvar el))
-
-(defun dashboard-insert-bookmarks (list-size)
-  "Add the list of LIST-SIZE items of bookmarks."
-  (require 'bookmark)
-  (dashboard-insert-section
-   "Bookmarks:"
-   (dashboard-subseq (bookmark-all-names) list-size)
-   list-size
-   'bookmarks
-   (dashboard-get-shortcut 'bookmarks)
-   `(lambda (&rest _) (bookmark-jump ,el))
-   (if-let* ((filename el)
-             (path (bookmark-get-filename el))
-             (path-shorten (dashboard-shorten-path path 'bookmarks)))
-       (cl-case dashboard-bookmarks-show-path
-         (`align
-          (unless dashboard--bookmarks-cache-item-format
-            (let* ((len-align (dashboard--align-length-by-type 'bookmarks))
-                   (new-fmt (dashboard--generate-align-format
-                             dashboard-bookmarks-item-format len-align)))
-              (setq dashboard--bookmarks-cache-item-format new-fmt)))
-          (format dashboard--bookmarks-cache-item-format filename path-shorten))
-         (`nil filename)
-         (t (format dashboard-bookmarks-item-format filename path-shorten)))
-     el)))
+;; No `(defvar el)' here on purpose.  `el' is the per-item variable that
+;; dashboard's `dashboard-insert-section' macro binds inside its own expansion;
+;; the override's forms below reference it within that binding.  Declaring `el'
+;; special (as an earlier attempt did) is what CREATED a byte-compile warning --
+;; it turned the macro's ordinary lexical binding into one that "shadows the
+;; dynamic variable el".  Left lexical, the references resolve inside the
+;; expansion and the compile is clean.
+
+;; The override body uses the `dashboard-insert-section' MACRO, so it must be
+;; known when this module byte-compiles or the call compiles as a plain
+;; function call that evaluates `el' eagerly -- void-variable at render time.
+(eval-when-compile (require 'dashboard-widgets nil t))
+
+;; Registered after dashboard-widgets, not as a bare top-level defun: the
+;; use-package below reloads dashboard-widgets, which would clobber an eager
+;; override.  Same shape as the banner-title override further down.
+(with-eval-after-load 'dashboard-widgets
+  (defun dashboard-insert-bookmarks (list-size)
+    "Add the list of LIST-SIZE items of bookmarks."
+    (require 'bookmark)
+    (dashboard-insert-section
+     "Bookmarks:"
+     (dashboard-subseq (bookmark-all-names) list-size)
+     list-size
+     'bookmarks
+     (dashboard-get-shortcut 'bookmarks)
+     `(lambda (&rest _) (bookmark-jump ,el))
+     (if-let* ((filename el)
+               (path (bookmark-get-filename el))
+               (path-shorten (dashboard-shorten-path path 'bookmarks)))
+         (cl-case dashboard-bookmarks-show-path
+           (`align
+            (unless dashboard--bookmarks-cache-item-format
+              (let* ((len-align (dashboard--align-length-by-type 'bookmarks))
+                     (new-fmt (dashboard--generate-align-format
+                               dashboard-bookmarks-item-format len-align)))
+                (setq dashboard--bookmarks-cache-item-format new-fmt)))
+            (format dashboard--bookmarks-cache-item-format filename path-shorten))
+           (`nil filename)
+           (t (format dashboard-bookmarks-item-format filename path-shorten)))
+       el))))
 
 ;; ------------------------- Banner Title Centering Fix ------------------------
 ;; The default centering can be off due to font width calculations.