notmuch: obsolete code removed

2 files changed, 20 insertions, 22 deletions

diff --git a/lib/net/jao-notmuch.el b/lib/net/jao-notmuch.el
index f11556e..4714367 100644
--- a/lib/net/jao-notmuch.el
+++ b/lib/net/jao-notmuch.el
@@ -1,6 +1,6 @@
 ;;; jao-notmuch.el --- Extensions for notmuch        -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2021  jao
+;; Copyright (C) 2021, 2022  jao
 
 ;; Author: jao <mail@jao.io>
 ;; Keywords: mail
@@ -86,11 +86,10 @@
   (interactive)
   (if (not (jao-notmuch-tree--looking-at-message))
       (jao-notmuch-tree-show-or-scroll t)
-      (if (notmuch-tree-scroll-message-window)
-          (jao-notmuch-tree-next nil)
-        (when (not (window-live-p notmuch-tree-message-window))
-          (notmuch-tree-show-message nil)))
-   (jao-notmuch--tree-update-buffer-name)))
+    (if (notmuch-tree-scroll-message-window)
+        (jao-notmuch-tree-next nil)
+      (when (not (window-live-p notmuch-tree-message-window))
+        (notmuch-tree-show-message nil)))))
 
 (defun jao-notmuch-tree-show-or-scroll (force)
   "Show current message, or scroll it if visible."
@@ -99,8 +98,7 @@
            (window-live-p notmuch-tree-message-window)
            (jao-notmuch-tree--looking-at-message))
       (scroll-other-window 1)
-    (notmuch-tree-show-message nil)
-    (jao-notmuch--tree-update-buffer-name)))
+    (notmuch-tree-show-message nil)))
 
 (notmuch-tree--define-do-in-message-window
  jao-notmuch-tree-end-of-buffer
@@ -183,8 +181,7 @@
   (when (jao-notmuch-goto-message-buffer nil t)
     (goto-char (point-min))
     (jao-notmuch--toggle-mime)
-    (jao-notmuch-goto-tree-buffer t)
-    (jao-notmuch--tree-update-buffer-name)))
+    (jao-notmuch-goto-tree-buffer t)))
 
 (defvar-local jao-notmuch--showing-images nil)
 
diff --git a/notmuch.org b/notmuch.org
index b571bff..013587f 100644
--- a/notmuch.org
+++ b/notmuch.org
@@ -78,22 +78,21 @@
                              "gmane" "feeds" "rss" "mce" "trove" "prog" "emacs"))))
 
     (defvar jao-notmuch--feed-tags
-      '("clojure"
+      '("news"
+        "fun"
+        "words"
         "computers"
+        "lobsters"
+        "clojure"
         "erlang"
-        "fun"
-        "gr-qc"
         "haskell"
-        "jao"
         "lisp"
-        "lobsters"
-        "math"
-        "news"
+        "scheme"
         "philosophy"
+        "math"
         "physics"
-        "quant-ph"
-        "scheme"
-        "words"))
+        "gr-qc"
+        "quant-ph"))
 
     (setq notmuch-saved-searches
           `(,(jao-notmuch--q "bigml" "inbox" "bi")
@@ -123,7 +122,7 @@
         ,(jao-notmuch--q "jao" "today" "tj"
                          '("tag:jao" "date:24h.."
                            "not tag:\"/(feeds|spam|local)/\""))
-        ,(jao-notmuch--q "feeds" "today" "tf" '("tag:feeds" "date:24h.."))
+        ;; ,(jao-notmuch--q "feeds" "today" "tf" '("tag:feeds" "date:24h.."))
         ,(jao-notmuch--q "bml" "flagged" "rb" '("tag:flagged" "tag:bigml"))
         ,(jao-notmuch--q "bml" "todo" "btt" '("tag:todo" "tag:bigml"))
         ,(jao-notmuch--q "jao" "flagged" "rj" '("tag:flagged" "not tag:bigml"))
@@ -359,7 +358,9 @@
                     ("count" . "%-7s ")
                     ("authors" . "%-35s")
                     ("subject" . " %-100s")
-                    (jao-notmuch-format-tags . "  (%s)")))
+                    (jao-notmuch-format-tags . "  (%s)"))
+                  notmuch-search-buffer-name-format "*%s*"
+                  notmuch-saved-search-buffer-name-format "*%s*")
       :bind (:map notmuch-search-mode-map
              (("RET" . notmuch-tree-from-search-thread)
               ("M-RET" . notmuch-search-show-thread))))