summaryrefslogtreecommitdiff
path: root/helm.el
diff options
context:
space:
mode:
authorThierry Volpiatto <thierry.volpiatto@gmail.com>2015-08-25 07:09:56 +0200
committerThierry Volpiatto <thierry.volpiatto@gmail.com>2015-08-25 07:09:56 +0200
commit7d16e9274373cac0109fd06c8ab02956d81365d8 (patch)
tree8a2e4134b0984cc9da2dbd7d7fbe4bdff8e3cd1c /helm.el
parente8835ee0ed07a7b4d86a5544099190f91c379f8b (diff)
Fix helm-imenu preselection and default and exec at once for delayed sources.
* helm-imenu.el (helm-imenu): Remove default, use unconditionally a preselection. * helm.el (helm-execute-action-at-once-if-one): Fix docstring. (helm-exit-or-quit-maybe): Allow a function for helm-execute-action-at-once-if-one.
Diffstat (limited to 'helm.el')
-rw-r--r--helm.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/helm.el b/helm.el
index b60dba20..fd105a8a 100644
--- a/helm.el
+++ b/helm.el
@@ -729,7 +729,7 @@ and before performing action.")
(defvar helm-execute-action-at-once-if-one nil
"Execute default action and exit when only one candidate is remaining.
-It can be also a function returning a boolean value.")
+It can be also a function called with no args returning a boolean value.")
(defvar helm-quit-if-no-candidate nil
"Quit when there is no candidates when non--nil.
@@ -2517,7 +2517,9 @@ For ANY-PRESELECT ANY-RESUME ANY-KEYMAP ANY-DEFAULT ANY-HISTORY, See `helm'."
This function is handling `helm-execute-action-at-once-if-one' and
`helm-quit-if-no-candidate' in delayed sources."
(with-helm-window
- (cond ((and helm-execute-action-at-once-if-one
+ (cond ((and (if (functionp helm-execute-action-at-once-if-one)
+ (funcall helm-execute-action-at-once-if-one)
+ helm-execute-action-at-once-if-one)
(= (helm-get-candidate-number) 1))
(helm-exit-minibuffer))
((and helm-quit-if-no-candidate