[nongnu] elpa/popup becfbdd 099/184: Merge pull request #63 from aki2o/fix-deficient-help-delay

[ELPA Syncer]

branch: elpa/popup
commit becfbddf4c6ab342873ac7cd787b19bb26735688
Merge: 58f55de e164f3b
Author: Syohei YOSHIDA <syohex@gmail.com>
Commit: Syohei YOSHIDA <syohex@gmail.com>

    Merge pull request #63 from aki2o/fix-deficient-help-delay
    
    fixed deficient help-delay
---
 popup.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/popup.el b/popup.el
index 7767cb0..43262e8 100644
--- a/popup.el
+++ b/popup.el
@@ -1192,7 +1192,7 @@ PROMPT is a prompt string when reading events during 
event loop."
                           :help-delay help-delay)
            (keyboard-quit))
       (setq key (popup-menu-read-key-sequence keymap prompt help-delay))
-      (setq binding (lookup-key keymap key))
+      (setq binding (and key (lookup-key keymap key)))
       (cond
        ((or (null key) (zerop (length key)))
         (unless (funcall popup-menu-show-quick-help-function menu nil :prompt 
prompt)
@@ -1218,7 +1218,8 @@ PROMPT is a prompt string when reading events during 
event loop."
                                                :margin-right 
(popup-margin-right menu)
                                                :scroll-bar (popup-scroll-bar 
menu)
                                                :parent menu
-                                               :parent-offset index))
+                                               :parent-offset index
+                                               :help-delay help-delay))
                   (and it (cl-return it)))
             (if (eq binding 'popup-select)
                 (cl-return (popup-item-value-or-self item))))))