From 02a28ae4aa5b5d77e7d2ff4fdf6766ee566e773d Mon Sep 17 00:00:00 2001 From: jao Date: Wed, 30 Dec 2020 05:20:34 +0000 Subject: jao-minibuffer: ordering for displayed entries --- media/jao-emms-info-track.el | 6 +++--- media/jao-mpris.el | 3 ++- net/jao-maildir.el | 4 ++-- sys/jao-ednc.el | 4 ++-- sys/jao-minibuffer.el | 4 ++-- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/media/jao-emms-info-track.el b/media/jao-emms-info-track.el index d2e2867..67f74c8 100644 --- a/media/jao-emms-info-track.el +++ b/media/jao-emms-info-track.el @@ -186,8 +186,8 @@ (t (jao-emms-info-track-description track nil play-len)))))) (jao-emms--echo-string ""))) -(defun jao-emms-enable-minibuffer () - (jao-minibuffer-add-variable 'jao-emms-echo-string t) +(defun jao-emms-enable-minibuffer (minibuffer-order) + (jao-minibuffer-add-variable 'jao-emms-echo-string minibuffer-order) (dolist (h '(emms-track-updated-functions emms-player-finished-hook emms-player-stopped-hook @@ -200,7 +200,7 @@ (setq emms-track-description-function 'jao-emms-info-track-description) (setq jao-emms-show-osd-p show-osd) (add-hook 'emms-player-started-hook 'jao-emms-show-osd-hook) - (when minibuffer (jao-emms-enable-minibuffer)) + (when minibuffer (jao-emms-enable-minibuffer minibuffer)) (unless show-echo-line (eval-after-load 'emms-player-mpd '(remove-hook 'emms-player-started-hook 'emms-player-mpd-show))) diff --git a/media/jao-mpris.el b/media/jao-mpris.el index 4d6d294..7cbacb7 100644 --- a/media/jao-mpris.el +++ b/media/jao-mpris.el @@ -100,7 +100,8 @@ (when jao-mpris--current (jao-notify (format "%s: %s" (jao-mpris--get 'status) (jao-mpris--format))))) -(jao-minibuffer-add-variable 'jao-mpris-track-string t) +(defun jao-mpris-minibuffer-order (order) + (jao-minibuffer-add-variable 'jao-mpris-track-string order)) (defun jao-mpris--handler (iname properties &rest args) (when properties diff --git a/net/jao-maildir.el b/net/jao-maildir.el index 05cfc2d..ec6ac28 100644 --- a/net/jao-maildir.el +++ b/net/jao-maildir.el @@ -144,8 +144,8 @@ (jao-maildir--set-trackers maildirs trackers) (cond ((eq 'mode-line mode-line) (add-to-list 'global-mode-string 'jao-maildir-info-string t)) - ((eq 'minibuffer mode-line) - (jao-minibuffer-add-variable 'jao-maildir-info-string) + ((numberp mode-line) + (jao-minibuffer-add-variable 'jao-maildir-info-string mode-line) (jao-maildir-update-info-string t)) (t (error "Invalid mode-line value"))) (jao-maildir--setup-watches cb)) diff --git a/sys/jao-ednc.el b/sys/jao-ednc.el index 0dc8e4e..03d4049 100644 --- a/sys/jao-ednc.el +++ b/sys/jao-ednc.el @@ -97,14 +97,14 @@ (when new (funcall (jao-ednc--handler new) new t))) ;;;###autoload -(defun jao-ednc-setup () +(defun jao-ednc-setup (minibuffer-order) (setq jao-notify-use-messages-p t) (with-eval-after-load "tracking" (when jao-ednc-use-tracking (add-to-list 'tracking-faces-priorities 'jao-ednc-tracking) (when (listp tracking-shorten-modes) (add-to-list 'tracking-shorten-modes 'ednc-view-mode)))) - (jao-minibuffer-add-variable '(jao-ednc--count) t) + (jao-minibuffer-add-variable '(jao-ednc--count) minibuffer-order) (add-hook 'ednc-notification-presentation-functions #'jao-ednc--on-notify) (ednc-mode)) diff --git a/sys/jao-minibuffer.el b/sys/jao-minibuffer.el index 4d3104c..b626151 100644 --- a/sys/jao-minibuffer.el +++ b/sys/jao-minibuffer.el @@ -91,8 +91,8 @@ (jao-minibuffer--insert (or (jao-minibuffer--aligned) "")))) ;;;###autoload -(defun jao-minibuffer-add-variable (variable-name &optional append) - (add-to-list 'jao-minibuffer-info `(:eval ,variable-name) append)) +(defun jao-minibuffer-add-variable (variable-name &optional order) + (add-to-ordered-list 'jao-minibuffer-info `(:eval ,variable-name) order)) (defvar jao-minibuffer--notification-timer nil) -- cgit v1.2.3