GNU bug report logs - #35326
26.1; vc-git-grep should pass -i like isearch

Previous Next

Full log

View this message in rfc822 format

From: Juri Linkov <juri <at> linkov.net>
To: Lars Ingebrigtsen <larsi <at> gnus.org>
Cc: Antoine Beaupré <anarcat <at> orangeseeds.org>, 35326 <at> debbugs.gnu.org
Subject: bug#35326: 26.1; vc-git-grep should pass -i like isearch
Date: Mon, 24 Jun 2019 23:45:51 +0300

[Message part 1 (text/plain, inline)]

>> grep-expand-template adds the option -i on this condition:
>>
>>   (and case-fold-search (isearch-no-upper-case-p regexp t))
>>
>> It's very like when isearch turns into case-insensitive search
>> when the search string contains no upper-case letters.
>
> Yeah, sure, but no confusion here was why `M-x lgrep' adds the -i and
> `M-x grep' does not?  (running from -Q.)

The confusion was caused by the original report mentioning `M-x grep'.
In fact, `M-x grep' doesn't expand the template.  Only the following
commands expand the template:

  lgrep
  rgrep
  vc-git-grep

> And should the vc-git version be more like grep or lgrep?

vc-git-grep should be like other commands that expand the template,
i.e. lgrep and rgrep, that the patch in the original report
correctly achieves, so committing it would be an improvement
since `git grep' supports most of grep options, including --color,
-i and -w.

PS: Regarding -w that I proposed previously, I could create
a separate request, but here is a preliminary version:

[wrgrep.patch (text/x-diff, inline)]

diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 67222f7862..d76ee3c90c 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -948,10 +948,14 @@ grep-expand-keywords
 If car of an element matches, the cdr is evalled in to get the
 substitution string.  Note dynamic scoping of variables.")
 
+(defvar grep-word-search nil)
+
 (defun grep-expand-template (template &optional regexp files dir excl)
   "Patch grep COMMAND string replacing <C>, <D>, <F>, <R>, and <X>."
   (let* ((command template)
          (env `((opts . ,(let (opts)
+                           (when grep-word-search
+                             (push "-w" opts))
                            (when (and case-fold-search
                                       (isearch-no-upper-case-p regexp t))
                              (push "-i" opts))
@@ -1248,6 +1252,14 @@ grep-find-toggle-abbreviation
             (add-text-properties beg end grep-find-abbreviate-properties))
         (user-error "No abbreviated part to hide/show")))))
 
+;;;###autoload
+(defun wrgrep ()
+  "Word-based version of `rgrep'.
+Modifies the grep-find template to add the option `-w' that matches whole words."
+  (interactive)
+  (let ((grep-word-search t))
+    (call-interactively 'rgrep)))
+
 ;;;###autoload
 (defun zrgrep (regexp &optional files dir confirm template)
   "Recursively grep for REGEXP in gzipped FILES in tree rooted at DIR.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.