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#72097: 30.0.60; [PATCH] Don't add to Eshell history when aborting 'eshell-command' Date: Sat, 13 Jul 2024 11:51:46 -0700 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------FYR5ZHqMRyEQtjP0jGelHou9" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="13099"; mail-complaints-to="usenet@ciao.gmane.io" To: 72097@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Jul 13 20:52:27 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 1sShr8-0003Io-Sk for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 13 Jul 2024 20:52:26 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sShqk-000388-Ck; Sat, 13 Jul 2024 14:52:02 -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 1sShqj-000380-PT for bug-gnu-emacs@gnu.org; Sat, 13 Jul 2024 14:52:01 -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 1sShqj-0007Ja-HQ for bug-gnu-emacs@gnu.org; Sat, 13 Jul 2024 14:52:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sShqk-0001DD-3k for bug-gnu-emacs@gnu.org; Sat, 13 Jul 2024 14:52: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: Sat, 13 Jul 2024 18:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 72097 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.17208967124639 (code B ref -1); Sat, 13 Jul 2024 18:52:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 13 Jul 2024 18:51:52 +0000 Original-Received: from localhost ([127.0.0.1]:56785 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sShqa-0001Cl-0X for submit@debbugs.gnu.org; Sat, 13 Jul 2024 14:51:52 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:42942) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sShqX-0001Cc-AP for submit@debbugs.gnu.org; Sat, 13 Jul 2024 14:51:50 -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 1sShqW-00037L-36 for bug-gnu-emacs@gnu.org; Sat, 13 Jul 2024 14:51:48 -0400 Original-Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sShqU-0007Gf-C0 for bug-gnu-emacs@gnu.org; Sat, 13 Jul 2024 14:51:47 -0400 Original-Received: by mail-pj1-x102f.google.com with SMTP id 98e67ed59e1d1-2ca4649ad49so2146709a91.1 for ; Sat, 13 Jul 2024 11:51:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720896705; x=1721501505; darn=gnu.org; h=subject:from:to:content-language:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=Z9aBegzcZs68Kkk5lDEH+/FYwKEoHRqq2cdWEKi0nGs=; b=lpHL4FydO197ImdpVGzv2nXWd+HRHpspv2pYrE3RSDeSqdTRgMaBoGt62ZEBkjzvbI h/Ov803zoyf2IV2Q21FjCFf4sM8EpgzFEZ6kaPMyJ4mXrz4YK3GEz2MazMvb7qTZbxB5 WtLcldXeAzoCMsJPyEgSCjRQGJHa1tYieFEg+T5JFyH2SeJjeNGs5sIM5HxadMrRXgPT XJyPYjR4Y+54jVcozsCD365HqipZjGyjpaRvVfQ2ZUsFnC0HOkvPn4T4gxOdqmRD/jEn +0JD5zCfSk2uwqruV/RVBASe1xHD2GrXGn4zwdc+Bcq55vWDrhZjoDKj1k9KQG9rjkMi OQAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720896705; x=1721501505; h=subject:from:to:content-language:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Z9aBegzcZs68Kkk5lDEH+/FYwKEoHRqq2cdWEKi0nGs=; b=uw21vyqqM3aAc6o53YSJxSZR6Kgr38joUopWb01SuSmwaIvT6uOLCtOraEE0ehwygF vb7AyFl9RwXBJNbtsMmlenyZrQbQK4j1xfJW5VRcerwn+OwFQLIdPz2e7PSPI8BbgXeH uIyIGnuh2D1HRZwXMy0ctDMw1e+DXuwGkVeBXE3trWgGt9Az79xfNJf+3qSQbwgfRZTk t30gx23FscY7sXjyKhli3plsgwELg4aNYipMdgtYizYDwg6Qx5FV5KaXT+V9k3yZ4lOW PoupeaVpQloRjS0MuAX3q+ZGNYXFnfEWbFtkiPd+3XGXkl/R73QYANTlyMCEY/1yF5Pa RKaQ== X-Gm-Message-State: AOJu0YyAh/9zNVhOCU/0MXuPevSZg+CMuRnzK9Nam0VgY3lvk5IgbTYV 1wwc4JinHDue2EOKvXdPCDaIUawSP6464OPllmxydzop/bB7TUUS1iEa1w== X-Google-Smtp-Source: AGHT+IF3eUhkN3zYx8/x10T43160M9vT0mRxEMI4TYeB4aLW5P0SDoysFTrUqiYxT0eD3OxPTfUsZA== X-Received: by 2002:a17:90b:128a:b0:2c8:538d:95b7 with SMTP id 98e67ed59e1d1-2ca35d3dc19mr10932490a91.32.1720896704794; Sat, 13 Jul 2024 11:51:44 -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 98e67ed59e1d1-2caedbf7233sm1476709a91.22.2024.07.13.11.51.43 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 13 Jul 2024 11:51:44 -0700 (PDT) X-Mozilla-News-Host: news://news.gmane.io:119 Content-Language: en-US Received-SPF: pass client-ip=2607:f8b0:4864:20::102f; envelope-from=jporterbugs@gmail.com; helo=mail-pj1-x102f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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:288821 Archived-At: This is a multi-part message in MIME format. --------------FYR5ZHqMRyEQtjP0jGelHou9 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Steps to reproduce: emacs -Q M-x eshell-command RET oops C-g M-x eshell This will show the most-recent command in the Eshell history as "oops". That's because it was adding to the history in 'minibuffer-exit-hook', which runs regardless of *how* you exit the minibuffer. This regressed from 093a360251, and I misunderstood the conditions where 'minibuffer-exit-hook' runs. Attached is a patch to fix this. Is this ok for the release branch? --------------FYR5ZHqMRyEQtjP0jGelHou9 Content-Type: text/plain; charset=UTF-8; name="0001-Don-t-save-to-history-from-eshell-command-when-abort.patch" Content-Disposition: attachment; filename*0="0001-Don-t-save-to-history-from-eshell-command-when-abort.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSAyOWY0OTY3ZGQ4NzdjMTliODI3ZmI0NGNiMWMwMTk0NGQ0MDEyOTk1IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFNhdCwgMTMgSnVsIDIwMjQgMTE6NDM6NDIgLTA3MDAKU3ViamVjdDogW1BB VENIXSBEb24ndCBzYXZlIHRvIGhpc3RvcnkgZnJvbSAnZXNoZWxsLWNvbW1hbmQnIHdoZW4g YWJvcnRpbmcKCiogbGlzcC9lc2hlbGwvZXNoZWxsLmVsIChlc2hlbGwtYWRkLWlucHV0LXRv LWhpc3RvcnkpCihlc2hlbGwtLXNhdmUtaGlzdG9yeSk6IERlY2xhcmUuCihlc2hlbGwtY29t bWFuZC1tb2RlLWV4aXQpOiBOZXcgZnVuY3Rpb24uLi4KKGVzaGVsbC1jb21tYW5kLW1vZGUp OiAuLi4gdXNlIGl0LgoKKiBsaXNwL2VzaGVsbC9lbS1oaXN0LmVsIChlc2hlbGwtaGlzdC1p bml0aWFsaXplKTogRG9uJ3QgaGFuZGxlCm1pbmlidWZmZXIgbG9naWMgaGVyZS4gIEFsd2F5 cyByZWFkIGhpc3RvcnkgZmlsZSAodGhpcyBlbnN1cmVzIHRoYXQKJ2VzaGVsbC1jb21tYW5k JyBjYW4gc2VlIHRoZSBoaXN0b3J5LCB0b28pLgooZXNoZWxsLWFkZC1jb21tYW5kLXRvLWhp c3RvcnkpOiBSZW1vdmUuCi0tLQogbGlzcC9lc2hlbGwvZW0taGlzdC5lbCB8IDIwICsrLS0t LS0tLS0tLS0tLS0tLS0tCiBsaXNwL2VzaGVsbC9lc2hlbGwuZWwgIHwgMjAgKysrKysrKysr KysrKysrKy0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMTggaW5zZXJ0aW9ucygrKSwgMjIgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGlzcC9lc2hlbGwvZW0taGlzdC5lbCBiL2xpc3Av ZXNoZWxsL2VtLWhpc3QuZWwKaW5kZXggOWZmZGRmYjYxMWYuLmZmZmQ2MTFjMDZmIDEwMDY0 NAotLS0gYS9saXNwL2VzaGVsbC9lbS1oaXN0LmVsCisrKyBiL2xpc3AvZXNoZWxsL2VtLWhp c3QuZWwKQEAgLTI5NSwxMiArMjk1LDggQEAgZXNoZWxsLWhpc3QtaW5pdGlhbGl6ZQogICAo c2V0cS1sb2NhbCBlc2hlbGwtaGlzdC0tbmV3LWl0ZW1zIDApCiAKICAgKHNldHEtbG9jYWwg ZXNoZWxsLWhpc3RvcnktcmluZyBuaWwpCi0gIChpZiAobWluaWJ1ZmZlci13aW5kb3ctYWN0 aXZlLXAgKHNlbGVjdGVkLXdpbmRvdykpCi0gICAgICAocHJvZ24KLSAgICAgICAgKHNldHEt bG9jYWwgZXNoZWxsLWhpc3RvcnktYXBwZW5kIHQpCi0gICAgICAgIChhZGQtaG9vayAnbWlu aWJ1ZmZlci1leGl0LWhvb2sgIydlc2hlbGwtYWRkLWNvbW1hbmQtdG8taGlzdG9yeSBuaWwg dCkpCi0gICAgKGlmIGVzaGVsbC1oaXN0b3J5LWZpbGUtbmFtZQotCShlc2hlbGwtcmVhZC1o aXN0b3J5IG5pbCB0KSkpCisgICh3aGVuIGVzaGVsbC1oaXN0b3J5LWZpbGUtbmFtZQorICAg IChlc2hlbGwtcmVhZC1oaXN0b3J5IG5pbCB0KSkKIAogICAodW5sZXNzIGVzaGVsbC1oaXN0 b3J5LXJpbmcKICAgICAoc2V0cSBlc2hlbGwtaGlzdG9yeS1yaW5nIChtYWtlLXJpbmcgZXNo ZWxsLWhpc3Rvcnktc2l6ZSkpKQpAQCAtNDExLDE4ICs0MDcsNiBAQCBlc2hlbGwtYWRkLWlu cHV0LXRvLWhpc3RvcnkKICAgKHNldHEgZXNoZWxsLXNhdmUtaGlzdG9yeS1pbmRleCBlc2hl bGwtaGlzdG9yeS1pbmRleCkKICAgKHNldHEgZXNoZWxsLWhpc3RvcnktaW5kZXggbmlsKSkK IAotKGRlZnVuIGVzaGVsbC1hZGQtY29tbWFuZC10by1oaXN0b3J5ICgpCi0gICJBZGQgdGhl IGNvbW1hbmQgZW50ZXJlZCBhdCBgZXNoZWxsLWNvbW1hbmQncyBwcm9tcHQgdG8gdGhlIGhp c3RvcnkgcmluZy4KLVRoZSBjb21tYW5kIGlzIGFkZGVkIHRvIHRoZSBpbnB1dCBoaXN0b3J5 IHJpbmcsIGlmIHRoZSB2YWx1ZSBvZgotdmFyaWFibGUgYGVzaGVsbC1pbnB1dC1maWx0ZXIn IHJldHVybnMgbm9uLW5pbCB3aGVuIGNhbGxlZCBvbiB0aGUKLWNvbW1hbmQuCi0KLVRoaXMg ZnVuY3Rpb24gaXMgc3VwcG9zZWQgdG8gYmUgY2FsbGVkIGZyb20gdGhlIG1pbmlidWZmZXIs IHByZXN1bWFibHkKLWFzIGEgYG1pbmlidWZmZXItZXhpdC1ob29rJy4iCi0gIChlc2hlbGwt YWRkLWlucHV0LXRvLWhpc3RvcnkKLSAgIChidWZmZXItc3Vic3RyaW5nIChtaW5pYnVmZmVy LXByb21wdC1lbmQpIChwb2ludC1tYXgpKSkKLSAgKGVzaGVsbC0tc2F2ZS1oaXN0b3J5KSkK LQogKGRlZnVuIGVzaGVsbC1hZGQtdG8taGlzdG9yeSAoKQogICAiQWRkIGxhc3QgRXNoZWxs IGNvbW1hbmQgdG8gdGhlIGhpc3RvcnkgcmluZy4KIFRoZSBjb21tYW5kIGlzIGVudGVyZWQg aW50byB0aGUgaW5wdXQgaGlzdG9yeSByaW5nLCBpZiB0aGUgdmFsdWUgb2YKZGlmZiAtLWdp dCBhL2xpc3AvZXNoZWxsL2VzaGVsbC5lbCBiL2xpc3AvZXNoZWxsL2VzaGVsbC5lbAppbmRl eCBiN2JlM2RkMTY0My4uZDYwMTAxZDUxZTEgMTAwNjQ0Ci0tLSBhL2xpc3AvZXNoZWxsL2Vz aGVsbC5lbAorKysgYi9saXNwL2VzaGVsbC9lc2hlbGwuZWwKQEAgLTI4NCwxNCArMjg0LDI2 IEBAIGVzaGVsbAogICAgICAgKGVzaGVsbC1tb2RlKSkKICAgICBidWYpKQogCisoZGVjbGFy ZS1mdW5jdGlvbiBlc2hlbGwtYWRkLWlucHV0LXRvLWhpc3RvcnkgImVtLWhpc3QiIChpbnB1 dCkpCisoZGVjbGFyZS1mdW5jdGlvbiBlc2hlbGwtLXNhdmUtaGlzdG9yeSAiZW0taGlzdCIg KCkpCisKKyhkZWZ1biBlc2hlbGwtY29tbWFuZC1tb2RlLWV4aXQgKCkKKyAgIkV4aXQgdGhl IGBlc2hlbGwtY29tbWFkLW1vZGUnIG1pbmlidWZmZXIgYW5kIHNhdmUgRXNoZWxsIGhpc3Rv cnkuIgorICAoaW50ZXJhY3RpdmUpCisgICh3aGVuIChlc2hlbGwtdXNpbmctbW9kdWxlICdl c2hlbGwtaGlzdCkKKyAgICAoZXNoZWxsLWFkZC1pbnB1dC10by1oaXN0b3J5CisgICAgIChi dWZmZXItc3Vic3RyaW5nIChtaW5pYnVmZmVyLXByb21wdC1lbmQpIChwb2ludC1tYXgpKSkK KyAgICAoZXNoZWxsLS1zYXZlLWhpc3RvcnkpKQorICAoZXhpdC1taW5pYnVmZmVyKSkKKwog KGRlZmluZS1taW5vci1tb2RlIGVzaGVsbC1jb21tYW5kLW1vZGUKICAgIk1pbm9yIG1vZGUg Zm9yIGBlc2hlbGwtY29tbWFuZCcgaW5wdXQuCiBcXHtlc2hlbGwtY29tbWFuZC1tb2RlLW1h cH0iCiAgIDprZXltYXAgKGxldCAoKG1hcCAobWFrZS1zcGFyc2Uta2V5bWFwKSkpCi0gICAg ICAgICAgICAoZGVmaW5lLWtleSBtYXAgWyhjb250cm9sID9nKV0gJ2Fib3J0LXJlY3Vyc2l2 ZS1lZGl0KQotICAgICAgICAgICAgKGRlZmluZS1rZXkgbWFwIFsoY29udHJvbCA/bSldICdl eGl0LW1pbmlidWZmZXIpCi0gICAgICAgICAgICAoZGVmaW5lLWtleSBtYXAgWyhjb250cm9s ID9qKV0gJ2V4aXQtbWluaWJ1ZmZlcikKLSAgICAgICAgICAgIChkZWZpbmUta2V5IG1hcCBb KG1ldGEgY29udHJvbCA/bSldICdleGl0LW1pbmlidWZmZXIpCisgICAgICAgICAgICAoZGVm aW5lLWtleSBtYXAgWyhjb250cm9sID9nKV0gIydhYm9ydC1yZWN1cnNpdmUtZWRpdCkKKyAg ICAgICAgICAgIChkZWZpbmUta2V5IG1hcCBbKGNvbnRyb2wgP20pXSAjJ2VzaGVsbC1jb21t YW5kLW1vZGUtZXhpdCkKKyAgICAgICAgICAgIChkZWZpbmUta2V5IG1hcCBbKGNvbnRyb2wg P2opXSAjJ2VzaGVsbC1jb21tYW5kLW1vZGUtZXhpdCkKKyAgICAgICAgICAgIChkZWZpbmUt a2V5IG1hcCBbKG1ldGEgY29udHJvbCA/bSldICMnZXNoZWxsLWNvbW1hbmQtbW9kZS1leGl0 KQogICAgICAgICAgICAgbWFwKSkKIAogKGRlZmluZS1vYnNvbGV0ZS1mdW5jdGlvbi1hbGlh cyAnZXNoZWxsLXJldHVybi1leGl0cy1taW5pYnVmZmVyCi0tIAoyLjI1LjEKCg== --------------FYR5ZHqMRyEQtjP0jGelHou9--