From 2125eba752727e53fd13dc3fed016c5d1e6826b2 Mon Sep 17 00:00:00 2001 From: jao Date: Thu, 28 Mar 2024 14:50:02 +0000 Subject: jao-minibuffer: better clear message function --- lib/eos/jao-minibuffer.el | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/eos/jao-minibuffer.el b/lib/eos/jao-minibuffer.el index f846c82..0327460 100644 --- a/lib/eos/jao-minibuffer.el +++ b/lib/eos/jao-minibuffer.el @@ -89,12 +89,18 @@ (defun jao-minibuffer--set-message (msg) (when jao-minibuffer-mode (or jao-minibuffer-inhibit - (let* ((info (when jao-minibuffer-msg-info - (jao-minibuffer--format-info jao-minibuffer-msg-info))) - (info (when info (propertize info 'face 'jao-themes-dimm))) - (msg (if info (format "%s - %s " info msg) msg))) + (let* ((info (and jao-minibuffer-msg-info + (jao-minibuffer--format-info jao-minibuffer-msg-info))) + (info (or (and info msg (propertize info 'face 'jao-themes-dimm)) + info)) + (sep (if msg " - " "")) + (msg (if info (format "%s%s%s " info sep (or msg "")) msg))) (jao-minibuffer--format-msg (or msg "")))))) +(defun jao-minibuffer--clear-message () + (let ((jao-minibuffer-inhibit nil)) + (or (jao-minibuffer--insert (jao-minibuffer--set-message nil)) t))) + (setq set-message-function #'jao-minibuffer--set-message) (defun jao-minibuffer--add-variable (list-name variable-name &optional order) @@ -123,7 +129,7 @@ (if jao-minibuffer-mode (progn (advice-add 'select-window :after #'jao-minibuffer-refresh) (advice-add 'force-mode-line-update :after #'jao-minibuffer-refresh) - (setq clear-message-function #'jao-minibuffer-refresh) + (setq clear-message-function #'jao-minibuffer--clear-message) (jao-minibuffer-refresh)) (advice-remove 'select-window #'jao-minibuffer-refresh) (advice-remove 'force-mode-line-update #'jao-minibuffer-refresh) -- cgit v1.2.3