Prevent calling helm-minibuffer-history on itself.

* helm-misc.el (helm-source-minibuffer-history):
Use helm-minibuffer-history-map and simplify candidates fn.
(helm-minibuffer-history-map): New use it.

1 files changed, 15 insertions, 7 deletions

diff --git a/helm-misc.el b/helm-misc.el
index e5fa4643..2946bf65 100644
--- a/helm-misc.el
+++ b/helm-misc.el
@@ -200,13 +200,15 @@ It is added to `extended-command-history'.
     :header-name (lambda (name)
                    (format "%s (%s)" name minibuffer-history-variable))
     :candidates
-     (lambda ()
-       (let ((history (cl-loop for i in
-                               (symbol-value minibuffer-history-variable)
-                               unless (string= "" i) collect i)))
-         (if (consp (car history))
-             (mapcar 'prin1-to-string history)
-             history)))
+    (lambda ()
+      (cl-loop for i in
+            (symbol-value minibuffer-history-variable)
+            unless (string= "" i) collect i into history
+            finally return
+            (if (consp (car history))
+                (mapcar 'prin1-to-string history)
+              history)))
+    :keymap helm-minibuffer-history-map
     :migemo t
     :multiline t
     :action (lambda (candidate)
@@ -214,6 +216,12 @@ It is added to `extended-command-history'.
                 (delete-minibuffer-contents)
                 (insert candidate)))))
 
+(defvar helm-minibuffer-history-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map helm-map)
+    (define-key map [remap helm-minibuffer-history] 'undefined)
+    map))
+
 ;;; Shell history
 ;;
 ;;