[debbugs-tracker] bug#34621: closed ([PATCH] lisp/progmodes/grep.el (grep-read-files): Add file-directory-p check)

[GNU bug Tracking System]

Your message dated Thu, 11 Apr 2019 23:51:46 +0300
with message-id <address@hidden>
and subject line Re: bug#34621: [PATCH] Fix rgrep in dired taking default 
search file pattern from directory name (e.g. *.11 for django-1.11)
has caused the debbugs.gnu.org bug report #34621,
regarding [PATCH] lisp/progmodes/grep.el (grep-read-files): Add 
file-directory-p check
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden)


-- 
34621: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=34621
GNU Bug Tracking System
Contact address@hidden with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] lisp/progmodes/grep.el (grep-read-files): Add file-directory-p check
>
>
>
>
> Date: 
>
> Fri, 22 Feb 2019 17:29:10 +0000
>
>
>
>
> User-agent: 
>
> Roundcube Webmail/1.1.2
>
>
>
>
> Hello,
>
> This patch fixes a bug in the rgrep command which causes certain
> directory names to be mistaken for files with extensions. For example,
> when running rgrep in a directory called "django-1.11", rgrep will
> prompt with 'Search for "x" in files (default *.11):', under the
> assumption that .11 is a file extension. Similarly, creating a
> directory called "test.c" and running rgrep inside it results in the
> prompt 'Search for "x" in files (default *.[ch])'. With this patch,
> the default file extension for directories is either taken from the
> rgrep history or set to "all".
>
> Changelog entry:
> * lisp/progmodes/grep.el (grep-read-files): Add file-directory-p check
>
> Patch:
>
> diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
> index 3fd2a7e701..fe0fb5b30c 100644
> --- a/lisp/progmodes/grep.el
> +++ b/lisp/progmodes/grep.el
> @@ -963,6 +963,7 @@ grep-read-files
>                   (file-name-nondirectory bn)))
>          (default-alias
>            (and fn
> +               (not (file-directory-p (concat "../" fn)))
>                 (let ((aliases (remove (assoc "all" grep-files-aliases)
>                                        grep-files-aliases))
>                       alias)
> @@ -979,6 +980,7 @@ grep-read-files
>                   (cdr alias))))
>          (default-extension
>            (and fn
> +               (not (file-directory-p (concat "../" fn)))
>                 (let ((ext (file-name-extension fn)))
>                   (and ext (concat "*." ext)))))
>          (default
>
> Regards,
> Christopher Thorne
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: bug#34621: [PATCH] Fix rgrep in dired taking default search file pattern from directory name (e.g. *.11 for django-1.11)
>
>
>
>
> Date: 
>
> Thu, 11 Apr 2019 23:51:46 +0300
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (x86_64-pc-linux-gnu)
>
>
>
>
> > Patch attached.
>
> Your patch is pushed to master, thanks.
>
>
> --- End Message ---