[nongnu] elpa/popup 5b2caec22c 2/2: Merge pull request #128 from tumashu/master

[ELPA Syncer]

branch: elpa/popup
commit 5b2caec22ccb968ca6ebe29bd691d07a3603f194
Merge: cf899f8012 fbef25196d
Author: Jen-Chieh Shen <jcs090218@gmail.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #128 from tumashu/master
    
    * popup.el (popup-tip): Add face argument.
---
 popup.el | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/popup.el b/popup.el
index 49a70528df..4035ae530d 100644
--- a/popup.el
+++ b/popup.el
@@ -1050,6 +1050,7 @@ HELP-DELAY is a delay of displaying helps."
                      nowait
                      nostrip
                      prompt
+                     face
                      &aux tip lines)
   "Show a tooltip of STRING at POINT. This function is
 synchronized unless NOWAIT specified. Almost all arguments are
@@ -1063,7 +1064,9 @@ tooltip instance without entering event loop.
 
 If `NOSTRIP` is non-nil, `STRING` properties are not stripped.
 
-PROMPT is a prompt string when reading events during event loop."
+PROMPT is a prompt string when reading events during event loop.
+
+If FACE is non-nil, it will be used instead of face `popup-tip-face'."
   (if (bufferp string)
       (setq string (with-current-buffer string (buffer-string))))
 
@@ -1088,7 +1091,7 @@ PROMPT is a prompt string when reading events during 
event loop."
                           :margin-left margin-left
                           :margin-right margin-right
                           :scroll-bar scroll-bar
-                          :face 'popup-tip-face
+                          :face (or face 'popup-tip-face)
                           :parent parent
                           :parent-offset parent-offset))