From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#6114: 23.1; grep-read-files does incorrect wildcard match Date: Fri, 21 May 2010 03:28:50 +0300 Organization: JURTA Message-ID: <87pr0qxev1.fsf@mail.jurta.org> References: <741057.58002.qm@web56807.mail.re3.yahoo.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1274403436 8951 80.91.229.12 (21 May 2010 00:57:16 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 21 May 2010 00:57:16 +0000 (UTC) Cc: 6114@debbugs.gnu.org To: S Boucher Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri May 21 02:57:14 2010 connect(): No such file or directory Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OFGY1-0005VO-C9 for geb-bug-gnu-emacs@m.gmane.org; Fri, 21 May 2010 02:57:09 +0200 Original-Received: from localhost ([127.0.0.1]:55209 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OFGY0-0006xG-Ju for geb-bug-gnu-emacs@m.gmane.org; Thu, 20 May 2010 20:57:08 -0400 Original-Received: from [140.186.70.92] (port=39521 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OFGXv-0006wZ-B9 for bug-gnu-emacs@gnu.org; Thu, 20 May 2010 20:57:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OFGXt-00035E-GQ for bug-gnu-emacs@gnu.org; Thu, 20 May 2010 20:57:03 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:42931) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OFGXt-000351-8e for bug-gnu-emacs@gnu.org; Thu, 20 May 2010 20:57:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1OFGQA-0002ST-Fi; Thu, 20 May 2010 20:49:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 21 May 2010 00:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 6114 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 6114-submit@debbugs.gnu.org id=B6114.12744028969432 (code B ref 6114); Fri, 21 May 2010 00:49:02 +0000 Original-Received: (at 6114) by debbugs.gnu.org; 21 May 2010 00:48:16 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OFGPQ-0002S5-0O for submit@debbugs.gnu.org; Thu, 20 May 2010 20:48:16 -0400 Original-Received: from smtp-out1.starman.ee ([85.253.0.3] helo=mx1.starman.ee) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OFGPN-0002Rz-Az for 6114@debbugs.gnu.org; Thu, 20 May 2010 20:48:14 -0400 X-Virus-Scanned: by Amavisd-New at mx1.starman.ee Original-Received: from mail.starman.ee (82.131.33.97.cable.starman.ee [82.131.33.97]) by mx1.starman.ee (Postfix) with ESMTP id B28003F412F; Fri, 21 May 2010 03:48:05 +0300 (EEST) In-Reply-To: <741057.58002.qm@web56807.mail.re3.yahoo.com> (S. Boucher's message of "Wed, 5 May 2010 12:22:23 -0700 (PDT)") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (x86_64-pc-linux-gnu) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Thu, 20 May 2010 20:49:02 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) 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: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:37127 Archived-At: > This bug is for (defun grep-read-files (regexp) in file grep.el. > > In grep-read-files, there's a call to (wildcard-to-regexp (cdr alias)) > with the assumption that (cdr alias) is a single pattern. However, > the variable grep-files-aliases actually can have multiple patterns > for each alias. So, the multi-pattern aliases, such as for "cc", > cannot correctly match: > > (defcustom grep-files-aliases > '(("asm" . "*.[sS]") > ("c" . "*.c") > ("cc" . "*.cc *.cxx *.cpp *.C *.CC *.c++") > ... etc... Does this patch do what you want? (Please note that we have to remove "*" ("all") because it matches everything.) === modified file 'lisp/progmodes/grep.el' --- lisp/progmodes/grep.el 2010-04-20 00:49:46 +0000 +++ lisp/progmodes/grep.el 2010-05-21 00:27:18 +0000 @@ -781,12 +781,17 @@ (defun grep-read-files (regexp) (file-name-nondirectory bn))) (default-alias (and fn - (let ((aliases grep-files-aliases) + (let ((aliases (remove (assoc "all" grep-files-aliases) + grep-files-aliases)) alias) (while aliases (setq alias (car aliases) aliases (cdr aliases)) - (if (string-match (wildcard-to-regexp (cdr alias)) fn) + (if (string-match (mapconcat + 'wildcard-to-regexp + (split-string (cdr alias) nil t) + "\\|") + fn) (setq aliases nil) (setq alias nil))) (cdr alias)))) -- Juri Linkov http://www.jurta.org/emacs/