diff options
| -rw-r--r-- | lisp/init-git.el | 10 | ||||
| -rw-r--r-- | lisp/init-project.el | 6 |
2 files changed, 6 insertions, 10 deletions
diff --git a/lisp/init-git.el b/lisp/init-git.el index 4a5cb08..2c7d935 100644 --- a/lisp/init-git.el +++ b/lisp/init-git.el @@ -60,16 +60,8 @@ ;; limit vc backends as this may speed up some operations, e.g. tramp (setq vc-handled-backends '(Git))) -(defun vc-git-grep-root (&optional dir) - (interactive) - (let ((search-regexp (grep-read-regexp)) - (dir (or dir (vc-git-root default-directory)))) - (vc-git-grep search-regexp "" dir))) - (use-package vc-git - :after grep - :bind (;; C-c g runs git grep in repository - "C-c g" . vc-git-grep-root)) + :after grep) (use-package smerge-mode :init diff --git a/lisp/init-project.el b/lisp/init-project.el index 583bfe2..997bc0a 100644 --- a/lisp/init-project.el +++ b/lisp/init-project.el @@ -1,6 +1,8 @@ (defun project-git-grep () (interactive) - (vc-git-grep-root (project-root (project-current t)))) + (let ((search-regexp (grep-read-regexp)) + (dir (project-root (project-current t)))) + (vc-git-grep search-regexp "" dir))) (use-package project :ensure t @@ -15,6 +17,8 @@ ("C-x f" . project-find-file) ;; C-c p switches project ("C-c p" . project-switch-project) + ;; C-c g runs git grep in project + ("C-c g" . project-git-grep) ;; C-c m compiles project ("C-c m" . project-compile))) |