jao-minibuffer: set/clear-message-function in lieu of advice

1 files changed, 16 insertions, 14 deletions

diff --git a/misc/jao-minibuffer.el b/misc/jao-minibuffer.el
index 6af3730..746a925 100644
--- a/misc/jao-minibuffer.el
+++ b/misc/jao-minibuffer.el
@@ -37,29 +37,28 @@
       (format (format "%%%ds" w) s)
     (substring s 0 w)))
 
-(defun jao-minibuffer--aligned (&optional w)
-  (let ((msg (string-trim (format-mode-line (or jao-minibuffer-notification
-                                                jao-minibuffer-info)))))
+(defun jao-minibuffer--current ()
+  (with-current-buffer jao-minibuffer--name
+    (buffer-substring (point-min) (point-max))))
+
+(defun jao-minibuffer--aligned (&optional w currentp)
+  (let ((msg (string-trim (if currentp
+                              (jao-minibuffer--current)
+                            (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 (mod (or w 0) mw))
+                 (w (mod (or w (length (current-message))) 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)))
-         (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)
+(defun jao-minibuffer--set-message (msg)
+  (let ((msg (replace-regexp-in-string "\n" " " msg)))
+    (concat msg (jao-minibuffer--aligned (length msg) t))))
 
 ;;;###autoload
 (defun jao-minibuffer-refresh ()
@@ -83,5 +82,8 @@
   (setq jao-minibuffer-notification nil)
   (jao-minibuffer-refresh))
 
+(setq set-message-function #'jao-minibuffer--set-message)
+(setq clear-message-function #'jao-minibuffer-refresh)
+
 (provide 'jao-minibuffer)
 ;;; jao-minibuffer.el ends here