From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Gregory Heytings Newsgroups: gmane.emacs.bugs Subject: bug#60464: 29.0.60; Regression - pcomplete-arg fails with argument 'last Date: Wed, 04 Jan 2023 13:48:25 +0000 Message-ID: References: <87358u5y6l.fsf@daniel-mendler.de> <226b32f79f2d431d75b6@heytings.org> <009141ba-c21a-a5cb-a81b-c72a12a26207@daniel-mendler.de> <226b32f79f728e6bfed4@heytings.org> <82cf05e4-3c3f-9804-4801-eb31988f6d7d@daniel-mendler.de> <226b32f79f325daf9c7a@heytings.org> <226b32f79fe1e154cfb4@heytings.org> <1de8c8ce-4aa1-c6e4-1ede-0acafc620a50@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="1dBj90QEL1" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="36313"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Daniel Mendler , Eli Zaretskii , 60464@debbugs.gnu.org, Stefan Monnier To: Jim Porter Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Jan 04 14:49:31 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pD494-0009CM-Ra for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 04 Jan 2023 14:49:31 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pD48r-0002iQ-If; Wed, 04 Jan 2023 08:49:17 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pD48c-0002gw-Ov for bug-gnu-emacs@gnu.org; Wed, 04 Jan 2023 08:49:04 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pD48c-0006D8-AQ for bug-gnu-emacs@gnu.org; Wed, 04 Jan 2023 08:49:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pD48c-0004RJ-6B for bug-gnu-emacs@gnu.org; Wed, 04 Jan 2023 08:49:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Gregory Heytings Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 04 Jan 2023 13:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60464 X-GNU-PR-Package: emacs Original-Received: via spool by 60464-submit@debbugs.gnu.org id=B60464.167284011017024 (code B ref 60464); Wed, 04 Jan 2023 13:49:02 +0000 Original-Received: (at 60464) by debbugs.gnu.org; 4 Jan 2023 13:48:30 +0000 Original-Received: from localhost ([127.0.0.1]:47957 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pD485-0004QW-Uv for submit@debbugs.gnu.org; Wed, 04 Jan 2023 08:48:30 -0500 Original-Received: from heytings.org ([95.142.160.155]:58464) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pD483-0004QN-8U for 60464@debbugs.gnu.org; Wed, 04 Jan 2023 08:48:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=heytings.org; s=20220101; t=1672840105; bh=RI2whM+gaIoMrqnCtLIfubZb5KRvvZVvnghuV7KuKtU=; h=Date:From:To:cc:Subject:In-Reply-To:Message-ID:References:From; b=hbhT76Q2HU/4ruKFN8Q5EiwhhexHWuDuPD0AHx7fUBnR6Z1ARC0cMYBoMCErMPEPl YWeTnTDxeXy+i5EBJadJo+oocBDlvUJJnWE7EGgDJNkaZqmnlfpwlYaQ5n5ChVuNR8 HHWXHqmFLU0zoWMAAO3a3e3TYfeAT8RQ+A+2cJ2wx8cdN2cLs92qo2nadW7mlPwRN8 exFLsrdiDlvOdamJsQG3rcdxqviA7zyn8T+ba/MjUBaSLNyC1/wqK3dTx9yIzeK3Ir MQkFudiGigvTKQC+nuAVgylPsfPEA2VPJg5E2d6c7E4ct4PWX1kT8/M/0KPH/F3qzx pB53S+0Y8ywnQ== In-Reply-To: <1de8c8ce-4aa1-c6e4-1ede-0acafc620a50@gmail.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:252472 Archived-At: --1dBj90QEL1 Content-Type: text/plain; charset=us-ascii; format=flowed >> Jim, can you also try the patch and report if you see regressions? > > Thanks. I tried this out for a bit, and I haven't been able to break it > yet (although I didn't notice the issue that spawned this bug# the last > time either, so it's possible I'm missing some problem this time around, > too). > Thanks for your confirmation. Stefan, do you agree with the attached patch? Or would you like something else? Eli, are you okay with that patch? The difference between the code before dafa6d6bad and the code with this patch applied can be summarized as follows: (defun pcomplete-arg (&optional index offset) (let ((arg (nth (+ (pcase index ('first 0) ('last pcomplete-last) (_ (- pcomplete-index (or index 0)))) (or offset 0)) pcomplete-args))) - arg + (if (or (stringp arg) + (eq index 'last)) + arg + (propertize + (car (split-string (pcomplete-actual-arg index offset))) + 'pcomplete-arg-value arg)))) IOW, instead of unconditionally returning arg, we now sometimes (when arg is not already a string and when index is not last) return the textual representation of that argument (what the user typed in) with the value of arg attached to it. --1dBj90QEL1 Content-Type: text/x-diff; name=Further-improvement-for-non-string-values-in-pcomple.patch Content-Transfer-Encoding: base64 Content-ID: Content-Disposition: attachment; filename=Further-improvement-for-non-string-values-in-pcomple.patch RnJvbSBlNWUxOTdhNjhhMjUzMTVlOTM1ODZkYjI5OTc1NzkxMTg2MmU3NGE4 IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQ0KRnJvbTogR3JlZ29yeSBIZXl0 aW5ncyA8Z3JlZ29yeUBoZXl0aW5ncy5vcmc+DQpEYXRlOiBXZWQsIDQgSmFu IDIwMjMgMTM6MzY6MDQgKzAwMDANClN1YmplY3Q6IFtQQVRDSF0gRnVydGhl ciBpbXByb3ZlbWVudCBmb3Igbm9uLXN0cmluZyB2YWx1ZXMgaW4gcGNvbXBs ZXRlDQoNCiogbGlzcC9wY29tcGxldGUuZWwgKHBjb21wbGV0ZS1hcmcpOiBV c2UgdGhlIHN0cmluZyByZXByZXNlbnRhdGlvbg0Kb2YgdGhlIGFyZ3VtZW50 IHZhbHVlIGluc3RlYWQgb2YgdGhlIHRleHQgcmVwcmVzZW50YXRpb24gb2Yg dGhlDQphcmd1bWVudC4gIFJldHVybiB0aGUgdmFsdWUsIGV2ZW4gd2hlbiBp dCBpcyBub3QgYSBzdHJpbmcsIHdoZW4NCmluZGV4IGlzICdsYXN0Jy4gIEZp eGVzIGJ1ZyM2MDQ2NC4NCihwY29tcGxldGUtYWN0dWFsLWFyZyk6IE1vdmUg aXQgYmVmb3JlICdwY29tcGxldGUtYXJnJy4NCi0tLQ0KIGxpc3AvcGNvbXBs ZXRlLmVsIHwgMjkgKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0NCiAx IGZpbGUgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25z KC0pDQoNCmRpZmYgLS1naXQgYS9saXNwL3Bjb21wbGV0ZS5lbCBiL2xpc3Av cGNvbXBsZXRlLmVsDQppbmRleCA1YmVlNTE1MjQ2Li43M2UxNGM1NjJiIDEw MDY0NA0KLS0tIGEvbGlzcC9wY29tcGxldGUuZWwNCisrKyBiL2xpc3AvcGNv bXBsZXRlLmVsDQpAQCAtNjMyLDYgKzYzMiwxMyBAQCBwY29tcGxldGUtbGlz dA0KIDs7OyBJbnRlcm5hbCBGdW5jdGlvbnM6DQogDQogOzsgYXJndW1lbnQg aGFuZGxpbmcNCisoZGVmc3Vic3QgcGNvbXBsZXRlLWFjdHVhbC1hcmcgKCZv cHRpb25hbCBpbmRleCBvZmZzZXQpDQorICAiUmV0dXJuIHRoZSBhY3R1YWwg dGV4dCByZXByZXNlbnRhdGlvbiBvZiB0aGUgbGFzdCBhcmd1bWVudC4NCitU aGlzIGlzIGRpZmZlcmVudCBmcm9tIGBwY29tcGxldGUtYXJnJywgd2hpY2gg cmV0dXJucyB0aGUgdGV4dHVhbCB2YWx1ZQ0KK3RoYXQgdGhlIGxhc3QgYXJn dW1lbnQgZXZhbHVhdGVkIHRvLiAgVGhpcyBmdW5jdGlvbiByZXR1cm5zIHdo YXQgdGhlDQordXNlciBhY3R1YWxseSB0eXBlZCBpbi4iDQorICAoYnVmZmVy LXN1YnN0cmluZyAocGNvbXBsZXRlLWJlZ2luIGluZGV4IG9mZnNldCkgKHBv aW50KSkpDQorDQogKGRlZnVuIHBjb21wbGV0ZS1hcmcgKCZvcHRpb25hbCBp bmRleCBvZmZzZXQpDQogICAiUmV0dXJuIHRoZSB0ZXh0dWFsIGNvbnRlbnQg b2YgdGhlIElOREVYdGggYXJndW1lbnQuDQogSU5ERVggaXMgYmFzZWQgZnJv bSB0aGUgY3VycmVudCBwcm9jZXNzaW5nIHBvc2l0aW9uLiAgSWYgSU5ERVgg aXMNCkBAIC02NDgsMTAgKzY1NSwxMSBAQCBwY29tcGxldGUtYXJnDQogYWNj ZXNzaW5nIGFic29sdXRlIGFyZ3VtZW50IHBvc2l0aW9ucy4NCiANCiBXaGVu IHRoZSBhcmd1bWVudCBoYXMgYmVlbiB0cmFuc2Zvcm1lZCBpbnRvIHNvbWV0 aGluZyB0aGF0IGlzIG5vdA0KLWEgc3RyaW5nIGJ5IGBwY29tcGxldGUtcGFy c2UtYXJndW1lbnRzLWZ1bmN0aW9uJywgdGhlIHRleHQNCi1yZXByZXNlbnRh dGlvbiBvZiB0aGUgYXJndW1lbnQsIG5hbWVseSB3aGF0IHRoZSB1c2VyIGFj dHVhbGx5DQotdHlwZWQgaW4sIGlzIHJldHVybmVkLCBhbmQgdGhlIHZhbHVl IG9mIHRoZSBhcmd1bWVudCBpcyBzdG9yZWQgaW4NCi10aGUgcGNvbXBsZXRl LWFyZy12YWx1ZSB0ZXh0IHByb3BlcnR5IG9mIHRoYXQgc3RyaW5nLiINCith IHN0cmluZyBieSBgcGNvbXBsZXRlLXBhcnNlLWFyZ3VtZW50cy1mdW5jdGlv bicgYW5kIElOREVYIGlzIG5vdA0KK2BsYXN0JywgdGhlIHRleHQgcmVwcmVz ZW50YXRpb24gb2YgdGhlIGFyZ3VtZW50LCBuYW1lbHkgd2hhdCB0aGUNCit1 c2VyIGFjdHVhbGx5IHR5cGVkIGluLCBpcyByZXR1cm5lZCwgYW5kIHRoZSB2 YWx1ZSBvZiB0aGUNCithcmd1bWVudCBpcyBzdG9yZWQgaW4gdGhlIHBjb21w bGV0ZS1hcmctdmFsdWUgdGV4dCBwcm9wZXJ0eSBvZg0KK3RoYXQgc3RyaW5n LiINCiAgIChsZXQgKChhcmcNCiAgICAgICAgICAobnRoICgrIChwY2FzZSBp bmRleA0KIAkgICAgICAgICAgICgnZmlyc3QgMCkNCkBAIC02NTksMTEgKzY2 NywxMSBAQCBwY29tcGxldGUtYXJnDQogCSAgICAgICAgICAgKF8gICAgICAo LSBwY29tcGxldGUtaW5kZXggKG9yIGluZGV4IDApKSkpDQogCSAgICAgICAg IChvciBvZmZzZXQgMCkpDQogICAgICAgICAgICAgICBwY29tcGxldGUtYXJn cykpKQ0KLSAgICAoaWYgKHN0cmluZ3AgYXJnKQ0KKyAgICAoaWYgKG9yIChz dHJpbmdwIGFyZykNCisgICAgICAgICAgICAoZXEgaW5kZXggJ2xhc3QpKQ0K ICAgICAgICAgYXJnDQogICAgICAgKHByb3BlcnRpemUNCi0gICAgICAgKGJ1 ZmZlci1zdWJzdHJpbmcgKHBjb21wbGV0ZS1iZWdpbiBpbmRleCBvZmZzZXQp DQotICAgICAgICAgICAgICAgICAgICAgICAgIChwY29tcGxldGUtYmVnaW4g KDEtIChvciBpbmRleCAwKSkgb2Zmc2V0KSkNCisgICAgICAgKGNhciAoc3Bs aXQtc3RyaW5nIChwY29tcGxldGUtYWN0dWFsLWFyZyBpbmRleCBvZmZzZXQp KSkNCiAgICAgICAgJ3Bjb21wbGV0ZS1hcmctdmFsdWUgYXJnKSkpKQ0KIA0K IChkZWZ1biBwY29tcGxldGUtYmVnaW4gKCZvcHRpb25hbCBpbmRleCBvZmZz ZXQpDQpAQCAtNjc5LDEzICs2ODcsNiBAQCBwY29tcGxldGUtYmVnaW4NCiAg ICAgICAoc2V0cSBpbmRleCAoKyBpbmRleCBvZmZzZXQpKSkNCiAgIChudGgg aW5kZXggcGNvbXBsZXRlLWJlZ2lucykpDQogDQotKGRlZnN1YnN0IHBjb21w bGV0ZS1hY3R1YWwtYXJnICgmb3B0aW9uYWwgaW5kZXggb2Zmc2V0KQ0KLSAg IlJldHVybiB0aGUgYWN0dWFsIHRleHQgcmVwcmVzZW50YXRpb24gb2YgdGhl IGxhc3QgYXJndW1lbnQuDQotVGhpcyBpcyBkaWZmZXJlbnQgZnJvbSBgcGNv bXBsZXRlLWFyZycsIHdoaWNoIHJldHVybnMgdGhlIHRleHR1YWwgdmFsdWUN Ci10aGF0IHRoZSBsYXN0IGFyZ3VtZW50IGV2YWx1YXRlZCB0by4gIFRoaXMg ZnVuY3Rpb24gcmV0dXJucyB3aGF0IHRoZQ0KLXVzZXIgYWN0dWFsbHkgdHlw ZWQgaW4uIg0KLSAgKGJ1ZmZlci1zdWJzdHJpbmcgKHBjb21wbGV0ZS1iZWdp biBpbmRleCBvZmZzZXQpIChwb2ludCkpKQ0KLQ0KIChkZWZzdWJzdCBwY29t cGxldGUtbmV4dC1hcmcgKCkNCiAgICJNb3ZlIHRoZSB2YXJpb3VzIHBvaW50 ZXJzIHRvIHRoZSBuZXh0IGFyZ3VtZW50LiINCiAgIChzZXRxIHBjb21wbGV0 ZS1pbmRleCAoMSsgcGNvbXBsZXRlLWluZGV4KQ0KLS0gDQoyLjM5LjANCg0K --1dBj90QEL1--