diff options
Diffstat (limited to 'misc/jao-minibuffer.el')
| -rw-r--r-- | misc/jao-minibuffer.el | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/misc/jao-minibuffer.el b/misc/jao-minibuffer.el index 70829bb..6af3730 100644 --- a/misc/jao-minibuffer.el +++ b/misc/jao-minibuffer.el @@ -25,6 +25,7 @@ ;;; Code: (defvar jao-minibuffer-info ()) +(defvar jao-minibuffer-notification nil) (defvar jao-minibuffer-align-right-p t) (defvar jao-minibuffer-right-margin 2) (defvar jao-minibuffer-maximized-frames-p t) @@ -37,22 +38,25 @@ (substring s 0 w))) (defun jao-minibuffer--aligned (&optional w) - (let ((msg (format-mode-line jao-minibuffer-info))) + (let ((msg (string-trim (format-mode-line (or jao-minibuffer-notification + jao-minibuffer-info))))) (when (not (string-empty-p msg)) (if jao-minibuffer-align-right-p (let* ((mw (if jao-minibuffer-maximized-frames-p (frame-width) (window-width (minibuffer-window)))) - (w (- mw (or w 0) jao-minibuffer-right-margin))) + (w (mod (or w 0) mw)) + (w (- mw w jao-minibuffer-right-margin))) (if (> w 0) (jao-minibuffer--trim msg w) "")) (concat " ยท " msg))))) (defun jao-minibuffer--message (old-func &rest args) - (let ((msg (let ((inhibit-message t)) (apply old-func args)))) - (when (not inhibit-message) - (let ((message-log-max nil) - (new-msg (concat msg (jao-minibuffer--aligned (length msg))))) - (funcall old-func "%s" new-msg))) + (let* ((msg (let ((inhibit-message t)) (apply old-func args))) + (msg (if inhibit-message "" msg)) + (new-msg (concat msg (jao-minibuffer--aligned (length msg)))) + (message-log-max nil) + (inhibit-message nil)) + (funcall old-func "%s" new-msg) msg)) (advice-add #'message :around #'jao-minibuffer--message) @@ -68,5 +72,16 @@ (defun jao-minibuffer-add-variable (variable-name &optional append) (add-to-list 'jao-minibuffer-info `(:eval ,variable-name) append)) +;;;###autoload +(defun jao-minibuffer-push-notification (msg) + (setq jao-minibuffer-notification msg) + (jao-minibuffer-refresh)) + +;;;###autoload +(defun jao-minibuffer-pop-notification () + (interactive) + (setq jao-minibuffer-notification nil) + (jao-minibuffer-refresh)) + (provide 'jao-minibuffer) ;;; jao-minibuffer.el ends here |