     `(defun ,func ()
        ,(format "%s micro-state." (symbol-name name))
        (interactive)
-       (let ((doc ,@doc)) (when doc (echo doc)))
+       (let ((doc ,@doc)) (when doc
+                            (echo (spacemacs//micro-state-propertize-doc
+                                   (concat ,(symbol-name name) ":" doc)))))
        ,@on-enter
        (,(if (version< emacs-version "24.4")
              'set-temporary-overlay-map

               (equal (this-command-keys) (kbd key)))
      (not (plist-get wrapper :exit)))))

(provide 'core-micro-state)

         (binding-doc (spacemacs/mplist-get binding :doc))
         (wrapper-name (intern (format "spacemacs//%s-%s" (symbol-name name)
                                       (symbol-name wrapped))))
         (wrapper-func
          (eval `(defun ,wrapper-name ()
                   "Auto-generated function"
                   (interactive)
                   (when ',wrapped
                     (call-interactively ',wrapped))
                   (let ((bdoc ,@binding-doc)
                         (defdoc ,@default-doc))
                     (if bdoc
                         (echo (spacemacs//micro-state-propertize-doc
                                (concat ,(symbol-name name) ":" bdoc)))
                       (when defdoc
                         (echo (spacemacs//micro-state-propertize-doc
                                (concat ,(symbol-name name) ":"
                                        defdoc))))))))))
    (append (list (car binding) wrapper-func) binding)))

(defun spacemacs//micro-state-fill-map-sexps (wrappers)
