From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Allen Li Newsgroups: gmane.emacs.bugs Subject: bug#28615: [PATCH] Clarify what grep-read-files wants Date: Wed, 4 Oct 2017 21:15:32 -0700 Message-ID: References: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" X-Trace: blaine.gmane.org 1507176975 11753 195.159.176.226 (5 Oct 2017 04:16:15 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 5 Oct 2017 04:16:15 +0000 (UTC) To: 28615@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Oct 05 06:16:11 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dzxZy-0001rZ-H8 for geb-bug-gnu-emacs@m.gmane.org; Thu, 05 Oct 2017 06:16:10 +0200 Original-Received: from localhost ([::1]:37709 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dzxZz-0003sM-IQ for geb-bug-gnu-emacs@m.gmane.org; Thu, 05 Oct 2017 00:16:11 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47182) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dzxZt-0003s5-E1 for bug-gnu-emacs@gnu.org; Thu, 05 Oct 2017 00:16:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dzxZq-00016i-8s for bug-gnu-emacs@gnu.org; Thu, 05 Oct 2017 00:16:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:40877) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dzxZq-00016F-3o for bug-gnu-emacs@gnu.org; Thu, 05 Oct 2017 00:16:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dzxZp-0000Xn-Or for bug-gnu-emacs@gnu.org; Thu, 05 Oct 2017 00:16:01 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: Resent-From: Allen Li Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 05 Oct 2017 04:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 28615 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 28615-submit@debbugs.gnu.org id=B28615.15071769412065 (code B ref 28615); Thu, 05 Oct 2017 04:16:01 +0000 Original-Received: (at 28615) by debbugs.gnu.org; 5 Oct 2017 04:15:41 +0000 Original-Received: from localhost ([127.0.0.1]:49558 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dzxZV-0000XE-5i for submit@debbugs.gnu.org; Thu, 05 Oct 2017 00:15:41 -0400 Original-Received: from mail-qk0-f174.google.com ([209.85.220.174]:53261) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dzxZS-0000X0-F9 for 28615@debbugs.gnu.org; Thu, 05 Oct 2017 00:15:40 -0400 Original-Received: by mail-qk0-f174.google.com with SMTP id w63so13575968qkd.10 for <28615@debbugs.gnu.org>; Wed, 04 Oct 2017 21:15:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=azBcd++t+CNO14q+4eoFFSNTfbkrX1STI8jfrtAmNQU=; b=QxB42yITMvuG9SihPhu3HM+37k5Yppcz577MnZJ38wV1qAWapNjp/fRQeHsVnuYoIA 7Jo38aZDRTJGQWoix9YIOQ3MrlwcFF5jVKFkHmf8ooBuEGa8fRipCvwZVDE8eC0p/I+x nssnRKSY9yN6bXWXvjGlX3OTY3uUOAZaLi00Qkq2XgsbIBWdE3Ce+I51NjxToEn0Uwsj NW7XorV5gqcpU/gsHs+oEsapWLgoXz9g2+4MEN3rwrQ1U26H9vwBu2jIxtb0+RX4lzIX jsZfrlMBzYY0kw6s+IDBo7mhQmbp+b/x5kal7gyz9NyMqaYgfkcTxbxml9ovHCga+Au/ sVng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=azBcd++t+CNO14q+4eoFFSNTfbkrX1STI8jfrtAmNQU=; b=CjM5WQbmthsckGH7Mokk2UJLj520CbqIcLLb9q+wuAWYFDPjX8iqB70w8haKWIfzx2 n9bOiSO7cbVVaV1rJZQD1YRZg1TB681anvp7EZAklpM8as4ZU0+ANOhLPDBkMGLygbFt dEmwEb5exqewcMSHn5xpXSDevX50yUk0vRRZL7KStRrgQynZUHqIyom99pGJw9aifiZy 5enaiPmjrKWjsnLPxOx1jeXT4X6MMDa6BYg8DkTfcEBIyAyc18ZWUovrScYufMLOD0m0 wP69W0ZOII9hScSaWP9gKDbG0j1MWKHhl3nsu2As4mIJzyd2b8pbc0f1yoxAUsBLzgJi nGSA== X-Gm-Message-State: AMCzsaWy6XcuGzdpCa9lrIFT6kHRFWgLDL0fGjme1b5u54Myg19x0sfO xvDDOnffEJMVKBRSJHL3sj490YsYbvZ/caNSe27U7DuE X-Google-Smtp-Source: AOwi7QCTqBfsiyIjAwXye91KhFqgJfd7rnPGmXo8jUwTeJEj2oZBedvyw0zfS0iQwY78T2s62ZS2l1eLLiPxhfwtBi8= X-Received: by 10.55.77.76 with SMTP id a73mr27485982qkb.196.1507176932724; Wed, 04 Oct 2017 21:15:32 -0700 (PDT) Original-Received: by 10.200.18.195 with HTTP; Wed, 4 Oct 2017 21:15:32 -0700 (PDT) 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: 208.118.235.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:137934 Archived-At: grep-read-files wants a filename glob, not a filename/path. * lisp/progmodes/grep.el (grep-read-files): Clarify docstring. Use file aliases for completion. Clarify completing-read prompt. --- lisp/progmodes/grep.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index 01bdb04714..0537c76d30 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el @@ -903,7 +903,7 @@ grep-read-regexp (read-regexp "Search for" 'grep-tag-default 'grep-regexp-history)) (defun grep-read-files (regexp) - "Read files arg for interactive grep." + "Read filename glob arg for interactive grep." (let* ((bn (or (buffer-file-name) (replace-regexp-in-string "<[0-9]+>\\'" "" (buffer-name)))) (fn (and bn @@ -936,10 +936,10 @@ grep-read-files (car (car grep-files-aliases)))) (files (completing-read (concat "Search for \"" regexp - "\" in files" + "\" in files matching glob" (if default (concat " (default " default ")")) ": ") - 'read-file-name-internal + grep-files-aliases nil nil nil 'grep-files-history (delete-dups (delq nil (append (list default default-alias default-extension) -- 2.14.2