correctly display message in message holder slot

kiennq · Jan 31, 2020 · 8762d2e · 8762d2e
1 parent 0160882
commit 8762d2e
Showing 1 changed file with 16 additions and 17 deletions.
diff --git a/mini-modeline.el b/mini-modeline.el
@@ -149,21 +149,20 @@ When ARG is:
                 (when (or (memq arg '(force clear))
                           (mini-modeline--overduep mini-modeline--last-update
                                                    mini-modeline-update-interval))
-                  (let ((msg (or mini-modeline--msg-message (current-message))))
-                    (when msg
-                      ;; Clear echo area and start new timer for echo message
-                      ;; (mini-modeline--log "msg: %s\n" msg)
-                      ;; (mini-modeline--log "from: %s\n" mini-modeline--msg-message)
-                      (message nil)
-                      (setq mini-modeline--last-echoed (current-time))
-                      ;; we proritize the message from `message'
-                      ;; or the message when we're not in middle of a command running.
-                      (when (or mini-modeline--msg-message
-                                (eq mini-modeline--command-state 'begin))
-                        (setq mini-modeline--command-state 'exec)
-                        ;; Don't echo keystrokes when in middle of command
-                        (setq echo-keystrokes 0))
-                      (setq mini-modeline--msg msg)))
+                  (when-let ((msg (or mini-modeline--msg-message (current-message))))
+                    ;; Clear echo area and start new timer for echo message
+                    ;; (mini-modeline--log "msg: %s\n" msg)
+                    ;; (mini-modeline--log "from: %s\n" mini-modeline--msg-message)
+                    (message nil)
+                    (setq mini-modeline--last-echoed (current-time))
+                    ;; we proritize the message from `message'
+                    ;; or the message when we're not in middle of a command running.
+                    (when (or mini-modeline--msg-message
+                              (eq mini-modeline--command-state 'begin))
+                      (setq mini-modeline--command-state 'exec)
+                      ;; Don't echo keystrokes when in middle of command
+                      (setq echo-keystrokes 0))
+                    (setq mini-modeline--msg msg))
                   ;; Reset echo message when timeout and not in middle of command
                   (when (and mini-modeline--msg
                              (not (eq mini-modeline--command-state 'exec))
@@ -198,7 +197,7 @@ When ARG is:
 
 (defun mini-modeline-msg ()
   "Place holder to display echo area message."
-  mini-modeline--msg)
+  `(format "%s" mini-modeline--msg))
 
 (defsubst mini-modeline--lr-render (left right)
   "Render the LEFT and RIGHT part of mini-modeline."
@@ -249,7 +248,7 @@ Return value is (STRING . LINES)."
 (defmacro mini-modeline--wrap (func &rest body)
   "Add an advice around FUNC with name mini-modeline--%s.
 BODY will be supplied with orig-func and args."
-  (let* ((name (intern (format "mini-modeline--%s" func))))
+  (let ((name (intern (format "mini-modeline--%s" func))))
     `(advice-add #',func :around
                  (lambda (orig-func &rest args)
                    ,@body)