emacs 31main

1 files changed, 8 insertions, 8 deletions

diff --git a/lib/net/jao-notmuch.el b/lib/net/jao-notmuch.el
index 0f6903a..625c8e6 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 and mode lines 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)