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] Fix rgrep in dired taking default search file pattern from directory name (e.g. *.11 for django-1.11) Date: Wed, 10 Apr 2019 11:42:50 +0100 Organization: Reckon Digital Message-ID: References: <08e7108149ce2374fd0c9b7fc3e6ae38@reckondigital.com> <40839b67-bce7-4a01-89f1-c14643b18b32@default> <80f4335be923e21fe782780c6812a03f@reckondigital.com> <878sxd248k.fsf@mail.linkov.net> <82347809b60dfc4e18a822d2d604475c@reckondigital.com> <87mul0wacr.fsf@mail.linkov.net> <336a681ce53ad7623fc5f98936577d82@reckondigital.com> <8736mq6gwe.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=_0471af0addbfa507e55e1e5ded930763" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="160967"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Roundcube Webmail/1.3.8 Cc: Juri Linkov To: 34621@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Apr 10 12:43:13 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 1hEAhD-000fih-Ce for geb-bug-gnu-emacs@m.gmane.org; Wed, 10 Apr 2019 12:43:11 +0200 Original-Received: from localhost ([127.0.0.1]:57285 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEAhC-00071w-D2 for geb-bug-gnu-emacs@m.gmane.org; Wed, 10 Apr 2019 06:43:10 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:52947) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEAh5-00071p-Vx for bug-gnu-emacs@gnu.org; Wed, 10 Apr 2019 06:43:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEAh4-0003X3-Rc for bug-gnu-emacs@gnu.org; Wed, 10 Apr 2019 06:43:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:38860) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hEAh4-0003Wh-D7 for bug-gnu-emacs@gnu.org; Wed, 10 Apr 2019 06:43:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hEAh4-0006Ts-99 for bug-gnu-emacs@gnu.org; Wed, 10 Apr 2019 06:43:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Christopher Thorne Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 10 Apr 2019 10:43:02 +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.155489297524900 (code B ref 34621); Wed, 10 Apr 2019 10:43:02 +0000 Original-Received: (at 34621) by debbugs.gnu.org; 10 Apr 2019 10:42:55 +0000 Original-Received: from localhost ([127.0.0.1]:52404 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hEAgw-0006TY-Vt for submit@debbugs.gnu.org; Wed, 10 Apr 2019 06:42:55 -0400 Original-Received: from relay6-d.mail.gandi.net ([217.70.183.198]:39441) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hEAgu-0006TP-RT for 34621@debbugs.gnu.org; Wed, 10 Apr 2019 06:42:53 -0400 Original-Received: from webmail.gandi.net (webmail18.sd4.0x35.net [10.200.201.18]) (Authenticated sender: c.thorne@reckondigital.com) by relay6-d.mail.gandi.net (Postfix) with ESMTPA id 92E32C0004; Wed, 10 Apr 2019 10:42:50 +0000 (UTC) In-Reply-To: <8736mq6gwe.fsf@mail.linkov.net> 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:157457 Archived-At: --=_0471af0addbfa507e55e1e5ded930763 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed > This is an overwhelmingly long name, please use the same name as > the function that uses this feature, i.e. just 'grep-read-files'. > Then when someone reading dired.el will find a line > > (put 'dired-mode 'grep-read-files 'dired-grep-read-files) > > it will be clear for them the purpose of this feature. Good point, I've changed it to grep-read-files. > Please place this change in dired.el after the definition of > 'dired-file-name-at-point' that you can use in your dired function > instead of (run-hook-with-args-until-success > 'file-name-at-point-functions) Thanks, also done this. > If you want you could also add as a 4th option additionally > (run-hook-with-args-until-success 'file-name-at-point-functions) > to automatically support modes other than dired, i.e. other modes > that set file-name-at-point-functions. Sounds like a sensible default, added this as well. Patch attached. --=_0471af0addbfa507e55e1e5ded930763 Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name=0001-Fix-rgrep-in-dired-using-directory-for-search-file-p.patch Content-Disposition: attachment; filename=0001-Fix-rgrep-in-dired-using-directory-for-search-file-p.patch; size=2470 RnJvbSBiYmY1ODRlMGM1ZjgzNmM1NTU3OWI5ODA0ZTA5MWM3MzZiY2Y3YTIzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDaHJpc3RvcGhlciBUaG9ybmUgPGMudGhvcm5lQHJlY2tvbmRp Z2l0YWwuY29tPgpEYXRlOiBUdWUsIDkgQXByIDIwMTkgMTM6MTI6MzkgKzAxMDAKU3ViamVjdDog W1BBVENIXSBGaXggcmdyZXAgaW4gZGlyZWQgdXNpbmcgZGlyZWN0b3J5IGZvciBzZWFyY2ggZmls ZSBwYXR0ZXJuCgoqIGxpc3AvcHJvZ21vZGVzL2dyZXAuZWwgKGdyZXAtcmVhZC1maWxlcyk6IEFs bG93IG1ham9yIG1vZGVzIHRvCmRlZmluZSBmaWxlIG5hbWUgdG8gdXNlIGZvciBkZWZhdWx0IHNl YXJjaCBwYXR0ZXJuLgoqIGxpc3AvcHJvZ21vZGVzL2dyZXAuZWwgKGdyZXAtcmVhZC1maWxlcyk6 IEFkZCBub24tZGlyZWN0b3J5IGZpbGUgYXQKcG9pbnQgYXMgZGVmYXVsdCBzZWFyY2ggcGF0dGVy biBjYW5kaWRhdGUuCiogbGlzcC9kaXJlZC5lbCAoZGlyZWQtZ3JlcC1yZWFkLWZpbGVzKTogVXNl IG5vbi1kaXJlY3RvcnkgZmlsZSBhdApwb2ludCBmb3IgZ3JlcCBmaWxlIG5hbWUgcGF0dGVybi4g IChCdWcjMzQ2MjEpCi0tLQogbGlzcC9kaXJlZC5lbCAgICAgICAgICB8ICA5ICsrKysrKysrKwog bGlzcC9wcm9nbW9kZXMvZ3JlcC5lbCB8IDEyICsrKysrKysrKystLQogMiBmaWxlcyBjaGFuZ2Vk LCAxOSBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpc3AvZGly ZWQuZWwgYi9saXNwL2RpcmVkLmVsCmluZGV4IGZjMGI3MTIzOGIuLjYzZDI4ODM1YWEgMTAwNjQ0 Ci0tLSBhL2xpc3AvZGlyZWQuZWwKKysrIGIvbGlzcC9kaXJlZC5lbApAQCAtNzc0LDYgKzc3NCwx NSBAQCBkaXJlZC1maWxlLW5hbWUtYXQtcG9pbnQKIAkgIChmaWxlLW5hbWUtYXMtZGlyZWN0b3J5 IChhYmJyZXZpYXRlLWZpbGUtbmFtZSBmaWxlbmFtZSkpCiAJKGFiYnJldmlhdGUtZmlsZS1uYW1l IGZpbGVuYW1lKSkpKSkKIAorKGRlZnVuIGRpcmVkLWdyZXAtcmVhZC1maWxlcyAoKQorICAiVXNl IGZpbGUgYXQgcG9pbnQgYXMgdGhlIGZpbGUgZm9yIGdyZXAncyBkZWZhdWx0IGZpbGUtbmFtZSBw YXR0ZXJuIHN1Z2dlc3Rpb24uCitJZiBhIGRpcmVjdG9yeSBvciBub3RoaW5nIGlzIGZvdW5kIGF0 IHBvaW50LCByZXR1cm4gbmlsLiIKKyAgKGxldCAoKGZpbGUtbmFtZSAoZGlyZWQtZmlsZS1uYW1l LWF0LXBvaW50KSkpCisgICAgKGlmIChhbmQgZmlsZS1uYW1lCisJICAgICAobm90IChmaWxlLWRp cmVjdG9yeS1wIGZpbGUtbmFtZSkpKQorCWZpbGUtbmFtZSkpKQorKHB1dCAnZGlyZWQtbW9kZSAn Z3JlcC1yZWFkLWZpbGVzICdkaXJlZC1ncmVwLXJlYWQtZmlsZXMpCisKIDs7OyMjI2F1dG9sb2Fk IChkZWZpbmUta2V5IGN0bC14LW1hcCAiZCIgJ2RpcmVkKQogOzs7IyMjYXV0b2xvYWQKIChkZWZ1 biBkaXJlZCAoZGlybmFtZSAmb3B0aW9uYWwgc3dpdGNoZXMpCmRpZmYgLS1naXQgYS9saXNwL3By b2dtb2Rlcy9ncmVwLmVsIGIvbGlzcC9wcm9nbW9kZXMvZ3JlcC5lbAppbmRleCBjMGY0NzE1OWM5 Li44YzdhNThmZDhiIDEwMDY0NAotLS0gYS9saXNwL3Byb2dtb2Rlcy9ncmVwLmVsCisrKyBiL2xp c3AvcHJvZ21vZGVzL2dyZXAuZWwKQEAgLTk1OSw4ICs5NTksMTYgQEAgZ3JlcC1yZWFkLWZpbGVz CiBUaGUgcGF0dGVybiBjYW4gaW5jbHVkZSBzaGVsbCB3aWxkY2FyZHMuICBBcyB3aGl0ZXNwYWNl IHRyaWdnZXJzCiBjb21wbGV0aW9uIHdoZW4gZW50ZXJpbmcgYSBwYXR0ZXJuLCBpbmNsdWRpbmcg aXQgcmVxdWlyZXMKIHF1b3RpbmcsIGUuZy4gYFxcW3F1b3RlZC1pbnNlcnRdPHNwYWNlPicuIgot ICAobGV0KiAoKGJuIChvciAoYnVmZmVyLWZpbGUtbmFtZSkKLQkJIChyZXBsYWNlLXJlZ2V4cC1p bi1zdHJpbmcgIjxbMC05XSs+XFwnIiAiIiAoYnVmZmVyLW5hbWUpKSkpCisgIChsZXQqICgoZ3Jl cC1yZWFkLWZpbGVzLWZ1bmN0aW9uIChnZXQgbWFqb3ItbW9kZSAnZ3JlcC1yZWFkLWZpbGVzKSkK KwkgKGZpbGUtbmFtZS1hdC1wb2ludAorCSAgIChydW4taG9vay13aXRoLWFyZ3MtdW50aWwtc3Vj Y2VzcyAnZmlsZS1uYW1lLWF0LXBvaW50LWZ1bmN0aW9ucykpCisJIChibiAoaWYgZ3JlcC1yZWFk LWZpbGVzLWZ1bmN0aW9uCisJCSAoZnVuY2FsbCBncmVwLXJlYWQtZmlsZXMtZnVuY3Rpb24pCisJ ICAgICAgIChvciAoaWYgKGFuZCAoc3RyaW5ncCBmaWxlLW5hbWUtYXQtcG9pbnQpCisJCQkgICAg KG5vdCAoZmlsZS1kaXJlY3RvcnktcCBmaWxlLW5hbWUtYXQtcG9pbnQpKSkKKwkJICAgICAgIGZp bGUtbmFtZS1hdC1wb2ludCkKKwkJICAgKGJ1ZmZlci1maWxlLW5hbWUpCisJCSAgIChyZXBsYWNl LXJlZ2V4cC1pbi1zdHJpbmcgIjxbMC05XSs+XFwnIiAiIiAoYnVmZmVyLW5hbWUpKSkpKQogCSAo Zm4gKGFuZCBibgogCQkgIChzdHJpbmdwIGJuKQogCQkgIChmaWxlLW5hbWUtbm9uZGlyZWN0b3J5 IGJuKSkpCi0tIAoyLjExLjAKCg== --=_0471af0addbfa507e55e1e5ded930763--