From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: samer Newsgroups: gmane.emacs.bugs Subject: bug#18950: [PATCH] 24.4.51; Wrong type argument: stringp on completing an asterisk in eshell with pcomplete-cycle-completions disabled Date: Wed, 14 Jan 2015 20:12:48 -0800 Message-ID: <4fd05af1b84870c40eae10fa421aa17c@samertm.com> References: <86wq7ai5cz.fsf@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1421295262 15402 80.91.229.3 (15 Jan 2015 04:14:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 15 Jan 2015 04:14:22 +0000 (UTC) Cc: 18950@debbugs.gnu.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Jan 15 05:14:15 2015 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YBbp0-0004WJ-Sq for geb-bug-gnu-emacs@m.gmane.org; Thu, 15 Jan 2015 05:14:15 +0100 Original-Received: from localhost ([::1]:49012 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YBboz-0004nL-Q4 for geb-bug-gnu-emacs@m.gmane.org; Wed, 14 Jan 2015 23:14:13 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46950) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YBbot-0004nG-8p for bug-gnu-emacs@gnu.org; Wed, 14 Jan 2015 23:14:11 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YBboo-00037V-PO for bug-gnu-emacs@gnu.org; Wed, 14 Jan 2015 23:14:07 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:48356) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YBboo-00037P-M2 for bug-gnu-emacs@gnu.org; Wed, 14 Jan 2015 23:14:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YBboo-0001cF-7j for bug-gnu-emacs@gnu.org; Wed, 14 Jan 2015 23:14:02 -0500 X-Loop: help-debbugs@gnu.org In-Reply-To: <86wq7ai5cz.fsf@yandex.ru> Resent-From: samer Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 15 Jan 2015 04:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 18950 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 18950-submit@debbugs.gnu.org id=B18950.14212952096162 (code B ref 18950); Thu, 15 Jan 2015 04:14:02 +0000 Original-Received: (at 18950) by debbugs.gnu.org; 15 Jan 2015 04:13:29 +0000 Original-Received: from localhost ([127.0.0.1]:57217 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YBboG-0001bJ-CW for submit@debbugs.gnu.org; Wed, 14 Jan 2015 23:13:28 -0500 Original-Received: from samertm.com ([162.243.37.26]:57378 helo=mail.samertm.com) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YBboD-0001bB-Qr for 18950@debbugs.gnu.org; Wed, 14 Jan 2015 23:13:26 -0500 Original-Received: by mail.samertm.com (Postfix, from userid 1010) id 0733882104; Thu, 15 Jan 2015 04:13:10 +0000 (UTC) Original-Received: from samertm.com (localhost [127.0.0.1]) by mail.samertm.com (Postfix) with ESMTP id 09BAE81A1E; Thu, 15 Jan 2015 04:12:48 +0000 (UTC) X-Sender: samer@samertm.com User-Agent: Roundcube Webmail/0.9.5 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:98361 Archived-At: Hi, The function pcomplete-parse-arguments wasn't completing the input when pcomplete-cycle-completions was nil, and so pcomplete would pass control to one of eshell's completion functions, which would blow up when given a list by pcomplete-arg (which is strange, because it's valid for pcomplete-arg to return a list). But there is no reason for pcomplete-parse-arguments to care about whether the user wants to cycle completions, as only really matters in pcomplete-stub. The following patch fixes the bug by making pcomplete-parse-arguments not care about the value of pcomplete-cycle-completions. Best, Samer Changes from HEAD~1 to working tree 2 files changed, 6 insertions(+), 2 deletions(-) lisp/ChangeLog | 5 +++++ lisp/pcomplete.el | 3 +-- Modified lisp/ChangeLog diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f413526..c904e03 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-01-15 Samer Masterson + + * pcomplete.el (pcomplete-parse-arguments): Parse arguments + regardless of pcomplete-cycle-completions's value. (bug#18950) + 2015-01-04 Dmitry Gutov Add mouse interaction to xref. Modified lisp/pcomplete.el diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el index 17327ea..7bcf2c1 100644 --- a/lisp/pcomplete.el +++ b/lisp/pcomplete.el @@ -755,8 +755,7 @@ this is `comint-dynamic-complete-functions'." pcomplete-index 0 pcomplete-stub (pcomplete-arg 'last)) (let ((begin (pcomplete-begin 'last))) - (if (and pcomplete-cycle-completions - (listp pcomplete-stub) ;?? + (if (and (listp pcomplete-stub) ;?? (not pcomplete-expand-only-p)) (let* ((completions pcomplete-stub) ;?? (common-stub (car completions))