From 5029d8942ada6f90dec9eef1744612575d31466b Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Sat, 22 Aug 2020 00:03:23 +0100
Subject: maildir: better echo messages

---
 net/jao-maildir.el   | 12 ++++++++----
 themes/jao-themes.el |  5 +++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/net/jao-maildir.el b/net/jao-maildir.el
index 93269aa..12c534a 100644
--- a/net/jao-maildir.el
+++ b/net/jao-maildir.el
@@ -62,8 +62,11 @@
                           'face 'font-lock-function-name-face))
            (s (if (string-empty-p s) s (concat s " "))))
       (setq jao-maildir-mode-line-string (format "%s%s" total s))
-      (when (and jao-maildir-echo-p (not (string-empty-p s)))
-        (message "Mail %s" s))
+      (when jao-maildir-echo-p
+        (with-current-buffer " *Minibuf-0*"
+          (erase-buffer)
+          (when (not (string-blank-p jao-maildir-mode-line-string))
+            (insert (format "Mail %s" jao-maildir-mode-line-string)))))
       (force-mode-line-update t))))
 
 (defvar jao-maildir--watches nil)
@@ -96,10 +99,11 @@
                 jao-maildirs)))
 
 ;;;###autoload
-(defun jao-maildir-setup (maildirs &optional cb)
+(defun jao-maildir-setup (maildirs mode-line &optional cb)
   (setq jao-maildirs maildirs)
   (setq jao-maildir-counts (jao-maildir-counts))
-  (add-to-list 'global-mode-string 'jao-maildir-mode-line-string t)
+  (when mode-line
+    (add-to-list 'global-mode-string 'jao-maildir-mode-line-string t))
   (jao-maildir--setup-watches cb))
 
 
diff --git a/themes/jao-themes.el b/themes/jao-themes.el
index 8cff242..15537aa 100644
--- a/themes/jao-themes.el
+++ b/themes/jao-themes.el
@@ -713,6 +713,7 @@
             (message-mml (p warning) nbf)
             (message-separator (p warning) nbf)
             (mm-uu-extract (p hilite) ex)
+            (minibuffer-line (p f00))
             (minibuffer-prompt (p f00))
             (mode-line-buffer-id nbf (c nil nil))
             (mode-line-emphasis (p warning))
@@ -825,6 +826,10 @@
             (sh-quoted-exec (p f00))
             (show-paren-match (p hilite))
             (show-paren-mismatch (p error))
+            (sieve-control-commands (~ font-lock-builtin-face))
+            (sieve-tagged-arguments (~ font-lock-constant-face))
+            (sieve-test-commands (~ font-lock-keyword-face))
+            (sieve-action-commands (~ font-lock-keyword-face))
             (signel-contact-face (p f11))
             (signel-notice (p dimm))
             (signel-notification (p warning))
-- 
cgit v1.2.3