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 Update Date: Tue, 05 Mar 2019 10:49:18 +0000 Organization: Reckon Digital Message-ID: References: <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="122245"; 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 Tue Mar 05 11:50:11 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 1h17eF-000Viu-KV for geb-bug-gnu-emacs@m.gmane.org; Tue, 05 Mar 2019 11:50:11 +0100 Original-Received: from localhost ([127.0.0.1]:41111 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h17eE-0008Sa-DX for geb-bug-gnu-emacs@m.gmane.org; Tue, 05 Mar 2019 05:50:10 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:58041) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h17e6-0008SV-Jg for bug-gnu-emacs@gnu.org; Tue, 05 Mar 2019 05:50:03 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h17e5-0007Kf-Vo for bug-gnu-emacs@gnu.org; Tue, 05 Mar 2019 05:50:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:47060) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h17e5-0007KP-Qj for bug-gnu-emacs@gnu.org; Tue, 05 Mar 2019 05:50:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1h17e5-0005Gs-JE for bug-gnu-emacs@gnu.org; Tue, 05 Mar 2019 05:50:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Christopher Thorne Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 05 Mar 2019 10:50:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34621 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 34621-submit@debbugs.gnu.org id=B34621.155178296520208 (code B ref 34621); Tue, 05 Mar 2019 10:50:01 +0000 Original-Received: (at 34621) by debbugs.gnu.org; 5 Mar 2019 10:49:25 +0000 Original-Received: from localhost ([127.0.0.1]:60604 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h17dU-0005Fr-Ow for submit@debbugs.gnu.org; Tue, 05 Mar 2019 05:49:25 -0500 Original-Received: from relay1-d.mail.gandi.net ([217.70.183.193]:39511) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h17dS-0005Fg-4k for 34621@debbugs.gnu.org; Tue, 05 Mar 2019 05:49:23 -0500 Original-Received: from webmail.gandi.net (webmail4.sd4.0x35.net [10.200.201.4]) (Authenticated sender: c.thorne@reckondigital.com) by relay1-d.mail.gandi.net (Postfix) with ESMTPA id 0499F24001A; Tue, 5 Mar 2019 10:49:18 +0000 (UTC) In-Reply-To: X-Sender: c.thorne@reckondigital.com 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:156053 Archived-At: Thanks Drew, I agree derived-mode-p is better. The reason for special casing dired is to stop rgrep taking extension suggestions from dired buffers, e.g. suggesting "*.11" as the rgrep file pattern in a dired buffer called "django-1.11". Here is the same fix but using derived-mode-p: diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index 3fd2a7e701..83154872aa 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 (derived-mode-p 'dired-mode)) (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 (derived-mode-p 'dired-mode)) (let ((ext (file-name-extension fn))) (and ext (concat "*." ext))))) (default Changelog entry: * lisp/progmodes/grep.el (grep-read-files): Disable default extension in dired buffers On 2019-03-04 15:26, Drew Adams wrote: >> + (not (eq major-mode 'dired-mode)) >> + (not (eq major-mode 'dired-mode)) > > I haven't followed this thread at all - dunno > what the problem is that you're trying to solve. > But I'm a bit surprised that Dired needs to be > special-cased for grep in any way. > > Anyway, the reasom I'm writing is to suggest > that you probably don't want > (eq major-mode 'dired-mode). You probably > want (derived-mode-p 'dired-mode).