From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Christopher Thorne Newsgroups: gmane.emacs.bugs Subject: bug#34621: [PATCH] lisp/progmodes/grep.el (grep-read-files): Add file-directory-p check Date: Fri, 22 Feb 2019 17:29:10 +0000 Organization: Reckon Digital Message-ID: <08e7108149ce2374fd0c9b7fc3e6ae38@reckondigital.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="153644"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Roundcube Webmail/1.1.2 To: 34621@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Feb 22 22:16:19 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1gxIB8-000dq3-RX for geb-bug-gnu-emacs@m.gmane.org; Fri, 22 Feb 2019 22:16:18 +0100 Original-Received: from localhost ([127.0.0.1]:57022 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxIB7-0001yH-Mb for geb-bug-gnu-emacs@m.gmane.org; Fri, 22 Feb 2019 16:16:17 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:47053) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxIAz-0001vt-FI for bug-gnu-emacs@gnu.org; Fri, 22 Feb 2019 16:16:10 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gxIAw-0005dp-Ie for bug-gnu-emacs@gnu.org; Fri, 22 Feb 2019 16:16:08 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:35058) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gxIAt-0005Zr-Pb for bug-gnu-emacs@gnu.org; Fri, 22 Feb 2019 16:16:04 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gxIAt-0007DC-FC for bug-gnu-emacs@gnu.org; Fri, 22 Feb 2019 16:16:03 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Christopher Thorne Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 22 Feb 2019 21:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 34621 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.155087011027644 (code B ref -1); Fri, 22 Feb 2019 21:16:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 22 Feb 2019 21:15:10 +0000 Original-Received: from localhost ([127.0.0.1]:48602 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gxIA1-0007Bm-VH for submit@debbugs.gnu.org; Fri, 22 Feb 2019 16:15:10 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:58553) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gxEdb-0001qb-Ph for submit@debbugs.gnu.org; Fri, 22 Feb 2019 12:29:28 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:33799) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gxEdU-0004eT-AW for submit@debbugs.gnu.org; Fri, 22 Feb 2019 12:29:20 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:44681) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxEdT-0004PJ-C6 for bug-gnu-emacs@gnu.org; Fri, 22 Feb 2019 12:29:20 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gxEdR-0004aE-Mt for bug-gnu-emacs@gnu.org; Fri, 22 Feb 2019 12:29:18 -0500 Original-Received: from relay4-d.mail.gandi.net ([217.70.183.196]:50385) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gxEdR-0004RI-F6 for bug-gnu-emacs@gnu.org; Fri, 22 Feb 2019 12:29:17 -0500 Original-Received: from webmail.gandi.net (webmail8.sd4.0x35.net [10.200.201.8]) (Authenticated sender: c.thorne@reckondigital.com) by relay4-d.mail.gandi.net (Postfix) with ESMTPA id 988A5E0011 for ; Fri, 22 Feb 2019 17:29:10 +0000 (UTC) X-Sender: c.thorne@reckondigital.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Mailman-Approved-At: Fri, 22 Feb 2019 16:15:09 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:155657 Archived-At: 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