[nongnu] elpa/helm 011cc63cd2: Fix #2482 (use both grep --include and --exclude args)

[ELPA Syncer]

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

    Fix #2482 (use both grep --include and --exclude args)
---
 helm-grep.el | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/helm-grep.el b/helm-grep.el
index 6fa38df518..d212afe929 100644
--- a/helm-grep.el
+++ b/helm-grep.el
@@ -508,10 +508,13 @@ It is intended to use as a let-bound variable, DON'T set 
this globaly.")
                                            (shell-quote-argument x)))
                                helm-grep-ignored-directories " ")))
          (exclude           (unless (helm-grep-use-ack-p)
-                              (if helm-grep-in-recurse
-                                  (concat (or include ignored-files)
-                                          " " ignored-dirs)
-                                ignored-files)))
+                              (let ((inc     (and include
+                                                  (concat include " ")))
+                                    (igfiles (and ignored-files
+                                                  (concat ignored-files " ")))
+                                    (igdirs  (and helm-grep-in-recurse
+                                                  ignored-dirs)))
+                                (concat inc igfiles igdirs))))
          (types             (and (helm-grep-use-ack-p)
                                  ;; When %e format spec is not specified
                                  ;; in `helm-grep-default-command'