GNU bug report logs - #34621
[PATCH] lisp/progmodes/grep.el (grep-read-files): Add file-directory-p check

Previous Next

Full log

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Christopher Thorne <c.thorne <at> reckondigital.com>
To: bug-gnu-emacs <at> gnu.org
Subject: [PATCH] lisp/progmodes/grep.el (grep-read-files): Add
 file-directory-p check
Date: Fri, 22 Feb 2019 17:29:10 +0000

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

Previous Next

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