From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Jim Porter Newsgroups: gmane.emacs.bugs Subject: bug#73722: 30.0.91; error calling eshell/clear with no argument Date: Tue, 15 Oct 2024 10:00:40 -0700 Message-ID: <2126f0f9-388e-5717-b0af-b7e3ec90e7d9@gmail.com> References: <87v7y1p4fi.fsf@librehacker.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------1fRabU9WWqSmSFrdf8nhqdTs" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="31559"; mail-complaints-to="usenet@ciao.gmane.io" To: Christopher Howard , 73722@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Oct 15 19:03:09 2024 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 1t0kwv-00084g-Hr for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 15 Oct 2024 19:03:09 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t0kwZ-0003oI-9f; Tue, 15 Oct 2024 13:02:47 -0400 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 1t0kwW-0003nv-NO for bug-gnu-emacs@gnu.org; Tue, 15 Oct 2024 13:02:44 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t0kwW-00020t-ER for bug-gnu-emacs@gnu.org; Tue, 15 Oct 2024 13:02:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=In-Reply-To:From:References:MIME-Version:Date:To:Subject; bh=2qS4QbNhjjc0vvQoa5ZProz4R2cExW2xFSrSfDIgZ4o=; b=krIaDb/axPV+wcj5ymFttfcg6jiPuPLmmpeICY4T6hyb54aMAoBp/Qh/PfN581PtEqo0YYnQDotY76sZRnHkNYCp2oJM4jwx+O9Ksa42mJkmgDVNM5ba1+s8gvgxBJMsf1OSq9x9bLQ2fGLZNsT1dwyefAh7xR3ZgtBFzeSBITHWZtQ7Bz8EP6OVjN3Pnh9/qVmF2/xqW3tNo5EnQYUjAzaz2X5z0UdFRc9vfpm1myKRiCJfta9pOv6A9xyDK7VbTqb0zV8T+hqa4waSpxOMSWHRA1wg/bSk80TiaXrWVntvMncPctwODjyUtilBUf3bETIUCrFWiZci8NkdjxioiQ==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t0kwo-0005sb-CA for bug-gnu-emacs@gnu.org; Tue, 15 Oct 2024 13:03:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Jim Porter Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 15 Oct 2024 17:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73722 X-GNU-PR-Package: emacs Original-Received: via spool by 73722-submit@debbugs.gnu.org id=B73722.172901172322453 (code B ref 73722); Tue, 15 Oct 2024 17:03:02 +0000 Original-Received: (at 73722) by debbugs.gnu.org; 15 Oct 2024 17:02:03 +0000 Original-Received: from localhost ([127.0.0.1]:56736 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t0kvq-0005q5-Kb for submit@debbugs.gnu.org; Tue, 15 Oct 2024 13:02:03 -0400 Original-Received: from mail-pf1-f172.google.com ([209.85.210.172]:45292) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t0kvp-0005pf-2x for 73722@debbugs.gnu.org; Tue, 15 Oct 2024 13:02:01 -0400 Original-Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-71e49ef3b2bso2846021b3a.2 for <73722@debbugs.gnu.org>; Tue, 15 Oct 2024 10:01:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729011642; x=1729616442; darn=debbugs.gnu.org; h=in-reply-to:from:content-language:references:to:subject :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=2qS4QbNhjjc0vvQoa5ZProz4R2cExW2xFSrSfDIgZ4o=; b=O1n4xbLqNH7gZJY+dMPPkkI+AKH7sffivKwaGtbEg6OxNGyOHGo/1BKBGjBA91tlhO 9bb4TveP3ecad/KU+GJxbVwkhM01EvOWRHoBf+xg4cAGtzh7E/9LLKrxPjoYhJctYncl RxDzTJuWYG1W757nsq2u79T+nmI+sxTmdeKM5J6adw/9BHywKYqVk/S93VTi5IiTv0NM 6BqGWf16DHKBlxhtjaDSLYAEzz/Wpf9L88cC3NcWvDub7VibollB6PrahTO1OURpfIA2 VHf+v8F2KHkdKkJ04j+QtE7K5280Ns8G4VIhad3Up0sb5ROO8SvFuehOh9XgYD0qg/30 tM4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729011642; x=1729616442; h=in-reply-to:from:content-language:references:to:subject :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=2qS4QbNhjjc0vvQoa5ZProz4R2cExW2xFSrSfDIgZ4o=; b=s3xcj6Dzwxes5eCcd84cyfs+oKM9JhxS3KEHeH89q6dWaa+l5gxBjT89D6sW3wLOUK UeD1R5uVUFUfH7GQE40NK/QhKsM3Ljy1Nfah/KzzZZ+QBtGbPNzfxBNHJMGRKkGFvR1v rrbxtkP7pGpzosMvwut0Zqk8h+EgL8hLfuX7Zcz2DNWtRVC/MPWfUM/DcGrO5FJNSb4S XQ0rFNvvdDrLjQAetAIXdFOolK73MF4c0DWiB1JHt7liFGlvfE+ClpnXcsWvXT8uaGFJ ba4tYdE6PsT59OxwHuDLlywpl31gPLviSfKxaKgtuNo/Rk6D9EKPCoWOFWi0z7XVTR4p C8PA== X-Forwarded-Encrypted: i=1; AJvYcCXUpg6jVHdfYQpNIZR2oMXxNc2Shur8WochX4eiHwBW0+peQNTFlr93Ludl84P0vzGSIrASHQ==@debbugs.gnu.org X-Gm-Message-State: AOJu0YwrKMXxGABb3GwDsWzKpLGMKpDghIx4AqPAmpjQl5grtglZi1ir MB8CLC0ZpnA9Dnf7M26SR1HfLWtWEF+ZcZ43vk6S+62xLk8/1gXa X-Google-Smtp-Source: AGHT+IEYUy7rxZxmrg09BUz6L+Y0TOTZJMW3n+LyXupgM17o/nFpN16X6bcxfuo5slEKt0yPCeNlyQ== X-Received: by 2002:a05:6a00:4603:b0:71e:6ec9:fcda with SMTP id d2e1a72fcca58-71e6eca0cfbmr7957702b3a.19.1729011641381; Tue, 15 Oct 2024 10:00:41 -0700 (PDT) Original-Received: from [192.168.1.2] (syn-023-240-098-037.res.spectrum.com. [23.240.98.37]) by smtp.googlemail.com with ESMTPSA id d2e1a72fcca58-71e773b1672sm1502626b3a.83.2024.10.15.10.00.39 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 15 Oct 2024 10:00:39 -0700 (PDT) Content-Language: en-US In-Reply-To: <87v7y1p4fi.fsf@librehacker.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:293633 Archived-At: This is a multi-part message in MIME format. --------------1fRabU9WWqSmSFrdf8nhqdTs Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 10/9/2024 10:33 AM, Christopher Howard wrote: > > (same with or without emacs -Q) > 1. M-x eshell > 2. clear > > Gives error "wrong-type-argument listp progn". I think this is probably the result of some improvements I've made to Eshell's command evaluator that revealed a latent bug in 'eshell/clear' (it actually runs a *second* Eshell command consisting only of newlines, which shouldn't be necessary). The actual error reported here is fixed in Emacs 31; in Emacs 30, 'eshell-do-eval' mis-evaluates an empty '(progn)', but that generally shouldn't occur except in odd cases like this. The "clear" command still doesn't *work* correctly in Emacs 31 though. Attached is the smallest fix I could come up with for this. This is made somewhat more complex due to 'eshell/clear' also being used as an interactive Emacs-level command. The two forms ("clear" at an Eshell prompt and "M-x eshell/clear" in Emacs) should probably be separate functions entirely since they behave differently regarding the current prompt, but for the sake of compatibility, let's keep them fused together for now... Eli, does this look ok for the release branch? It fixes a regression from Emacs 29 and adds a pair of regression tests to prevent future breakage. (If and when this merges, I'll see about a more-thorough fix for the master branch too.) --------------1fRabU9WWqSmSFrdf8nhqdTs Content-Type: text/plain; charset=UTF-8; name="0001-Fix-error-when-calling-clear-in-Eshell.patch" Content-Disposition: attachment; filename="0001-Fix-error-when-calling-clear-in-Eshell.patch" Content-Transfer-Encoding: base64 RnJvbSA0Yzg2OGRiYWQ1NDZiNjA0MDc2YWI3YzMzODM5YjRkM2I1OTE5ZjMyIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFRodSwgMTAgT2N0IDIwMjQgMjE6MDM6NDUgLTA3MDAKU3ViamVjdDogW1BB VENIXSBGaXggZXJyb3Igd2hlbiBjYWxsaW5nICJjbGVhciIgaW4gRXNoZWxsLgoKKiBsaXNw L2VzaGVsbC9lc2gtbW9kZS5lbCAoZXNoZWxsL2NsZWFyKTogRml4IGVycm9yLCBhbmQgaW1w cm92ZQpoYW5kbGluZyBmb3IgdXNpbmcgYXMgYW4gaW50ZXJhY3RpdmUgRW1hY3MgY29tbWFu ZC4KCiogdGVzdC9saXNwL2VzaGVsbC9lc2gtbW9kZS10ZXN0cy5lbAooZXNoLW1vZGUtdGVz dC9jbGVhci9lc2hlbGwtY29tbWFuZCwgZXNoLW1vZGUtdGVzdC9jbGVhci9lbWFjcy1jb21t YW5kKToKTmV3IHRlc3RzLgotLS0KIGxpc3AvZXNoZWxsL2VzaC1tb2RlLmVsICAgICAgICAg ICAgfCAgNyArKysrKy0tCiB0ZXN0L2xpc3AvZXNoZWxsL2VzaC1tb2RlLXRlc3RzLmVsIHwg MjMgKysrKysrKysrKysrKysrKysrKysrKysKIDIgZmlsZXMgY2hhbmdlZCwgMjggaW5zZXJ0 aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saXNwL2VzaGVsbC9lc2gt bW9kZS5lbCBiL2xpc3AvZXNoZWxsL2VzaC1tb2RlLmVsCmluZGV4IDM0Y2U4MmNmYmM0Li43 OGU0M2U4NDE3MyAxMDA2NDQKLS0tIGEvbGlzcC9lc2hlbGwvZXNoLW1vZGUuZWwKKysrIGIv bGlzcC9lc2hlbGwvZXNoLW1vZGUuZWwKQEAgLTg2OSw4ICs4NjksMTEgQEAgZXNoZWxsL2Ns ZWFyCiAgIChpZiBzY3JvbGxiYWNrCiAgICAgICAoZXNoZWxsL2NsZWFyLXNjcm9sbGJhY2sp CiAgICAgKGxldCAoKGVzaGVsbC1pbnB1dC1maWx0ZXItZnVuY3Rpb25zIG5pbCkpCi0gICAg ICAoaW5zZXJ0IChtYWtlLXN0cmluZyAod2luZG93LXNpemUpID9cbikpCi0gICAgICAoZXNo ZWxsLXNlbmQtaW5wdXQpKSkpCisgICAgICAoZXNoZWxsLWludGVyYWN0aXZlLXByaW50ICht YWtlLXN0cmluZyAod2luZG93LXNpemUpID9cbikpCisgICAgICAod2hlbiAoYW5kIChudWxs IGVzaGVsbC1jdXJyZW50LWhhbmRsZXMpCisgICAgICAgICAgICAgICAgIChlc2hlbGwtdXNp bmctbW9kdWxlICdlc2hlbGwtcHJvbXB0KSkKKyAgICAgICAgKGRlY2xhcmUtZnVuY3Rpb24g ZXNoZWxsLWVtaXQtcHJvbXB0ICJlbS1wcm9tcHQiICgpKQorICAgICAgICAoZXNoZWxsLWVt aXQtcHJvbXB0KSkpKSkKIAogKGRlZnVuIGVzaGVsbC9jbGVhci1zY3JvbGxiYWNrICgpCiAg ICJDbGVhciB0aGUgc2Nyb2xsYmFjayBjb250ZW50IG9mIHRoZSBlc2hlbGwgd2luZG93LiIK ZGlmZiAtLWdpdCBhL3Rlc3QvbGlzcC9lc2hlbGwvZXNoLW1vZGUtdGVzdHMuZWwgYi90ZXN0 L2xpc3AvZXNoZWxsL2VzaC1tb2RlLXRlc3RzLmVsCmluZGV4IDMwNmUxMWNlNDQ1Li44OTY5 MzFjNDdmNiAxMDA2NDQKLS0tIGEvdGVzdC9saXNwL2VzaGVsbC9lc2gtbW9kZS10ZXN0cy5l bAorKysgYi90ZXN0L2xpc3AvZXNoZWxsL2VzaC1tb2RlLXRlc3RzLmVsCkBAIC0yNiw2ICsy Niw4IEBACiAocmVxdWlyZSAnZXJ0KQogKHJlcXVpcmUgJ2VzaC1tb2RlKQogKHJlcXVpcmUg J2VzaGVsbCkKKyhyZXF1aXJlICdlbS1iYW5uZXIpCisocmVxdWlyZSAnZW0tcHJvbXB0KQog CiAocmVxdWlyZSAnZXNoZWxsLXRlc3RzLWhlbHBlcnMKICAgICAgICAgIChleHBhbmQtZmls ZS1uYW1lICJlc2hlbGwtdGVzdHMtaGVscGVycyIKQEAgLTU5LDQgKzYxLDI1IEBAIGVzaC1t b2RlLXRlc3QvaGFuZGxlLWNvbnRyb2wtY29kZXMvYmFja3NwYWNlCiAgICAgKGVzaGVsbC1t YXRjaC1jb21tYW5kLW91dHB1dCAoZm9ybWF0ICIoZm9ybWF0IFwiaGVsbG8lYyVjcFwiKSIg P1xDLWggP1xDLWgpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiXFxgaGVs cFxuIikpKQogCisoZXJ0LWRlZnRlc3QgZXNoLW1vZGUtdGVzdC9jbGVhci9lc2hlbGwtY29t bWFuZCAoKQorICAiVGVzdCB0aGF0IGBlc2hlbGwvY2xlYXInIHdvcmtzIGFzIGFuIEVzaGVs bCBjb21tYW5kLiIKKyAgKGxldCAoKGVzaGVsbC1iYW5uZXItbWVzc2FnZSAiIikKKyAgICAg ICAgKGVzaGVsbC1wcm9tcHQtZnVuY3Rpb24gKGxhbWJkYSAoKSAiJCAiKSkpCisgICAgKHdp dGgtdGVtcC1lc2hlbGwKKyAgICAgIChlc2hlbGwtaW5zZXJ0LWNvbW1hbmQgImVjaG8gaGki KQorICAgICAgKGVzaGVsbC1pbnNlcnQtY29tbWFuZCAiY2xlYXIiKQorICAgICAgKHNob3Vs ZCAoc3RyaW5nLW1hdGNoICJcXCQgZWNobyBoaVxuaGlcblxcJCBjbGVhclxuK1xcJCAiCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgKGJ1ZmZlci1zdHJpbmcpKSkpKSkKKworKGVy dC1kZWZ0ZXN0IGVzaC1tb2RlLXRlc3QvY2xlYXIvZW1hY3MtY29tbWFuZCAoKQorICAiVGVz dCB0aGF0IGBlc2hlbGwvY2xlYXInIHdvcmtzIGFzIGFuIGludGVyYWN0aXZlIEVtYWNzIGNv bW1hbmQuIgorICAobGV0ICgoZXNoZWxsLWJhbm5lci1tZXNzYWdlICIiKQorICAgICAgICAo ZXNoZWxsLXByb21wdC1mdW5jdGlvbiAobGFtYmRhICgpICIkICIpKSkKKyAgICAod2l0aC10 ZW1wLWVzaGVsbAorICAgICAgKGVzaGVsbC1pbnNlcnQtY29tbWFuZCAiZWNobyBoaSIpCisg ICAgICAoaW5zZXJ0ICJlY2hvIGIiKQorICAgICAgKGVzaGVsbC9jbGVhcikKKyAgICAgIChz aG91bGQgKHN0cmluZy1tYXRjaCAiXFwkIGVjaG8gaGlcbmhpXG5cXCQgXG4rXFwkIGVjaG8g YiIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAoYnVmZmVyLXN0cmluZykpKSkpKQor CiA7OyBlc2gtbW9kZS10ZXN0cy5lbCBlbmRzIGhlcmUKLS0gCjIuMjUuMQoK --------------1fRabU9WWqSmSFrdf8nhqdTs--