[nongnu] elpa/helm 788e90a4d0 1/2: Handle affixation in CR with helm* styles

[ELPA Syncer]

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

    Handle affixation in CR with helm* styles
---
 helm-mode.el | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/helm-mode.el b/helm-mode.el
index a78bf18c10..2b6c62f662 100644
--- a/helm-mode.el
+++ b/helm-mode.el
@@ -500,10 +500,12 @@ If COLLECTION is an `obarray', a TEST should be needed. 
See `obarray'."
   "Default filter candidate function for `helm-comp-read'."
   (let ((must-match (helm-get-attr 'must-match source))
         (annotation (plist-get completion-extra-properties
-                               :annotation-function)))
-    ;; Annotation is already handled in completion-in-region and in
-    ;; helm-completing-read-default-2 when emacs style is in use.
-    (cl-loop for c in (if (and annotation
+                               :annotation-function))
+        (affixation (plist-get completion-extra-properties
+                               :affixation-function)))
+    ;; Annotation and affixation are already handled in completion-in-region 
and
+    ;; in helm-completing-read-default-2 when emacs style is in use.
+    (cl-loop for c in (if (and (or annotation affixation)
                                (not helm--completing-region)
                                (memq helm-completion-style '(helm helm-fuzzy)))
                           (helm-completion-in-region--initial-filter