From 3c01de887661ec597ea4bdf4747db73753442077 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Wed, 10 Apr 2019 20:14:50 -0400
Subject: [PATCH] Fix #1320: generalize SPC *

Was formerly using ripgrep, and only ripgrep.
---
 modules/completion/helm/autoload/helm.el   | 10 ++++++----
 modules/config/default/autoload/default.el |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/completion/helm/autoload/helm.el b/modules/completion/helm/autoload/helm.el
index 04cd60a1b..312820e53 100644
--- a/modules/completion/helm/autoload/helm.el
+++ b/modules/completion/helm/autoload/helm.el
@@ -178,7 +178,7 @@ order.
            return (intern (format format tool))))
 
 ;;;###autoload
-(defun +helm/project-search (&optional arg)
+(defun +helm/project-search (&optional arg query)
   "Performs a project search from the project root.
 
 Uses the first available search backend from `+helm-project-search-engines'. If
@@ -187,10 +187,11 @@ ones, in the search."
   (interactive "P")
   (funcall (or (+helm--get-command "+helm/%s")
                #'+helm/grep)
-           arg))
+           arg
+           query))
 
 ;;;###autoload
-(defun +helm/project-search-from-cwd (&optional arg)
+(defun +helm/project-search-from-cwd (&optional arg query)
   "Performs a project search recursively from the current directory.
 
 Uses the first available search backend from `+helm-project-search-engines'. If
@@ -199,7 +200,8 @@ ones."
   (interactive "P")
   (funcall (or (+helm--get-command "+helm/%s-from-cwd")
                #'+helm/grep-from-cwd)
-           arg))
+           arg
+           query))
 
 
 ;; Relative to project root
diff --git a/modules/config/default/autoload/default.el b/modules/config/default/autoload/default.el
index d6a8a394b..f98f7ff7d 100644
--- a/modules/config/default/autoload/default.el
+++ b/modules/config/default/autoload/default.el
@@ -265,7 +265,7 @@ If prefix ARG is set, prompt for a known project to search from."
                 (user-error "There are no known projects"))
             default-directory)))
     (cond ((featurep! :completion ivy)
-           (+ivy/rg nil (rxt-quote-pcre symbol)))
+           (+ivy/project-search nil (rxt-quote-pcre symbol)))
           ((featurep! :completion helm)
-           (+helm/rg nil (rxt-quote-pcre symbol)))
+           (+helm/project-search nil (rxt-quote-pcre symbol)))
           ((rgrep (regexp-quote symbol))))))