branch: elpa/helm
commit 896ee07180d973874f4521c58dcc2dc8fbca83cf
Author: Thierry Volpiatto <thie...@posteo.net>
Commit: Thierry Volpiatto <thie...@posteo.net>
Fix require-match in completion-in-region
Use cond otherwise a nil value for require-match is never returned.
---
helm-mode.el | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/helm-mode.el b/helm-mode.el
index 4c096493cd..b6ae49fc8a 100644
--- a/helm-mode.el
+++ b/helm-mode.el
@@ -2576,13 +2576,13 @@ Can be used for `completion-in-region-function' by
advicing it with an
(crm (eq current-command 'crm-complete))
(str-command (helm-symbol-name current-command))
(buf-name (format "*helm-mode-%s*" str-command))
- (require-match (or (and (boundp 'require-match) require-match)
- minibuffer-completion-confirm
- ;; If prompt have not been propagated
here, that's
- ;; probably mean we have no prompt and we
are in
- ;; completion-at-point or friend, so use a
non--nil
- ;; value for require-match.
- (not (boundp 'prompt))))
+ (require-match (cond ((boundp 'require-match) require-match)
+ (minibuffer-completion-confirm)
+ ;; If prompt have not been propagated
here, that's
+ ;; probably mean we have no prompt and
we are in
+ ;; completion-at-point or friend, so use
a non--nil
+ ;; value for require-match.
+ ((not (boundp 'prompt)))))
(metadata (completion-metadata input collection predicate))
;; `completion-extra-properties' is let-bounded in
`completion-at-point'.
;; `afun' is a closure to call against each string in `data'.
