[nongnu] elpa/helm fdcdc9ffb3 2/4: Keep fixing helm-pattern at init

[ELPA Syncer]

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

    Keep fixing helm-pattern at init
---
 helm-core.el | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/helm-core.el b/helm-core.el
index 45c91ae0ed..6d1b10e225 100644
--- a/helm-core.el
+++ b/helm-core.el
@@ -3701,18 +3701,19 @@ For RESUME INPUT DEFAULT and SOURCES see `helm'."
   ;; See bug#2530 and https://github.com/emacs-helm/helm-mu/issues/54.
   ;; Input should have precedence on default.
   (cond (input
-         (setq helm-input input
+         (setq helm-input   input
                helm-pattern input))
-        (default
-         (setq helm-pattern (or (and helm-maybe-use-default-as-input
-                                     (or (if (listp default)
-                                             (car default) default)
-                                         (with-helm-current-buffer
-                                           (thing-at-point 'symbol))))
-                                "")
-               ;; Even if there is default in helm-pattern we want the
+        ((and default helm-maybe-use-default-as-input)
+         (setq helm-pattern (if (listp default)
+                                (car default)
+                              default)
+               ;; Even if helm-pattern is set we want the
                ;; prompt to be empty when using default as input, why
                ;; helm-input is initialized to "".
+               helm-input ""))
+        (helm-maybe-use-default-as-input
+         (setq helm-pattern (with-helm-current-buffer
+                              (thing-at-point 'symbol))
                helm-input "")))
   (helm--fuzzy-match-maybe-set-pattern)
   ;; Call the init function for sources where appropriate