branch: elpa/projectile
commit 2982cd96113eb23f36fae59382535f4c5491ebb8
Author: Bozhidar Batsov <[email protected]>
Commit: Bozhidar Batsov <[email protected]>
Remove unnecessary fboundp guard and declare-function
- Remove (fboundp 'vc-git-grep) check since (require 'vc-git) is
called right before it, making the function always available.
- Remove (declare-function string-trim "subr-x") since string-trim
is unconditionally available via compat 30.
---
projectile.el | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/projectile.el b/projectile.el
index c40b75b74f..49f33558e3 100644
--- a/projectile.el
+++ b/projectile.el
@@ -73,7 +73,6 @@
(declare-function eshell-search-path "esh-ext")
(declare-function vc-dir "vc-dir")
(declare-function vc-dir-busy "vc-dir")
-(declare-function string-trim "subr-x")
(declare-function tramp-archive-file-name-p "tramp-archive")
(declare-function tramp-archive-file-name-archive "tramp-archive")
(declare-function helm-grep-get-file-extensions "helm-grep")
@@ -4462,8 +4461,7 @@ With REGEXP given, don't query the user for a regexp."
(require 'vc-git) ;; for `vc-git-grep'
;; in git projects users have the option to use `vc-git-grep' instead of
`rgrep'
(if (and (eq (projectile-project-vcs) 'git)
- projectile-use-git-grep
- (fboundp 'vc-git-grep))
+ projectile-use-git-grep)
(vc-git-grep search-regexp (or files "") root-dir)
;; paths for find-grep should relative and without trailing /
(let ((grep-find-ignored-files