[nongnu] elpa/helm 2910b6798b 2/3: Handle cons cells in FCT for helm-completing-read-default-1 (#2606)

[ELPA Syncer]

branch: elpa/helm
commit 2910b6798b090cbb4c79825f5d6b1f61dc8c5aec
Author: Thierry Volpiatto <thievol@posteo.net>
Commit: Thierry Volpiatto <thievol@posteo.net>

    Handle cons cells in FCT for helm-completing-read-default-1 (#2606)
    
    As well check associations with a leading space to avoid dups with the
    unknown candidate.
---
 helm-mode.el | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/helm-mode.el b/helm-mode.el
index 17626a4427..b1bd09ae33 100644
--- a/helm-mode.el
+++ b/helm-mode.el
@@ -494,6 +494,7 @@ If COLLECTION is an `obarray', a TEST should be needed. See 
`obarray'."
 
 (cl-defun helm-cr--pattern-in-candidates-p (candidates &optional (pattern 
helm-pattern))
   (or (assoc pattern candidates)
+      (assoc (concat " " pattern) candidates)
       (assq (intern pattern) candidates)
       (member pattern candidates)
       (member (downcase pattern) candidates)
@@ -995,11 +996,11 @@ dynamically otherwise see 
`helm-completing-read-default-2'."
                                     (eq require-match
                                         'confirm-after-completion)))
                            1 0)
-     :fc-transformer (append '(helm-cr-default-transformer)
-                             (and (or afun afix)
+     :fc-transformer (append (and (or afun afix)
                                   (list (lambda (candidates _source)
                                           
(helm-completion-in-region--initial-filter
-                                           candidates afun afix 
file-comp-p))))) 
+                                           candidates afun afix file-comp-p))))
+                             '(helm-cr-default-transformer))
      :quit-when-no-cand (eq require-match t)
      :nomark (null helm-comp-read-use-marked)
      :candidates-in-buffer cands-in-buffer