emacs-emojify

commit 94d9b54b79dca8a0beacb0b180b1dae1fb8d3e8a
parent f4eb3b17d4241df8702ed3da31cec12ac15cc974
Author: Iqbal Ansari <iqbalansari02@yahoo.com>
Date:   Sat, 31 Oct 2015 23:32:09 +0530

Make sure we do not overwrite active minibuffer prompt when echoing
emojify messages

Diffstat:
M
emojify.el
 | 
9
+++++++--

1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/emojify.el b/emojify.el
@@ -334,7 +334,9 @@ OLD-POINT and NEW-POINT are the point before entering and after entering."
     (when (eq buffer (current-buffer))
       (cond ((and (eq emojify-point-entered-behaviour 'echo)
                   ;; Do not echo in isearch-mode
-                  (not isearch-mode))
+                  (not isearch-mode)
+                  (not (active-minibuffer-window))
+                  (not (current-message)))
              (message (substring-no-properties match)))
             ((eq emojify-point-entered-behaviour 'uncover)
              (emojify--uncover-emoji buffer match-beginning match-end))
@@ -351,7 +353,10 @@ OLD-POINT and NEW-POINT are the point before entering and after entering."
 
 To understand WINDOW, STRING and POS see the function documentation for
 `help-echo' text-property."
-  (when emojify-show-help
+  (when (and emojify-show-help
+             (not isearch-mode)
+             (not (active-minibuffer-window))
+             (not (current-message)))
     (plist-get (text-properties-at pos) 'emojify-text)))