From: Al Haji-Ali <a.hajiali@hw.ac.uk>
Date: Mon, 2 Feb 2026 16:56:14 +0000 (+0000)
Subject: emacs: Fix warnings on emacs@31.1
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=bcb1398cdc2bf7d8fab0223b6cb008b7959e0780;p=notmuch

emacs: Fix warnings on emacs@31.1

Use `when-let*' instead of `when-let'. Use quoted
`font-lock-warning-face' instead of obsolete variable.
---

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index 74bb559a..259a68c0 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -443,7 +443,7 @@ instead of `message-mode' and SWITCH-FUNCTION is mandatory."
 		   (lambda (mail) (and (not (funcall nr mail)) mail))
 		 (lambda (mail) (and (not (string-match-p nr mail)) mail)))))
     (dolist (header '("To" "Cc"))
-      (when-let ((v (message-fetch-field header)))
+      (when-let* ((v (message-fetch-field header)))
 	(let* ((tokens (mapcar #'string-trim (message-tokenize-header v)))
 	       (good-tokens (delq nil (mapcar nr-filter tokens)))
 	       (addr (and good-tokens (mapconcat #'identity good-tokens ", "))))
diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 19b51753..9547c6e6 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -683,7 +683,7 @@ message at DEPTH in the current thread."
       ;; alternative (even if we can't render it).
       (push (list content-id msg part) notmuch-show--cids)))
   ;; Recurse on sub-parts
-  (when-let ((type (plist-get part :content-type)))
+  (when-let* ((type (plist-get part :content-type)))
     (pcase-let ((`(,type ,subtype)
 		 (split-string (downcase type) "/")))
       (cond ((equal type "multipart")
@@ -702,7 +702,7 @@ This will only find parts from messages that have been inserted
 into the current buffer.  CID must be a raw content ID, without
 enclosing angle brackets, a cid: prefix, or URL encoding.  This
 will return nil if the CID is unknown or cannot be retrieved."
-  (when-let ((descriptor (cdr (assoc cid notmuch-show--cids))))
+  (when-let* ((descriptor (cdr (assoc cid notmuch-show--cids))))
     (pcase-let ((`(,msg ,part) descriptor))
       ;; Request caching for this content, as some messages
       ;; reference the same cid: part many times (hundreds!).
@@ -1057,7 +1057,7 @@ will return nil if the CID is unknown or cannot be retrieved."
 
 (defun notmuch-show-mime-type (part)
   "Return the correct mime-type to use for PART."
-  (when-let ((content-type (plist-get part :content-type)))
+  (when-let* ((content-type (plist-get part :content-type)))
     (setq content-type (downcase content-type))
     (or (and (string= content-type "application/octet-stream")
 	     (notmuch-show-get-mime-type-of-application/octet-stream part))
@@ -1945,7 +1945,7 @@ user decision and we should not override it."
 		 (concat header-line-format
 			 (propertize
 			  "  [some mark read tag changes may have failed]"
-			  'face font-lock-warning-face)))))))))
+			  'face 'font-lock-warning-face)))))))))
 
 (defun notmuch-show-filter-thread (query)
   "Filter or LIMIT the current thread based on a new query string.