From b72764c6eae883701a7768cab8aeb24b2090cbbe Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 2 Jun 2018 20:31:50 +0200 Subject: [PATCH] fixup! Refactor ivy project-search functionality --- modules/completion/ivy/autoload/evil.el | 16 ++++++++-------- modules/completion/ivy/autoload/ivy.el | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/completion/ivy/autoload/evil.el b/modules/completion/ivy/autoload/evil.el index b60b28d31..0f408044b 100644 --- a/modules/completion/ivy/autoload/evil.el +++ b/modules/completion/ivy/autoload/evil.el @@ -42,26 +42,26 @@ ;;;###autoload (autoload '+ivy:pt-from-cwd "completion/ivy/autoload/evil" nil t) -(evil-define-command +ivy:pt-from-cwd (query &optional bang) +(evil-define-command +ivy:pt-from-cwd (query &optional recurse-p) "Ex interface for `+ivy/pt-from-cwd'." (interactive "") - (+ivy/pt-from-cwd (not bang) query)) + (+ivy/pt-from-cwd (not recurse-p) query)) ;;;###autoload (autoload '+ivy:grep-from-cwd "completion/ivy/autoload/evil" nil t) -(evil-define-command +ivy:grep-from-cwd (query &optional bang) +(evil-define-command +ivy:grep-from-cwd (query &optional recurse-p) "Ex interface for `+ivy/grep-from-cwd'." (interactive "") - (+ivy/grep-from-cwd (not bang) query)) + (+ivy/grep-from-cwd (not recurse-p) query)) ;;;###autoload (autoload '+ivy:ag-from-cwd "completion/ivy/autoload/evil" nil t) -(evil-define-command +ivy:ag-from-cwd (query &optional bang) +(evil-define-command +ivy:ag-from-cwd (query &optional recurse-p) "Ex interface for `+ivy/ag-from-cwd'." (interactive "") - (+ivy/ag-from-cwd (not bang) query)) + (+ivy/ag-from-cwd (not recurse-p) query)) ;;;###autoload (autoload '+ivy:rg-from-cwd "completion/ivy/autoload/evil" nil t) -(evil-define-command +ivy:rg-from-cwd (query &optional bang) +(evil-define-command +ivy:rg-from-cwd (query &optional recurse-p) "Ex interface for `+ivy/rg-from-cwd'." (interactive "") - (+ivy/rg-from-cwd (not bang) query)) + (+ivy/rg-from-cwd (not recurse-p) query)) diff --git a/modules/completion/ivy/autoload/ivy.el b/modules/completion/ivy/autoload/ivy.el index a35c7df04..187b66956 100644 --- a/modules/completion/ivy/autoload/ivy.el +++ b/modules/completion/ivy/autoload/ivy.el @@ -237,7 +237,7 @@ search current file. See `+ivy-task-tags' to customize what this searches for." (symbol-function '+ivy*counsel-git-grep-function))) (pcase engine ('grep - (let ((args (if recursive " -r")) + (let ((args (if recursive " -R")) (counsel-projectile-grep-initial-input query)) (if all-files (cl-letf (((symbol-function #'projectile-ignored-directories-rel)