{if,when}-let deprecation in emacs 31

30 files changed, 114 insertions, 112 deletions

diff --git a/attic/elisp/jao-maildir.el b/attic/elisp/jao-maildir.el
index 18a1725..90cf0b4 100644
--- a/attic/elisp/jao-maildir.el
+++ b/attic/elisp/jao-maildir.el
@@ -90,7 +90,7 @@
               0))
 
 (defun jao-maildir--update-track-string (mbox)
-  (when-let ((track (seq-find (lambda (td) (string-match-p (car td) mbox))
+  (when-let* ((track (seq-find (lambda (td) (string-match-p (car td) mbox))
                               jao-maildir--trackers)))
     (let* ((label (cadr track))
            (other (assoc-delete-all label jao-maildir--track-strings))
diff --git a/attic/elisp/jao-notmuch-move.el b/attic/elisp/jao-notmuch-move.el
index eb7ea4c..d4626bf 100644
--- a/attic/elisp/jao-notmuch-move.el
+++ b/attic/elisp/jao-notmuch-move.el
@@ -1,6 +1,6 @@
 ;;; jao-notmuch-move.el --- Move messages around in notmuch  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2021  jao
+;; Copyright (C) 2021, 2024  jao
 
 ;; Author: jao <mail@jao.io>
 ;; Keywords: mail
@@ -37,9 +37,9 @@
     (user-error "Message not in any registered mailbox!")))
 
 (defun jao-notmuch--msg-props ()
-  (if-let ((p (save-excursion
-                (beginning-of-line)
-                (text-property-search-forward :notmuch-message-properties))))
+  (if-let* ((p (save-excursion
+                 (beginning-of-line)
+                 (text-property-search-forward :notmuch-message-properties))))
       (prop-match-value p)
     (user-error "No message at point")))
 
diff --git a/attic/elisp/misc.el b/attic/elisp/misc.el
index 2f1bcb0..4cae427 100644
--- a/attic/elisp/misc.el
+++ b/attic/elisp/misc.el
@@ -25,7 +25,7 @@
   ;; (defun jao-erlang-compile (arg)
   ;;   (interactive "P")
   ;;   (save-some-buffers)
-  ;;   (when-let ((mname (jao-erlang-current-module)))
+  ;;   (when-let* ((mname (jao-erlang-current-module)))
   ;;     (with-current-buffer (jao-vterm-repl)
   ;;       (vterm-send-string (format "c(%s).\n" mname))
   ;;       (sit-for 0)
@@ -600,7 +600,7 @@
 
 ;;; eldoc for magit status/log buffers
 (defun jao-magit-eldoc-for-commit (_callback)
-  (when-let ((commit (magit-commit-at-point)))
+  (when-let* ((commit (magit-commit-at-point)))
     (with-temp-buffer
       (magit-git-insert "show"
                         "--format=format:%an <%ae>, %ar"
@@ -908,7 +908,7 @@
          (res (funcall fn)))
     (while (and res tags) (setq res (seq-intersection res (funcall fn))))
     (unless res (user-error "No notes found"))
-    (when-let (f (completing-read "Select file: " (mapcar #'car res)))
+    (when-let* ((f (completing-read "Select file: " (mapcar #'car res))))
       (find-file (cadr (assoc f res))))))
 
 (defun jao-sway-run-or-focus-tidal ()
diff --git a/attic/elisp/nnnm.el b/attic/elisp/nnnm.el
index 552e95c..8a4185f 100644
--- a/attic/elisp/nnnm.el
+++ b/attic/elisp/nnnm.el
@@ -1,6 +1,6 @@
 ;;; nnnm.el --- Gnus backend for notmuch        -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2021  jao
+;; Copyright (C) 2021, 2024  jao
 
 ;; Author: jao <mail@jao.io>
 ;; Keywords: mail
@@ -47,8 +47,8 @@
 
 
 (defun nnnm--find-query (name)
-  (when-let (s (seq-find (lambda (s) (string= (plist-get s :name) name))
-                         nnnm-saved-searches))
+  (when-let* ((s (seq-find (lambda (s) (string= (plist-get s :name) name))
+                           nnnm-saved-searches)))
     (plist-get s :query)))
 
 (defun nnnm--find-message-file (id)
@@ -60,11 +60,11 @@
 (defun nnnm--article-data (article group)
   (cond ((stringp article) (list article))
         ((numberp article)
-         (when-let (data (nnnm--group-data group))
+         (when-let* ((data (nnnm--group-data group)))
            (elt data (1- article))))))
 
 (defun nnnm-article-to-file (article group)
-  (when-let (d (nnnm--article-data article group))
+  (when-let* ((d (nnnm--article-data article group)))
     (or (cadr d) (nnnm--find-message-file (car d)))))
 
 (defun nnnm--count (query &optional context)
@@ -117,7 +117,7 @@
   (gnus-set-active (nnnm--prefixed group server) (cons 1 n)))
 
 (defun nnnm--update-group-data (group &optional server)
-  (when-let (query (nnnm--find-query group))
+  (when-let* ((query (nnnm--find-query group)))
     (let* ((data (or (nnnm--group-data group)
                      (mapcar #'list (nnnm--search query "NOT tag:new"))))
            (ids (nnnm--search query "tag:new"))
@@ -158,7 +158,7 @@
   (with-current-buffer nntp-server-buffer
     (erase-buffer)
     (dolist (s nnnm-saved-searches)
-      (when-let (query (plist-get s :query))
+      (when-let* ((query (plist-get s :query)))
         (let ((name (plist-get s :name))
               (total (nnnm--count query)))
           (insert (format "%s %d 1 y\n" name total))))))
@@ -173,7 +173,7 @@
 	(if (stringp (car sequence))
 	    'headers
           (dolist (article sequence)
-            (when-let (file (nnnm-article-to-file article group))
+            (when-let* ((file (nnnm-article-to-file article group)))
 	      (insert (format "221 %d Article retrieved.\n" article))
               (save-excursion (nnheader-insert-head file))
 	      (if (re-search-forward "\n\r?\n" nil t)
diff --git a/custom/jao-custom-blog.el b/custom/jao-custom-blog.el
index a11c5c0..4b74601 100644
--- a/custom/jao-custom-blog.el
+++ b/custom/jao-custom-blog.el
@@ -171,7 +171,7 @@
          (to (expand-file-name (file-name-nondirectory from)
                                org-static-blog-posts-directory)))
     (rename-file from to)
-    (when-let ((b (get-buffer from)))
+    (when-let* ((b (get-buffer from)))
       (kill-buffer b))
     (find-file to)
     (jao-org-static-blog-update-date)
diff --git a/custom/jao-custom-completion.el b/custom/jao-custom-completion.el
index 9524e23..cdffcdc 100644
--- a/custom/jao-custom-completion.el
+++ b/custom/jao-custom-completion.el
@@ -175,9 +175,9 @@
 (defvar jao-consult-narrow nil)
 
 (defun jao-consult-initial-narrow ()
-  (when-let (c (cond ((eq this-command #'consult-buffer)
-                      (cdr (assoc (jao-afio-frame-name) jao-consult-narrow)))
-                     ((eq this-command #'consult-mode-command) ?m)))
+  (when-let* ((c (cond ((eq this-command #'consult-buffer)
+                        (cdr (assoc (jao-afio-frame-name) jao-consult-narrow)))
+                       ((eq this-command #'consult-mode-command) ?m))))
     (setq unread-command-events (append unread-command-events `(,c 32)))))
 
 (add-hook 'minibuffer-setup-hook #'jao-consult-initial-narrow)
@@ -290,7 +290,7 @@
 
 (defun jao-embark-targets--w3m-anchor ()
   (when (not (region-active-p))
-    (when-let ((url (or (jao-url-around-point)
+    (when-let* ((url (or (jao-url-around-point)
                         (thing-at-point 'url)
                         (and (derived-mode-p 'w3m-mode)
                              (or (w3m-anchor) w3m-current-url))
@@ -396,12 +396,12 @@
 
 (with-eval-after-load "notmuch"
   (defun jao-link-hint--notmuch-next-part (&optional bound)
-    (when-let (p (next-single-property-change (point) :notmuch-part nil bound))
+    (when-let* ((p (next-single-property-change (point) :notmuch-part nil bound)))
       (and (< p (or bound (point-max))) p)))
 
   (defun jao-link-hint--notmuch-part-p ()
     (and (get-text-property (point) :notmuch-part)
-         (when-let (b (button-at (point))) (button-label b))))
+         (when-let* ((b (button-at (point)))) (button-label b))))
 
   (link-hint-define-type 'notmuch-part
     :next #'jao-link-hint--notmuch-next-part
diff --git a/custom/jao-custom-email.el b/custom/jao-custom-email.el
index a3d1a92..dd898ad 100644
--- a/custom/jao-custom-email.el
+++ b/custom/jao-custom-email.el
@@ -69,8 +69,8 @@
 (defun jao-message-insert-bcc ()
   (when jao-notmuch-enabled
     (let ((f (or (message-fetch-field "From") "")))
-      (when-let (b (seq-some (lambda (x) (when (string-match-p (car x) f) (cdr x)))
-                             jao-message--bcc-alist))
+      (when-let* ((b (seq-some (lambda (x) (when (string-match-p (car x) f) (cdr x)))
+                               jao-message--bcc-alist)))
         (insert "Bcc: " b "\n")))))
 
 ;; (when jao-notmuch-enabled
@@ -170,7 +170,7 @@
   (save-excursion
     (save-restriction
       (message-narrow-to-headers)
-      (when-let ((to (message-fetch-field "To")))
+      (when-let* ((to (message-fetch-field "To")))
         (when (string-match-p jao-mails-regexp to)
           (unless (y-or-n-p "Message is addressed to yourself.  Continue?")
             (error "Message not sent")))))))
diff --git a/custom/jao-custom-eww.el b/custom/jao-custom-eww.el
index 6a2e8e2..726f682 100644
--- a/custom/jao-custom-eww.el
+++ b/custom/jao-custom-eww.el
@@ -32,7 +32,7 @@
 ;;; opening URLs
 (defun jao-eww-copy-link ()
   (interactive)
-  (when-let (lnk (or (car (eww-links-at-point)) (eww-current-url)))
+  (when-let* ((lnk (or (car (eww-links-at-point)) (eww-current-url))))
     (message "%s" lnk)
     (kill-new lnk)))
 
@@ -83,7 +83,7 @@
 ;;; images
 (defun jao-eww-next-image ()
   (interactive nil eww-mode)
-  (when-let (p (text-property-search-forward 'image-displayer nil nil t))
+  (when-let* ((p (text-property-search-forward 'image-displayer nil nil t)))
     (goto-char (prop-match-beginning p))))
 
 ;;; close page and reopen
@@ -91,7 +91,7 @@
 
 (defun jao-eww-close ()
   (interactive nil eww-mode)
-  (when-let (current (eww-current-url))
+  (when-let* ((current (eww-current-url)))
     (add-to-list 'jao-eww--closed-urls current))
   (let ((nxt (car (jao-eww-session-invisible-buffers))))
     (kill-current-buffer)
@@ -220,7 +220,7 @@ It should be the title of the web page as returned by `rdrview'"
   (with-eval-after-load "org" (require 'ol-eww nil t))
 
   (defun jao-eww-buffer-name ()
-    (when-let ((s (or (plist-get eww-data :title)
+    (when-let* ((s (or (plist-get eww-data :title)
                       (plist-get eww-data :url))))
       (when (not (string-blank-p s)) (format "%s" s))))
   (setq eww-auto-rename-buffer #'jao-eww-buffer-name)
diff --git a/custom/jao-custom-exwm.el b/custom/jao-custom-exwm.el
index e5c67f8..2135935 100644
--- a/custom/jao-custom-exwm.el
+++ b/custom/jao-custom-exwm.el
@@ -185,7 +185,7 @@
   (when cln
     (if (jao-exwm--check-name cln)
         (current-buffer)
-      (when-let ((b (jao-exwm-find-class-buffer cln)))
+      (when-let* ((b (jao-exwm-find-class-buffer cln)))
         (pop-to-buffer b)))))
 
 (defun jao-exwm-switch-to-next-class ()
@@ -341,21 +341,21 @@
 
 (defun jao-exwm-zathura-goto-org (&optional arg)
   (interactive "P")
-  (when-let ((info (jao-zathura--file-info (current-buffer))))
-    (when-let ((file (jao-org-find-for-pdf (car info))))
-      (let ((newp (not (file-exists-p file))))
-        (when (or arg newp) (org-store-link nil t))
-        (find-file-other-window file)
-        (when newp
-          (jao-org-insert-doc-skeleton)
-          (org-insert-link))))))
+  (when-let* ((info (jao-zathura--file-info (current-buffer)))
+              (file (jao-org-find-for-pdf (car info))))
+    (let ((newp (not (file-exists-p file))))
+      (when (or arg newp) (org-store-link nil t))
+      (find-file-other-window file)
+      (when newp
+        (jao-org-insert-doc-skeleton)
+        (org-insert-link)))))
 
 (defun jao-exwm-zathura-goto-org* ()
   (interactive)
   (jao-exwm-zathura-goto-org t))
 
 (defun jao-exwm-org-store-zathura-link ()
-  (when-let ((info (jao-zathura--file-info (current-buffer))))
+  (when-let* ((info (jao-zathura--file-info (current-buffer))))
     (let* ((file-name (car info))
            (page (cadr info))
            (desc (jao-pdf-section-title page file-name)))
@@ -385,7 +385,7 @@
   (interactive)
   (if jao-browse-doc-use-emacs-p
       (jao-org-goto-pdf)
-    (when-let (pdf (jao-exwm-org-to-pdf-file))
+    (when-let* ((pdf (jao-exwm-org-to-pdf-file)))
       (jao-zathura-open-doc pdf))))
 
 (with-eval-after-load "org"
@@ -422,7 +422,7 @@
 
 (defun jao-exwm-kill-firefox-url ()
   (interactive)
-  (when-let (b (jao-exwm-find-class-buffer "Firefox"))
+  (when-let* ((b (jao-exwm-find-class-buffer "Firefox")))
     (let ((cb (current-buffer)))
       (switch-to-buffer b)
       (jao-exwm--send-str "yy")
diff --git a/custom/jao-custom-gnus.el b/custom/jao-custom-gnus.el
index 70823ef..c56599e 100644
--- a/custom/jao-custom-gnus.el
+++ b/custom/jao-custom-gnus.el
@@ -583,7 +583,7 @@
       (let ((offset (or (and (search-forward-regexp "^Enclosure: " nil t) 2)
                         (and (search-forward-regexp "^Enclosure$" nil t) -2))))
         (when offset (forward-char offset))
-        (if-let ((url (jao-url-around-point)))
+        (if-let* ((url (jao-url-around-point)))
             (jao-mpc-add-or-play-url url)
           (error "No enclosure found"))))))
 
diff --git a/custom/jao-custom-notmuch.el b/custom/jao-custom-notmuch.el
index 42d9e12..7b1540f 100644
--- a/custom/jao-custom-notmuch.el
+++ b/custom/jao-custom-notmuch.el
@@ -60,7 +60,7 @@
 
 (defun jao-notmuch-tree-widen-search ()
   (interactive)
-  (when-let ((query (notmuch-tree-get-query)))
+  (when-let* ((query (notmuch-tree-get-query)))
     (let ((notmuch-show-process-crypto (notmuch-tree--message-process-crypto)))
       (notmuch-tree-close-message-window)
       (notmuch-tree (string-replace jao-notmuch--newa "" query)))))
@@ -73,7 +73,7 @@
           searches))
 
 (defun jao-notmuch-hello--insert-searches (searches title)
-  (when-let (searches (notmuch-hello-query-counts searches))
+  (when-let* ((searches (notmuch-hello-query-counts searches)))
     (let* ((cnt (when title
                   (seq-reduce (lambda (c q)
                                 (+ c (or (plist-get q :count) 0)))
@@ -348,7 +348,7 @@
    (if (not (search-forward "Enclosure:" nil t))
        (user-error "No enclosure in message body")
      (re-search-forward "https?://" nil t)
-     (if-let (url (thing-at-point-url-at-point))
+     (if-let* ((url (thing-at-point-url-at-point)))
          (progn
            (message "%s %s ..." (if add "Adding" "Playing") url)
            (unless add (jao-mpc-clear))
@@ -363,7 +363,7 @@
                 "quant-ph updates on arXiv.org: ")))
 
 (defun jao-mail-clean-address (args)
-  (when-let ((address (car args)))
+  (when-let* ((address (car args)))
     (list (thread-last (replace-regexp-in-string jao-mail-clean-rx "" address)
                        (replace-regexp-in-string "        " ", ")))))
 
@@ -430,8 +430,8 @@
 
 (defun jao-notmuch-browse-url (ext)
   (interactive "P")
-  (when-let (url (or (jao-notmuch--via-url)
-                     (car (last (jao-notmuch-message-urls)))))
+  (when-let* ((url (or (jao-notmuch--via-url)
+                       (car (last (jao-notmuch-message-urls))))))
     (funcall (if ext browse-url-secondary-browser-function #'browse-url)
              url)))
 
diff --git a/custom/jao-custom-org.el b/custom/jao-custom-org.el
index 4d2e622..1b15e72 100644
--- a/custom/jao-custom-org.el
+++ b/custom/jao-custom-org.el
@@ -254,7 +254,7 @@
 (defun jao-insert-eww-link ()
   "Look for last eww buffer and insert an org link to it."
   (interactive)
-  (when-let (b (car (jao-eww-session-eww-buffers)))
+  (when-let* ((b (car (jao-eww-session-eww-buffers))))
     (let ((lnk (with-current-buffer b
                  (format "[[%s][%s]]"
                          (eww-current-url)
diff --git a/custom/jao-custom-w3m.el b/custom/jao-custom-w3m.el
index 43b9e2d..57d0c4a 100644
--- a/custom/jao-custom-w3m.el
+++ b/custom/jao-custom-w3m.el
@@ -6,7 +6,7 @@
          (fn `(lambda (b)
                 (with-current-buffer b
                   (string= ,url (w3m-canonicalize-url w3m-current-url))))))
-    (when-let (b (seq-find fn (w3m-list-buffers)))
+    (when-let* ((b (seq-find fn (w3m-list-buffers))))
       (pop-to-buffer b))))
 
 (defun jao-w3m-browse-url (url &rest r)
diff --git a/init.el b/init.el
index 284de54..9fa96f7 100644
--- a/init.el
+++ b/init.el
@@ -411,7 +411,7 @@
   "Toggle eldoc's documentation buffer."
   (interactive)
   (let ((buffer (eldoc-doc-buffer)))
-    (if-let (w (and buffer (get-buffer-window buffer)))
+    (if-let* ((w (and buffer (get-buffer-window buffer))))
         (delete-window w)
       (eldoc-doc-buffer t))))
 
@@ -641,7 +641,7 @@
                (jao-shell-string "curl -s"
                                  "https://wttr.in/?format=%l++%m++%C+%c+%t+%w++%p"))
     (jao-afio-goto-scratch)
-    (if-let ((b (get-buffer "*wttr*")))
+    (if-let* ((b (get-buffer "*wttr*")))
         (progn (pop-to-buffer b)
                (term-send-string (get-buffer-process nil) "clear;curl wttr.in\n"))
       (jao-exec-in-term "curl wttr.in" "*wttr*"))))
@@ -1487,9 +1487,9 @@
 
 (defun jao-open-doc (&optional file page height)
   (interactive)
-  (when-let (file (or file
-                      (read-file-name "Document: "
-                                      (concat jao-org-dir "/doc/"))))
+  (when-let* ((file (or file
+                        (read-file-name "Document: "
+                                        (concat jao-org-dir "/doc/")))))
     (funcall jao-open-doc-fun file page height)))
 
 (defun jao-select-pdf ()
@@ -1499,7 +1499,7 @@
 
 (defun jao-open-with-zathura ()
   (interactive)
-  (when-let (f buffer-file-name)
+  (when-let* ((f buffer-file-name))
     (let ((p (jao-doc-view-current-page)))
       (cond (jao-river-enabled (jao-river-open-with-zathura f p))
             (jao-sway-enabled (jao-sway-open-with-zathura f p))
@@ -1652,7 +1652,7 @@
      (interactive "P")
      ,@prelude
      (let ((jao-use-vterm (if term (not jao-use-vterm) jao-use-vterm)))
-       (if-let ((b (jao-term--find ,cmd)))
+       (if-let* ((b (jao-term--find ,cmd)))
            (pop-to-buffer b)
          (jao-exec-in-term ,cmd ,(format "*%s*" name))))))
 
@@ -2595,7 +2595,7 @@
   :config
   (defun jao-ement-track (event room session)
     (when (ement-notify--room-unread-p event room session)
-      (when-let ((n (ement-room--buffer-name room))
+      (when-let* ((n (ement-room--buffer-name room))
                  (b (get-buffer n)))
         (tracking-add-buffer b))))
 
@@ -2621,7 +2621,7 @@
 
 (defun jao-mastodon-toot-url ()
   (interactive)
-  (when-let (url (jao-url-around-point t))
+  (when-let* ((url (jao-url-around-point t)))
     (jao-tracking-go-to-chats)
     (mastodon-toot--compose-buffer nil nil nil url)))
 
@@ -3131,7 +3131,7 @@
 (defun jao-set-wallpaper (&optional path)
   (interactive)
   (let ((current (format "~/.wallpaper.%s" (jao-colors-scheme))))
-    (when-let ((f (or (and path (expand-file-name path))
+    (when-let* ((f (or (and path (expand-file-name path))
                       (read-file-name "Image: "
                                       jao-wallpaper-dir
                                       (file-symlink-p current)
diff --git a/lib/doc/jao-doc-session.el b/lib/doc/jao-doc-session.el
index 877a8cb..928cf26 100644
--- a/lib/doc/jao-doc-session.el
+++ b/lib/doc/jao-doc-session.el
@@ -36,7 +36,7 @@
   (let ((docs '())
         (cb (and skip-current (current-buffer))))
     (dolist (b (buffer-list))
-      (when-let (fs (and (not (eq cb b)) (jao-doc-session-is-doc b)))
+      (when-let* ((fs (and (not (eq cb b)) (jao-doc-session-is-doc b))))
         (dolist (f fs) (add-to-list 'docs f))))
     (when (or force (> (length docs) 0))
       (setq jao-doc-session docs))))
diff --git a/lib/doc/jao-doc-view.el b/lib/doc/jao-doc-view.el
index fe26c1d..75c2bae 100644
--- a/lib/doc/jao-doc-view.el
+++ b/lib/doc/jao-doc-view.el
@@ -1,6 +1,6 @@
 ;;; jao-doc-view.el -- extensions for doc-view -*- lexical-binding: t; -*-
 
-;; Copyright (c) 2013, 2015, 2017, 2018, 2019, 2021, 2022 Jose Antonio Ortega Ruiz
+;; Copyright (c) 2013, 2015, 2017, 2018, 2019, 2021, 2022, 2024 Jose Antonio Ortega Ruiz
 
 ;; This file is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -49,20 +49,20 @@
 (defvar-local jao-doc-view--trail-fwd ())
 
 (defun jao-doc-view--trail-push (dest-page)
-  (when-let (page (jao-doc-view-current-page))
+  (when-let* ((page (jao-doc-view-current-page)))
     (unless (eq (car jao-doc-view--trail-back) page)
       (push page jao-doc-view--trail-back))))
 
 (defun jao-doc-view-back ()
   (interactive nil doc-view-mode)
-  (if-let (p (pop jao-doc-view--trail-back))
+  (if-let* ((p (pop jao-doc-view--trail-back)))
       (progn (push (jao-doc-view-current-page) jao-doc-view--trail-fwd)
              (jao-doc-view-goto-page p))
     (message "No more back marks.")))
 
 (defun jao-doc-view-forward ()
   (interactive nil doc-view-mode)
-  (if-let (p (pop jao-doc-view--trail-fwd))
+  (if-let* ((p (pop jao-doc-view--trail-fwd)))
       (progn (push (jao-doc-view-current-page) jao-doc-view--trail-back)
              (jao-doc-view-goto-page p))
     (message "No more forward marks.")))
@@ -115,8 +115,9 @@
     (cond ((eq 'wait urls) (message "Extracting text, please wait and retry."))
           ((zerop (length urls))
            (message "No URLs in this %s" (if all "document" "page")))
-          (t (when-let (url (completing-read "URL: " urls nil nil
-                                             (when (null (cdr urls)) (car urls))))
+          (t (when-let* ((url (completing-read "URL: " urls nil nil
+                                               (when (null (cdr urls))
+                                                 (car urls)))))
                (browse-url url))))))
 
 ;;; .
diff --git a/lib/doc/jao-org-links.el b/lib/doc/jao-org-links.el
index 88c0561..4fefedd 100644
--- a/lib/doc/jao-org-links.el
+++ b/lib/doc/jao-org-links.el
@@ -119,7 +119,7 @@
 ;;;###autoload
 (defun jao-org-goto-pdf ()
   (interactive)
-  (if-let (f (jao-org-org-to-pdf-file))
+  (if-let* ((f (jao-org-org-to-pdf-file)))
       (jao-org--pdf-open f nil)
     (user-error "No PDF file associated with this buffer")))
 
diff --git a/lib/doc/jao-org-notes.el b/lib/doc/jao-org-notes.el
index 43b8c09..e47f845 100644
--- a/lib/doc/jao-org-notes.el
+++ b/lib/doc/jao-org-notes.el
@@ -147,7 +147,7 @@
 (defun jao-org-notes-open ()
   "Search for a note file, matching tags and titles with completion."
   (interactive)
-  (when-let (f (jao-org-notes--consult-rg "Search notes: "))
+  (when-let* ((f (jao-org-notes--consult-rg "Search notes: ")))
     (find-file f)))
 
 (defun jao-org-notes-consult-tags ()
@@ -180,7 +180,7 @@
             (file (completing-read "File: " res nil t nil))
             (entry (assoc file res)))
       (progn (find-file (cadr entry))
-             (when-let (line (caddr entry)) (goto-line line)))
+             (when-let* ((line (caddr entry))) (goto-line line)))
     (message "Nobody links here!")))
 
 (defun jao-org-notes-insert-tags ()
@@ -191,7 +191,7 @@
 (defun jao-org-notes-insert-link ()
   "Select a note file (with completion) and insert a link to it."
   (interactive)
-  (when-let (f (jao-org-notes--consult-rg "Notes file: "))
+  (when-let* ((f (jao-org-notes--consult-rg "Notes file: ")))
     (let ((rel-path (file-relative-name f default-directory))
           (title (with-current-buffer (find-file-noselect f)
                    (save-excursion
diff --git a/lib/eos/jao-afio.el b/lib/eos/jao-afio.el
index b588989..a5d9b24 100644
--- a/lib/eos/jao-afio.el
+++ b/lib/eos/jao-afio.el
@@ -86,7 +86,7 @@
     (if (car docs)
         (progn (switch-to-buffer (car docs))
                (switch-to-buffer-other-window (or (cadr docs) (car docs))))
-      (when-let (docs (jao-doc-session))
+      (when-let* ((docs (jao-doc-session)))
         (when (y-or-n-p (format "Load saved session? (%d docs)" (length docs)))
           (jao-afio-open-pdf-session docs))))))
 
@@ -96,7 +96,7 @@
 (declare-function jao-eww-session-load "jao-eww-session")
 
 (defun jao-afio--open-eww-session ()
-  (if-let (b (jao-eww-session-eww-buffers))
+  (if-let* ((b (jao-eww-session-eww-buffers)))
       (switch-to-buffer (car b))
     (jao-eww-session-load)))
 
diff --git a/lib/eos/jao-eshell-here.el b/lib/eos/jao-eshell-here.el
index 54d58f0..ad7805f 100644
--- a/lib/eos/jao-eshell-here.el
+++ b/lib/eos/jao-eshell-here.el
@@ -1,6 +1,6 @@
 ;;; jao-eshell-here.el --- Easy opening of eshell buffers -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2021, 2023  jao
+;; Copyright (C) 2021, 2023, 2024  jao
 
 ;; Author: jao <mail@jao.io>
 ;; Keywords: eshell
@@ -33,8 +33,8 @@
   "Value to use for `display-buffer-alist' when displaying the eshell buffer.")
 
 (defun jao-eshell-here--find-window (b)
-  (when-let (w (seq-find (lambda (w) (eq (window-buffer w) b))
-                         (window-list)))
+  (when-let* ((w (seq-find (lambda (w) (eq (window-buffer w) b))
+                           (window-list))))
     (select-window w)))
 
 (defun jao-eshell-here--frame-buffer (&optional b)
diff --git a/lib/eos/jao-minibuffer.el b/lib/eos/jao-minibuffer.el
index 77bd49a..d2bc70a 100644
--- a/lib/eos/jao-minibuffer.el
+++ b/lib/eos/jao-minibuffer.el
@@ -69,12 +69,12 @@
     (insert msg)))
 
 (defun jao-minibuffer--strip-prev (msg)
-  (if-let ((n (text-property-any 0 (length msg) 'minibuffer-message t msg)))
+  (if-let* ((n (text-property-any 0 (length msg) 'minibuffer-message t msg)))
       (string-trim (substring msg 0 n))
     msg))
 
 (defun jao-minibuffer--prefix (msgs)
-  (when-let (p (string-join (butlast msgs) "\n"))
+  (when-let* ((p (string-join (butlast msgs) "\n")))
     (unless (string-blank-p p) (concat p "\n"))))
 
 (defun jao-minibuffer--format-msg (msg)
diff --git a/lib/eos/jao-tracking.el b/lib/eos/jao-tracking.el
index 2af868c..a1fff73 100644
--- a/lib/eos/jao-tracking.el
+++ b/lib/eos/jao-tracking.el
@@ -105,7 +105,7 @@
       `(:propertize ,(plist-get s :propertize)
                     face
                     (jao-tracking-minibuffer
-                     ,@(when-let ((f (plist-get s 'face)))
+                     ,@(when-let* ((f (plist-get s 'face)))
                          (jao-tracking-set-log " * ")
                          (list f))))
     `(:propertize "|" face jao-tracking-minibuffer-sep)))
diff --git a/lib/media/jao-mpc.el b/lib/media/jao-mpc.el
index 0f000da..52fdfbf 100644
--- a/lib/media/jao-mpc.el
+++ b/lib/media/jao-mpc.el
@@ -125,7 +125,7 @@
 (defvar jao-mpc--idle-procs nil)
 
 (defun jao-mpc--idle-loop (&optional port)
-  (when-let (proc (alist-get port jao-mpc--idle-procs))
+  (when-let* ((proc (alist-get port jao-mpc--idle-procs)))
     (ignore-errors (kill-process proc)))
   (setf (alist-get port jao-mpc--idle-procs nil t)
         (make-process :name (format "jao-mpc-idleloop (%s)" port)
@@ -146,7 +146,7 @@
   (read-only-mode 1))
 
 (defun jao-mpc--album-buffer ()
-  (if-let (b (get-buffer jao-mpc--albums))
+  (if-let* ((b (get-buffer jao-mpc--albums)))
       b
     (with-current-buffer (get-buffer-create jao-mpc--albums)
       (jao-mpc-albums-mode)
@@ -332,7 +332,7 @@
                          (jao-mpc--cmd jao-mpc--simple-albums-cmd port)
                        albums-str))
          (albums (split-string albums-str "\n" t)))
-    (when-let (album (completing-read "Play album: " albums nil t))
+    (when-let* ((album (completing-read "Play album: " albums nil t)))
       (jao-mpc--add-and-play (car (split-string album "-" t " ")) port))))
 
 (provide 'jao-mpc)
diff --git a/lib/media/jao-mpris.el b/lib/media/jao-mpris.el
index 3bb2636..f2974ab 100644
--- a/lib/media/jao-mpris.el
+++ b/lib/media/jao-mpris.el
@@ -97,7 +97,7 @@
         jao-mpris--current nil))
 
 (defun jao-mpris--get (k &optional l)
-  (when-let (v (alist-get k (or l jao-mpris--current)))
+  (when-let* ((v (alist-get k (or l jao-mpris--current))))
     (if (consp v) (car v) v)))
 
 (defun jao-mpris--set-current (k v)
@@ -146,7 +146,7 @@
   (interactive "P")
   (when refresh (jao-mpris--track))
   (when jao-mpris--current
-    (jao-notify (format "%s%s" (if-let (s (jao-mpris--get 'status))
+    (jao-notify (format "%s%s" (if-let* ((s (jao-mpris--get 'status)))
                                    (format "%s: " s)
                                  "")
                         (jao-mpris--format)))))
@@ -159,7 +159,7 @@
 (defun jao-mpris--handler (iname properties &rest _args)
   (let ((inhibit-message t))
     (message "Received properties: %S from %s" properties iname))
-  (when-let (md (caadr (assoc "Metadata" properties)))
+  (when-let* ((md (caadr (assoc "Metadata" properties))))
     (let ((tno (caadr (assoc "xesam:trackNumber" md)))
           (tlt (caadr (assoc "xesam:title" md)))
           (art (caadr (assoc "xesam:artist" md)))
@@ -172,7 +172,8 @@
         (jao-mpris--set-current 'artist art)
         (jao-mpris--set-current 'album alb)
         (jao-mpris--set-current 'length len))))
-  (when-let (st (caadr (assoc "PlaybackStatus" properties)))
+  (when-let* ((st (or (caadr (assoc "PlaybackStatus" properties))
+                      (jao-mpris--get 'status))))
     (jao-mpris--set-current 'status st)
     (when (string= st "Stopped")
       (dolist (k '(track title artist album length))
diff --git a/lib/net/jao-eww-session.el b/lib/net/jao-eww-session.el
index 4ac5447..3c60cf8 100644
--- a/lib/net/jao-eww-session.el
+++ b/lib/net/jao-eww-session.el
@@ -97,7 +97,7 @@ the session is already displayed in a eww tab, jao-eww-session can:
               (jao-eww-session-eww-buffers (current-buffer))))
 
 (defun jao-eww--current-url ()
-  (when-let (url (eww-current-url)) (url-encode-url url)))
+  (when-let* ((url (eww-current-url))) (url-encode-url url)))
 
 (defun jao-eww-session--current-urls (&optional skip-current)
   (let ((urls)
@@ -107,7 +107,7 @@ the session is already displayed in a eww tab, jao-eww-session can:
     (dolist (b (jao-eww-session-eww-buffers (when skip-current cb))
                (list pos (reverse urls)))
       (set-buffer b)
-      (when-let (url (jao-eww--current-url))
+      (when-let* ((url (jao-eww--current-url)))
         (when (eq b cb) (setq pos count))
         (setq count (1+ count))
         (push (cons url (jao-eww-buffer-title)) urls)))))
@@ -133,7 +133,7 @@ the session is already displayed in a eww tab, jao-eww-session can:
   (seq-filter
    (lambda (b)
      (with-current-buffer b
-       (when-let (url (jao-eww--current-url))
+       (when-let* ((url (jao-eww--current-url)))
          (when (member url urls)
            (when (y-or-n-p "Already open session, abort? ")
              (switch-to-buffer b)
@@ -218,7 +218,7 @@ the session is already displayed in a eww tab, jao-eww-session can:
 (defun jao-eww-session-load ()
   "Load last stored session into eww."
   (interactive)
-  (when-let ((s (jao-eww-session-load-aux)))
+  (when-let* ((s (jao-eww-session-load-aux)))
     (let* ((urls (jao-eww-session-urls s))
            (offset (jao-eww-session-offset s))
            (buffers (unless (equal jao-eww-session-duplicate-tabs 'always)
diff --git a/lib/net/jao-notmuch-gnus.el b/lib/net/jao-notmuch-gnus.el
index 5eedd97..0789611 100644
--- a/lib/net/jao-notmuch-gnus.el
+++ b/lib/net/jao-notmuch-gnus.el
@@ -62,7 +62,7 @@
 (defun jao-notmuch-gnus-show-tags ()
   "Display in the echo area the tags of the current message."
   (interactive)
-  (when-let (id (jao-notmuch-gnus-message-id))
+  (when-let* ((id (jao-notmuch-gnus-message-id)))
     (message "%s" (string-join (jao-notmuch-gnus-message-tags id) " "))))
 
 (defun jao-notmuch-gnus-toggle-tags (tags &optional id current)
@@ -77,7 +77,7 @@
 
 (defun jao-notmuch-gnus-tag-mark ()
   "Remove the new tag for an article when it's marked as seen by Gnus."
-  (when-let (id (jao-notmuch-gnus-message-id t))
+  (when-let* ((id (jao-notmuch-gnus-message-id t)))
     (jao-notmuch-gnus-tag-message id '("-new") t)))
 
 (add-hook 'gnus-mark-article-hook #'jao-notmuch-gnus-tag-mark)
@@ -189,12 +189,12 @@ Example:
     (org-gnus-follow-link group id)))
 
 (defun jao-notmuch-gnus-org-store ()
-  (when-let (d (or (when (derived-mode-p 'notmuch-show-mode 'notmuch-tree-mode)
-                     (cons (notmuch-show-get-message-id)
-                           (notmuch-show-get-subject)))
-                    (when (derived-mode-p 'gnus-summary-mode 'gnus-article-mode)
-                      (cons (jao-notmuch-gnus-message-id)
-                            (gnus-summary-article-subject)))))
+  (when-let* ((d (or (when (derived-mode-p 'notmuch-show-mode 'notmuch-tree-mode)
+                       (cons (notmuch-show-get-message-id)
+                             (notmuch-show-get-subject)))
+                     (when (derived-mode-p 'gnus-summary-mode 'gnus-article-mode)
+                       (cons (jao-notmuch-gnus-message-id)
+                             (gnus-summary-article-subject))))))
     (org-link-store-props :type "mail"
                           :link (concat "mail:" (car d))
                           :description (concat "Mail: " (cdr d)))))
diff --git a/lib/net/jao-notmuch.el b/lib/net/jao-notmuch.el
index aef9757..2dc4b70 100644
--- a/lib/net/jao-notmuch.el
+++ b/lib/net/jao-notmuch.el
@@ -69,7 +69,7 @@
     (user-error "No tree view for this buffer")))
 
 (defun jao-notmuch-tree--looking-at-message ()
-  (when-let (id (plist-get (notmuch-tree-get-message-properties) :id))
+  (when-let* ((id (plist-get (notmuch-tree-get-message-properties) :id)))
     (equal (concat "*notmuch-id:" id "*")
            (buffer-name (window-buffer notmuch-tree-message-window)))))
 
@@ -105,7 +105,7 @@
     (goto-char (point-min))
     (let ((pos (point)))
       (while (setq pos (next-single-property-change pos 'w3m-href-anchor))
-        (when-let ((url (get-text-property pos 'w3m-href-anchor)))
+        (when-let* ((url (get-text-property pos 'w3m-href-anchor)))
           (when (stringp url) (cl-pushnew url res :test #'string=))))
       (seq-uniq res #'string=))))
 
@@ -117,7 +117,7 @@
 
 (defun jao-notmuch-browse-urls (&optional external)
   (interactive "P")
-  (if-let ((urls (jao-notmuch-message-urls)))
+  (if-let* ((urls (jao-notmuch-message-urls)))
       (funcall (if external browse-url-secondary-browser-function #'browse-url)
                (completing-read "Browse URL: " urls))
     (message "No URLs in this message")))
@@ -131,22 +131,22 @@
   (interactive)
   (when (get-text-property (point) 'w3m-href-anchor)
     (goto-char (next-single-property-change (point) 'w3m-href-anchor)))
-  (if-let (pos (next-single-property-change (point) 'w3m-href-anchor))
+  (if-let* ((pos (next-single-property-change (point) 'w3m-href-anchor)))
       (goto-char pos)
     (or (forward-button 1 nil t t)
         (ffap-next-guess))))
 
 (defun jao-notmuch-show-previous-button ()
   (interactive)
-  (if-let (pos (previous-single-property-change (point) 'w3m-href-anchor))
+  (if-let* ((pos (previous-single-property-change (point) 'w3m-href-anchor)))
       (goto-char (previous-single-property-change pos 'w3m-href-anchor))
     (or (backward-button 1 nil t t)
         (ffap-next-guess t))))
 
 (defun jao-notmuch-show-ret ()
   (interactive)
-  (when-let (url (or (get-text-property (point) 'w3m-href-anchor)
-                     (thing-at-point-url-at-point)))
+  (when-let* ((url (or (get-text-property (point) 'w3m-href-anchor)
+                       (thing-at-point-url-at-point))))
     (browse-url url)))
 
 
@@ -215,7 +215,7 @@
 ;;; header line with thread message counts
 
 (defun jao-notmuch--looking-at-new-p (&optional p)
-  (when-let (ts (if p (plist-get p :tags) (notmuch-show-get-tags)))
+  (when-let* ((ts (if p (plist-get p :tags) (notmuch-show-get-tags))))
     (or (member "unread" ts) (member "new" ts))))
 
 (defsubst jao-notmuch-tree--first-p (&optional msg)
diff --git a/lib/net/jao-proton-utils.el b/lib/net/jao-proton-utils.el
index 62b97b3..0c9ccd7 100644
--- a/lib/net/jao-proton-utils.el
+++ b/lib/net/jao-proton-utils.el
@@ -86,7 +86,7 @@
   (jao-proton-vpn--do "s"))
 
 (defun proton-vpn--get-status ()
-  (or (when-let ((b (get-buffer jao-proton-vpn--buffer)))
+  (or (when-let* ((b (get-buffer jao-proton-vpn--buffer)))
         (with-current-buffer b
           (goto-char (point-min))
           (if (re-search-forward "^Status: *\\(.+\\)$" nil t)
diff --git a/lib/prog/jao-compilation.el b/lib/prog/jao-compilation.el
index c099701..5bea68e 100644
--- a/lib/prog/jao-compilation.el
+++ b/lib/prog/jao-compilation.el
@@ -67,7 +67,7 @@
 
 ;;;###autoload
 (defun jao-compilation-root (&optional dir)
-  (when-let ((rfn (jao-compilation-find-root (or dir (buffer-file-name))
+  (when-let* ((rfn (jao-compilation-find-root (or dir (buffer-file-name))
                                              jao-compilation-dominating-rx)))
     (let* ((default-directory (expand-file-name rfn))
            (dir (file-name-directory rfn))
@@ -80,13 +80,13 @@
 
 ;;;###autoload
 (defun jao-compilation-root-file ()
-  (when-let ((dir (jao-compilation-root)))
+  (when-let* ((dir (jao-compilation-root)))
     (car (directory-files dir nil jao-compilation-dominating-rx))))
 
 ;;;###autoload
 (defun jao-find-compilation-root (dir)
   (when (and (stringp dir) (file-exists-p dir))
-    (when-let ((root (jao-compilation-root dir)))
+    (when-let* ((root (jao-compilation-root dir)))
       (cons 'transient root))))
 
 ;;;###autoload
diff --git a/lib/themes/jao-themes.el b/lib/themes/jao-themes.el
index 58d32a0..706427b 100644
--- a/lib/themes/jao-themes.el
+++ b/lib/themes/jao-themes.el
@@ -1189,7 +1189,7 @@
         (push df fs)))))
 
 (defun jao-themes--adjust-palette (p s)
-  (if-let (v (alist-get s p)) (cons (cons s (car v)) (assoc-delete-all s p)) p))
+  (if-let* ((v (alist-get s p))) (cons (cons s (car v)) (assoc-delete-all s p)) p))
 
 (defun jao-themes--let-palette (palette)
   (let ((palette (seq-reduce #'jao-themes--adjust-palette '(fg bg box) palette)))