summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico Tedin <federicotedin@gmail.com>2018-09-01 18:46:16 -0300
committerNoam Postavsky <npostavs@gmail.com>2018-09-04 18:53:59 -0400
commite3661f8c35b3057c58e8c0b474f597697ce413ba (patch)
treeda631993e103fa6cd4799cd8447051e36d45155b
parentc0f688808eadb670ffa9d442891adb7bb70c4ade (diff)
downloademacs-e3661f8c35b3057c58e8c0b474f597697ce413ba.tar.gz
Add variable vc-git-grep-template
* lisp/vc/vc-git.el (vc-git-grep-template): New variable, allows changing the default arguments passed to git-grep when using 'vc-git-grep'. * etc/NEWS: Mention 'vc-git-grep-template'. (Bug#32549)
-rw-r--r--etc/NEWS4
-rw-r--r--lisp/vc/vc-git.el10
2 files changed, 13 insertions, 1 deletions
diff --git a/etc/NEWS b/etc/NEWS
index f66bcb11383..61b6d4e0e2b 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -277,6 +277,10 @@ still be used if it exists.) Set the variable to nil to get the
previous behavior of always creating a buffer that visits a ChangeLog
file.
+*** New customizable variable 'vc-git-grep-template'.
+This new variable allows customizing the default arguments passed to
+git-grep when 'vc-git-grep' is used.
+
** diff-mode
*** Hunks are now automatically refined by default.
To disable it, set the new defcustom 'diff-font-lock-refine' to nil.
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 96c2f38af42..69d62957026 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -179,6 +179,14 @@ Should be consistent with the Git config value i18n.logOutputEncoding."
:type '(coding-system :tag "Coding system to decode Git log output")
:version "25.1")
+(defcustom vc-git-grep-template "git --no-pager grep -n -e <R> -- <F>"
+ "The default command to run for \\[vc-git-grep].
+The following place holders should be present in the string:
+ <F> - file names and wildcards to search.
+ <R> - the regular expression searched for."
+ :type 'string
+ :version "27.1")
+
;; History of Git commands.
(defvar vc-git-history nil)
@@ -1449,7 +1457,7 @@ This command shares argument histories with \\[rgrep] and \\[grep]."
(setq command nil))
(setq dir (file-name-as-directory (expand-file-name dir)))
(setq command
- (grep-expand-template "git --no-pager grep -n -e <R> -- <F>"
+ (grep-expand-template vc-git-grep-template
regexp files))
(when command
(if (equal current-prefix-arg '(4))