From 4e85abda157eac8888809b2dde885f60f312a5fb Mon Sep 17 00:00:00 2001 From: David Bremner Date: Fri, 9 Aug 2024 10:18:54 -0300 Subject: [PATCH] Revert "emacs: Fix saved-search buffer titles" This reverts commit bc989209171d406b3671024542e59b86b0ecb23d. This was applied unintentionally to master while still under discussion. --- emacs/notmuch.el | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/emacs/notmuch.el b/emacs/notmuch.el index f55e9b42..2a73ffa5 100644 --- a/emacs/notmuch.el +++ b/emacs/notmuch.el @@ -973,20 +973,17 @@ unthreaded) and whether it's SAVED (t or nil)." (defun notmuch-search-buffer-title (query &optional type) "Returns the title for a buffer with notmuch search results." (let* ((saved-search - (cl-loop with match - with match-length = 0 - for candidate in notmuch-saved-searches - for length = (let* ((query* (notmuch-saved-search-get - candidate - :query)) - (regexp (concat "^" - (regexp-quote query*)))) - (and (string-match regexp query) - (length (match-string 0 query)))) - if (and length (> length match-length)) - do (setq match candidate - match-length length) - finally return match)) + (let (longest + (longest-length 0)) + (cl-loop for tuple in notmuch-saved-searches + if (let ((quoted-query + (regexp-quote + (notmuch-saved-search-get tuple :query)))) + (and (string-match (concat "^" quoted-query) query) + (> (length (match-string 0 query)) + longest-length))) + do (setq longest tuple)) + longest)) (saved-search-name (notmuch-saved-search-get saved-search :name)) (saved-search-type (notmuch-saved-search-get saved-search :search-type)) (saved-search-query (notmuch-saved-search-get saved-search :query)))