From unknown Sun Jun 22 04:30:14 2025 X-Loop: help-debbugs@gnu.org Subject: bug#66768: 30.0.50; [PATCH] Improve read/append behavior of eshell history command Resent-From: Liu Hui Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 27 Oct 2023 04:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66768 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 66768@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169838022924230 (code B ref -1); Fri, 27 Oct 2023 04:18:02 +0000 Received: (at submit) by debbugs.gnu.org; 27 Oct 2023 04:17:09 +0000 Received: from localhost ([127.0.0.1]:34871 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qwEHV-0006Ij-5c for submit@debbugs.gnu.org; Fri, 27 Oct 2023 00:17:09 -0400 Received: from lists.gnu.org ([2001:470:142::17]:58592) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qwEHT-0006Hf-19 for submit@debbugs.gnu.org; Fri, 27 Oct 2023 00:17:07 -0400 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 1qwEGs-0002UF-JZ for bug-gnu-emacs@gnu.org; Fri, 27 Oct 2023 00:16:30 -0400 Received: from mail-vs1-xe2f.google.com ([2607:f8b0:4864:20::e2f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwEGq-0007ju-Br for bug-gnu-emacs@gnu.org; Fri, 27 Oct 2023 00:16:30 -0400 Received: by mail-vs1-xe2f.google.com with SMTP id ada2fe7eead31-457cc01b805so759296137.0 for ; Thu, 26 Oct 2023 21:16:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698380185; x=1698984985; darn=gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=bhnIvqiTq2F0QR70md648u6cCoEVIQ0v3CNJrmHuztM=; b=eciDnADIC070qu8mz6pXCMdFIDdl9Az55rjP4e+soSEEgq0eEpY0NBZORWHf0yez7y DsN8MdVmmJWZmO/JglDWTACfD0b3oJ8yg5zuA/vzMKGPb1Cf9AqzAESCVBtLlBh710US nuJ6eTJIBNL0kEhXH1QJCOV/3Narim+5saUusBVokCxo/P3m9oQwV/cw0XgC22jxEt0V xBZRBTkz6ya9GNQ6LZyedVy/6+hKqPNyFJYAzaVQp+NrV4XjrYNQjbIU/669Wc134tFd fwec3tOUTti8yce/CGgAx3OaG+YfcrTvxmH2oP3i2xchP7joeaqbhGIIzWlpPXulF1nq fZqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698380185; x=1698984985; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=bhnIvqiTq2F0QR70md648u6cCoEVIQ0v3CNJrmHuztM=; b=NoXKR/S8sIsqTMOFo1tfAtO1Xw6ThYaQjgfY1Eu29IBEwld63UiNTzfqdfdRB9YqKl 4l5tSaPVq9N0s1vsJkqkhTvqyMdixA+r/fPfmtB90X2lMES0wQLDS7aCjQglSKBqmr4V 9SE0eEIh40NkXw+ArlpzGbEBNmtYs3Z0f22C4PHtK15JYJc/zIkrdbELf0hjdN7ws/h9 nNKRxwjFgMsUt9RH9fKmYye1YccuUTGktRAFIgznkAegV58GlrB8kMzohcqi9opjc3bj aZ0j/+jR7Hu68NJ5WYydLMvgzHAmvzOHNViTVvIQarOTka3t2buxmgwZ6lt0C6sH5p33 VLAQ== X-Gm-Message-State: AOJu0Yxbr4wRAD38Agu4SRJUyVhmqwtvKB5WWZeQAgUPtgBAE2cWsqvn fnfI+6On/JQ9+gORD4J8Nz3cbk1eM0/z4Fv6mQNIuGk/eu8= X-Google-Smtp-Source: AGHT+IEsaE49cRxauQmS1n3a4c1Ir8udb6NKePfd+wBq748vKIXAkoVjBL1wVy8ZHcrtz0cRCJ4GvxwGRFdom0o1nxs= X-Received: by 2002:a67:e013:0:b0:45a:b852:9d6d with SMTP id c19-20020a67e013000000b0045ab8529d6dmr1598151vsl.13.1698380185671; Thu, 26 Oct 2023 21:16:25 -0700 (PDT) MIME-Version: 1.0 From: Liu Hui Date: Fri, 27 Oct 2023 12:15:00 +0800 Message-ID: Content-Type: multipart/mixed; boundary="000000000000a9a8e60608aaf30a" Received-SPF: pass client-ip=2607:f8b0:4864:20::e2f; envelope-from=liuhui1610@gmail.com; helo=mail-vs1-xe2f.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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_ENVFROM_END_DIGIT=0.25, 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-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi, This patch fixes some corner cases of the eshell history command about reading (-r) and appending (-a). Recipe: Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liuhui1610[at]gmail.com) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (liuhui1610[at]gmail.com) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) --000000000000a9a8e60608aaf30a Content-Type: text/plain; charset="UTF-8" Hi, This patch fixes some corner cases of the eshell history command about reading (-r) and appending (-a). Recipe: 1. create a sample history file containing some lines, e.g. ls 2. emacs -Q --eval "(setq eshell-history-file-name ...)" -f eshell 3. type following commands: $ ls $ history -a $ cd /tmp $ history -a 'history -a' doesn't distinguish old history from new history items of current buffer, and always appends the whole history list whenever it is called, resulting in a mess of the content of history file: ls ls ls history -a ls ls history -a cd /tmp/ history -a If another eshell buffer or emacs instance is launched before we quit this eshell buffer, they will read messed history. Thus this patch changes behavior of 'history -a' from "append current history list to history file" to "append new history in current buffer to history file", which is also consistent with bash's 'history -a'. 4. continue to type: $ (setq eshell-hist-ignoredups t) $ history -a; history -r $ history 'history -r', which calls eshell-read-history, doesn't remove consecutive "ls" duplicates from the history file. Thus this patch amends eshell-read-history to make it respect the eshell-hist-ignoredups option (both t and 'erase). Since 'history -r' replaces current history list, which is actually equivalent to bash's 'history -c; history -r', I have updated the help text. Maybe it should be split into two commands, i.e. adding 'history -c'? Best, -- Liu Hui --000000000000a9a8e60608aaf30a Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Improve-read-append-behavior-of-eshell-history-comma.patch" Content-Disposition: attachment; filename="0001-Improve-read-append-behavior-of-eshell-history-comma.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lo7zdb4g0 RnJvbSAyMGFkNzA5OTVjNWZiYmI2NGU4NTAxZjVmMWIyMTZlMTdiMzkwMGFjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMaXUgSHVpIDxsaXVodWkxNjEwQGdtYWlsLmNvbT4KRGF0ZTog RnJpLCAyNyBPY3QgMjAyMyAxMDowNzowOSArMDgwMApTdWJqZWN0OiBbUEFUQ0hdIEltcHJvdmUg cmVhZC9hcHBlbmQgYmVoYXZpb3Igb2YgZXNoZWxsIGhpc3RvcnkgY29tbWFuZAoKKiBsaXNwL2Vz aGVsbC9lbS1oaXN0LmVsIChlc2hlbGwtaGlzdC0tbmV3LWl0ZW1zKTogTmV3IHZhcmlhYmxlLgoo ZXNoZWxsLWhpc3QtaW5pdGlhbGl6ZSk6IFNldCBgZXNoZWxsLWhpc3QtLW5ldy1pdGVtcycuCihl c2hlbGwvaGlzdG9yeSk6IENoYW5nZSB0aGUgYmVoYXZpb3Igb2YgJ2hpc3RvcnkgLWEnIHRvICJh cHBlbmQgbmV3Cmhpc3RvcnkgaW4gY3VycmVudCBidWZmZXIgdG8gaGlzdG9yeSBmaWxlIi4gIFVw ZGF0ZSBoZWxwIHRleHQuCihlc2hlbGwtYWRkLWlucHV0LXRvLWhpc3RvcnkpOiBJbmNyZWFzZSBj b3VudGVyIG9mIG5ldyBoaXN0b3J5IGl0ZW1zLgooZXNoZWxsLXJlYWQtaGlzdG9yeSk6IFJlc3Bl Y3QgZXNoZWxsLWhpc3QtaWdub3JlZHVwcyBvcHRpb24uCihlc2hlbGwtd3JpdGUtaGlzdG9yeSk6 IEFkZCBvcHRpb25hbCBhcmd1bWVudCBORVctSVRFTVMgYW5kIHN1cHBvcnQKd3JpdGluZyBvbmx5 IG5ldyBoaXN0b3J5IGl0ZW1zIHRvIGhpc3RvcnkgZmlsZS4KLS0tCiBsaXNwL2VzaGVsbC9lbS1o aXN0LmVsIHwgNDcgKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tCiAx IGZpbGUgY2hhbmdlZCwgMzEgaW5zZXJ0aW9ucygrKSwgMTYgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvbGlzcC9lc2hlbGwvZW0taGlzdC5lbCBiL2xpc3AvZXNoZWxsL2VtLWhpc3QuZWwKaW5k ZXggOWQ0YjcyYjAxZGYuLjQ2YmQ4NzM1YzNjIDEwMDY0NAotLS0gYS9saXNwL2VzaGVsbC9lbS1o aXN0LmVsCisrKyBiL2xpc3AvZXNoZWxsL2VtLWhpc3QuZWwKQEAgLTE5NSw2ICsxOTUsOSBAQCBl c2hlbGwtaGlzdG9yeS1yaW5nCiAoZGVmdmFyIGVzaGVsbC1oaXN0b3J5LWluZGV4IG5pbCkKIChk ZWZ2YXIgZXNoZWxsLW1hdGNoaW5nLWlucHV0LWZyb20taW5wdXQtc3RyaW5nICIiKQogKGRlZnZh ciBlc2hlbGwtc2F2ZS1oaXN0b3J5LWluZGV4IG5pbCkKKyhkZWZ2YXIgZXNoZWxsLWhpc3QtLW5l dy1pdGVtcyAwCisgICJUaGUgbnVtYmVyIG9mIG5ldyBoaXN0b3J5IGl0ZW1zIHRoYXQgaGF2ZSBu b3QgYmVlbiB3cml0dGVuIHRvCitmaWxlLiAgVGhpcyB2YXJpYWJsZSBpcyBsb2NhbCBpbiBlYWNo IGVzaGVsbCBidWZmZXIuIikKIAogKGRlZnZhci1rZXltYXAgZXNoZWxsLWlzZWFyY2gtbWFwCiAg IDpkb2MgIktleW1hcCB1c2VkIGluIGlzZWFyY2ggaW4gRXNoZWxsLiIKQEAgLTI4Myw2ICsyODYs NyBAQCBlc2hlbGwtaGlzdC1pbml0aWFsaXplCiAKICAgKG1ha2UtbG9jYWwtdmFyaWFibGUgJ2Vz aGVsbC1oaXN0b3J5LWluZGV4KQogICAobWFrZS1sb2NhbC12YXJpYWJsZSAnZXNoZWxsLXNhdmUt aGlzdG9yeS1pbmRleCkKKyAgKG1ha2UtbG9jYWwtdmFyaWFibGUgJ2VzaGVsbC1oaXN0LS1uZXct aXRlbXMpCiAKICAgKGlmIChtaW5pYnVmZmVyLXdpbmRvdy1hY3RpdmUtcCAoc2VsZWN0ZWQtd2lu ZG93KSkKICAgICAgIChzZXRxLWxvY2FsIGVzaGVsbC1zYXZlLWhpc3Rvcnktb24tZXhpdCBuaWwp CkBAIC0zMjMsMTEgKzMyNywxMSBAQCBlc2hlbGwvaGlzdG9yeQogICAoZXNoZWxsLWV2YWwtdXNp bmctb3B0aW9ucwogICAgImhpc3RvcnkiIGFyZ3MKICAgICcoKD9yICJyZWFkIiBuaWwgcmVhZC1o aXN0b3J5Ci0JICJyZWFkIGZyb20gaGlzdG9yeSBmaWxlIHRvIGN1cnJlbnQgaGlzdG9yeSBsaXN0 IikKKwkgImNsZWFyIGN1cnJlbnQgaGlzdG9yeSBsaXN0IGFuZCByZWFkIGZyb20gaGlzdG9yeSBm aWxlIHRvIGl0IikKICAgICAgKD93ICJ3cml0ZSIgbmlsIHdyaXRlLWhpc3RvcnkKIAkgIndyaXRl IGN1cnJlbnQgaGlzdG9yeSBsaXN0IHRvIGhpc3RvcnkgZmlsZSIpCiAgICAgICg/YSAiYXBwZW5k IiBuaWwgYXBwZW5kLWhpc3RvcnkKLQkgImFwcGVuZCBjdXJyZW50IGhpc3RvcnkgbGlzdCB0byBo aXN0b3J5IGZpbGUiKQorCSAiYXBwZW5kIG5ldyBoaXN0b3J5IGluIGN1cnJlbnQgYnVmZmVyIHRv IGhpc3RvcnkgZmlsZSIpCiAgICAgICg/aCAiaGVscCIgbmlsIG5pbCAiZGlzcGxheSB0aGlzIHVz YWdlIG1lc3NhZ2UiKQogICAgICA6dXNhZ2UgIltuXSBbLXJ3YSBbZmlsZW5hbWVdXSIKICAgICAg OnBvc3QtdXNhZ2UKQEAgLTM1MSw3ICszNTUsNyBAQCBlc2hlbGwvaGlzdG9yeQogICAgICAoY29u ZAogICAgICAgKHJlYWQtaGlzdG9yeSAoZXNoZWxsLXJlYWQtaGlzdG9yeSBmaWxlKSkKICAgICAg ICh3cml0ZS1oaXN0b3J5IChlc2hlbGwtd3JpdGUtaGlzdG9yeSBmaWxlKSkKLSAgICAgIChhcHBl bmQtaGlzdG9yeSAoZXNoZWxsLXdyaXRlLWhpc3RvcnkgZmlsZSB0KSkKKyAgICAgIChhcHBlbmQt aGlzdG9yeSAoZXNoZWxsLXdyaXRlLWhpc3RvcnkgZmlsZSAnYXBwZW5kICduZXctaXRlbXMpKQog ICAgICAgKHQKICAgICAgICAobGV0KiAoKGluZGV4ICgxLSAob3IgbGVuZ3RoIChyaW5nLWxlbmd0 aCBlc2hlbGwtaGlzdG9yeS1yaW5nKSkpKQogCSAgICAgIChyZWYgKC0gKHJpbmctbGVuZ3RoIGVz aGVsbC1oaXN0b3J5LXJpbmcpIGluZGV4KSkpCkBAIC0zOTQsNiArMzk4LDggQEAgZXNoZWxsLWFk ZC1pbnB1dC10by1oaXN0b3J5CiAgICAgICAgICAgICAgICAoXyAgICAgICAgICAgICAgICAgICAg ICAgOyBBZGQgaWYgbm90IGFscmVhZHkgdGhlIGxhdGVzdCBlbnRyeQogICAgICAgICAgICAgICAg IChvciAocmluZy1lbXB0eS1wIGVzaGVsbC1oaXN0b3J5LXJpbmcpCiAgICAgICAgICAgICAgICAg ICAgIChub3QgKHN0cmluZy1lcXVhbCAoZXNoZWxsLWdldC1oaXN0b3J5IDApIGlucHV0KSkpKSkp CisgICAgKHNldHEgZXNoZWxsLWhpc3QtLW5ldy1pdGVtcworICAgICAgICAgIChtaW4gZXNoZWxs LWhpc3Rvcnktc2l6ZSAoMSsgZXNoZWxsLWhpc3QtLW5ldy1pdGVtcykpKQogICAgIChlc2hlbGwt cHV0LWhpc3RvcnkgaW5wdXQpKQogICAoc2V0cSBlc2hlbGwtc2F2ZS1oaXN0b3J5LWluZGV4IGVz aGVsbC1oaXN0b3J5LWluZGV4KQogICAoc2V0cSBlc2hlbGwtaGlzdG9yeS1pbmRleCBuaWwpKQpA QCAtNDU1LDIxICs0NjEsMjggQEAgZXNoZWxsLXJlYWQtaGlzdG9yeQogCQkgICAgICAocmUtc2Vh cmNoLWJhY2t3YXJkICJeWyBcdF0qXFwoW14jXG5dLipcXClbIFx0XSokIgogCQkJCQkgIG5pbCB0 KSkKIAkgICAgKGxldCAoKGhpc3RvcnkgKG1hdGNoLXN0cmluZyAxKSkpCi0JICAgICAgKGlmIChv ciAobnVsbCBpZ25vcmUtZHVwcykKLQkJICAgICAgKHJpbmctZW1wdHktcCByaW5nKQotCQkgICAg ICAobm90IChzdHJpbmctZXF1YWwgKHJpbmctcmVmIHJpbmcgMCkgaGlzdG9yeSkpKQotCQkgIChy aW5nLWluc2VydC1hdC1iZWdpbm5pbmcKKyAgICAgICAgICAgICAgKGlmIChvciAocmluZy1lbXB0 eS1wIHJpbmcpCisgICAgICAgICAgICAgICAgICAgICAgKG51bGwgaWdub3JlLWR1cHMpCisgICAg ICAgICAgICAgICAgICAgICAgKGFuZCAobm90IChzdHJpbmctZXF1YWwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIChyaW5nLXJlZiByaW5nICgxLSAocmluZy1sZW5ndGggcmluZykp KQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaGlzdG9yeSkpCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAobm90IChhbmQgKGVxIGlnbm9yZS1kdXBzICdlcmFzZSkKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAocmluZy1tZW1iZXIgcmluZyBoaXN0b3J5 KSkpKSkKKyAgICAgICAgICAgICAgICAgIChyaW5nLWluc2VydC1hdC1iZWdpbm5pbmcKIAkJICAg cmluZyAoc3Vic3QtY2hhci1pbi1zdHJpbmcgP1wxNzcgP1xuIGhpc3RvcnkpKSkpCiAJICAgIChz ZXRxIGNvdW50ICgxKyBjb3VudCkpKSkKIAkoc2V0cSBlc2hlbGwtaGlzdG9yeS1yaW5nIHJpbmcK LQkgICAgICBlc2hlbGwtaGlzdG9yeS1pbmRleCBuaWwpKSkpKSkKKwkgICAgICBlc2hlbGwtaGlz dG9yeS1pbmRleCBuaWwKKyAgICAgICAgICAgICAgZXNoZWxsLWhpc3QtLW5ldy1pdGVtcyAwKSkp KSkpCiAKLShkZWZ1biBlc2hlbGwtd3JpdGUtaGlzdG9yeSAoJm9wdGlvbmFsIGZpbGVuYW1lIGFw cGVuZCkKKyhkZWZ1biBlc2hlbGwtd3JpdGUtaGlzdG9yeSAoJm9wdGlvbmFsIGZpbGVuYW1lIGFw cGVuZCBuZXctaXRlbXMpCiAgICJXcml0ZXMgdGhlIGJ1ZmZlcidzIGBlc2hlbGwtaGlzdG9yeS1y aW5nJyB0byBhIGhpc3RvcnkgZmlsZS4KLVRoZSBuYW1lIG9mIHRoZSBmaWxlIGlzIGdpdmVuIGJ5 IHRoZSB2YXJpYWJsZQotYGVzaGVsbC1oaXN0b3J5LWZpbGUtbmFtZScuICBUaGUgb3JpZ2luYWwg Y29udGVudHMgb2YgdGhlIGZpbGUgYXJlCi1sb3N0IGlmIGBlc2hlbGwtaGlzdG9yeS1yaW5nJyBp cyBub3QgZW1wdHkuICBJZgotYGVzaGVsbC1oaXN0b3J5LWZpbGUtbmFtZScgaXMgbmlsIHRoaXMg ZnVuY3Rpb24gZG9lcyBub3RoaW5nLgorSWYgdGhlIG9wdGlvbmFsIGFyZ3VtZW50IEZJTEVOQU1F IGlzIG5pbCwgdGhlIHZhbHVlIG9mCitgZXNoZWxsLWhpc3RvcnktZmlsZS1uYW1lJyBpcyB1c2Vk LiAgVGhpcyBmdW5jdGlvbiBkb2VzIG5vdGhpbmcKK2lmIHRoZSB2YWx1ZSByZXNvbHZlcyB0byBu aWwuICBUaGUgb3B0aW9uYWwgYXJndW1lbnQgQVBQRU5EIGhhcwordGhlIHNhbWUgbWVhbmluZyBh cyB0aGF0IGluIGB3cml0ZS1yZWdpb24nLiAgSWYgdGhlIG9wdGlvbmFsCithcmd1bWVudCBORVct SVRFTVMgaXMgbm9uLW5pbCwgd3JpdGVzIG9ubHkgbmV3IGhpc3RvcnkgaXRlbXMgdGhhdAoraGF2 ZSBub3QgYmVlbiB3cml0dGVuIHRvIGFueSBoaXN0b3J5IGZpbGUgeWV0LgogCiBVc2VmdWwgd2l0 aGluIHByb2Nlc3Mgc2VudGluZWxzLgogCkBAIC00ODAsMTMgKzQ5MywxNCBAQCBlc2hlbGwtd3Jp dGUtaGlzdG9yeQogICAgICAoKG9yIChudWxsIGZpbGUpCiAJICAoZXF1YWwgZmlsZSAiIikKIAkg IChudWxsIGVzaGVsbC1oaXN0b3J5LXJpbmcpCi0JICAocmluZy1lbXB0eS1wIGVzaGVsbC1oaXN0 b3J5LXJpbmcpKQorCSAgKHJpbmctZW1wdHktcCBlc2hlbGwtaGlzdG9yeS1yaW5nKQorICAgICAg ICAgIChhbmQgbmV3LWl0ZW1zICg9IGVzaGVsbC1oaXN0LS1uZXctaXRlbXMgMCkpKQogICAgICAg bmlsKQogICAgICAoKG5vdCAoZmlsZS13cml0YWJsZS1wIHJlc29sdmVkLWZpbGUpKQogICAgICAg KG1lc3NhZ2UgIkNhbm5vdCB3cml0ZSBoaXN0b3J5IGZpbGUgJXMiIHJlc29sdmVkLWZpbGUpKQog ICAgICAodAogICAgICAgKGxldCogKChyaW5nIGVzaGVsbC1oaXN0b3J5LXJpbmcpCi0JICAgICAo aW5kZXggKHJpbmctbGVuZ3RoIHJpbmcpKSkKKwkgICAgIChpbmRleCAoaWYgbmV3LWl0ZW1zIGVz aGVsbC1oaXN0LS1uZXctaXRlbXMgKHJpbmctbGVuZ3RoIHJpbmcpKSkpCiAJOzsgV3JpdGUgaXQg YWxsIG91dCBpbnRvIGEgYnVmZmVyIGZpcnN0LiAgTXVjaCBmYXN0ZXIsIGJ1dAogCTs7IG1lc3Np ZXIsIHRoYW4gd3JpdGluZyBpdCBvbmUgbGluZSBhdCBhIHRpbWUuCiAJKHdpdGgtdGVtcC1idWZm ZXIKQEAgLTQ5OSw3ICs1MTMsOCBAQCBlc2hlbGwtd3JpdGUtaGlzdG9yeQogCSAgICAgIChzdWJz dC1jaGFyLWluLXJlZ2lvbiBzdGFydCAoMS0gKHBvaW50KSkgP1xuID9cMTc3KSkpCiAJICAoZXNo ZWxsLXdpdGgtcHJpdmF0ZS1maWxlLW1vZGVzCiAJICAgKHdyaXRlLXJlZ2lvbiAocG9pbnQtbWlu KSAocG9pbnQtbWF4KSByZXNvbHZlZC1maWxlIGFwcGVuZAotCQkJICduby1tZXNzYWdlKSkpKSkp KSkKKwkJCSAnbm8tbWVzc2FnZSkpKQorICAgICAgICAoc2V0cSBlc2hlbGwtaGlzdC0tbmV3LWl0 ZW1zIDApKSkpKSkKIAogKGRlZnVuIGVzaGVsbC1saXN0LWhpc3RvcnkgKCkKICAgIkxpc3QgaW4g aGVscCBidWZmZXIgdGhlIGJ1ZmZlcidzIGlucHV0IGhpc3RvcnkuIgotLSAKMi4yNS4xCgo= --000000000000a9a8e60608aaf30a-- From unknown Sun Jun 22 04:30:14 2025 X-Loop: help-debbugs@gnu.org Subject: bug#66768: 30.0.50; [PATCH] Improve read/append behavior of eshell history command Resent-From: Jim Porter Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 03 Nov 2023 19:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66768 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Liu Hui , 66768@debbugs.gnu.org Received: via spool by 66768-submit@debbugs.gnu.org id=B66768.169904036227388 (code B ref 66768); Fri, 03 Nov 2023 19:40:02 +0000 Received: (at 66768) by debbugs.gnu.org; 3 Nov 2023 19:39:22 +0000 Received: from localhost ([127.0.0.1]:59864 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qz00n-00077g-Vg for submit@debbugs.gnu.org; Fri, 03 Nov 2023 15:39:22 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]:60543) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qz00l-00077O-Bi for 66768@debbugs.gnu.org; Fri, 03 Nov 2023 15:39:20 -0400 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-6c3077984e8so2355860b3a.0 for <66768@debbugs.gnu.org>; Fri, 03 Nov 2023 12:38:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699040318; x=1699645118; darn=debbugs.gnu.org; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:mime-version:date:message-id:from:to:cc :subject:date:message-id:reply-to; bh=BcUXs2hTx4u3mPntPy448L+vGAxIkvMQFd/DZjlDyw8=; b=MUarj2SeBs3O20NeVa6D+lcV2BF1lukdUSB0WlK0lQVbw+Av/TDFVX3rhkKrQSMy1e vGAhEeD33V3jly0tKRYkC/Bd82dp6QdRZ0/jjqVJwOObpfNYQ/VN6wDY3wj/7TZBr7Tm dO4OqrpMM2HPLttYZ2N02SNLOEmKB38kOrGZfBOKdFcJfOGsv4kmCHradd9G/pTRMvgn Jwf4lFlRpyO0PWXr7o/CiinclfAs8cAPGKknOrrjy7kmpRLWeFSNbPE3+UCK8n9tlD2+ gsV744BWLhNnqUYoqAG7icP2wZ5DdAwboiI9K6IZ1/XADLjGS09oWEmVxrUzgEkmvAEa //NA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699040318; x=1699645118; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=BcUXs2hTx4u3mPntPy448L+vGAxIkvMQFd/DZjlDyw8=; b=sMH4SO0MRmxR3djSW2v5aBnDxUHi/SmrQrI5IEoYi+zFlD9Y4ytGf9zFHVYDSNsfOb HcIn8YyW2iSSEN3FJdmnRfCulnT6w3SuDOFmEjAiMUSfNxgKZdpXMVxA/Asp3eVsMk7E 0/cCYciZn5sXZhl1nkJlFA9qB+7VmDv5w80CvRxXvtkIBHRf70+3NQkXizpgG+X3u+Kj HAafgbALQ0MC9Qr131OENgFtN2epq+AHOCUlyhDpLfytzeEzu0no8Gge6Em/94icU2Jr 878DFdeFFEMQ3QUOotyZzZWBqBzfORLIMQRTExzYLkvC61+DMoUysUaq871dqiTxbF07 dZkQ== X-Gm-Message-State: AOJu0YyF0VnUM0URY8s35HH0b5zxnYeH0taDgwWSU7kTxH94MHHiehwC hwJEtCITga0M4PEyx5agQnY= X-Google-Smtp-Source: AGHT+IF9XR215YEx3sS7zX09eib3q63vhbWff7a3fXFGfLN8fPs8NUR3wsmP3CNO1EfbIzEILMmKgQ== X-Received: by 2002:a05:6a00:cc8:b0:68f:dd50:aef8 with SMTP id b8-20020a056a000cc800b0068fdd50aef8mr24663787pfv.4.1699040317642; Fri, 03 Nov 2023 12:38:37 -0700 (PDT) Received: from [192.168.1.2] (cpe-76-168-148-233.socal.res.rr.com. [76.168.148.233]) by smtp.googlemail.com with ESMTPSA id t8-20020a63dd08000000b005b628aa2a8dsm1589926pgg.69.2023.11.03.12.38.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 03 Nov 2023 12:38:37 -0700 (PDT) Message-ID: <3d7b6c5e-ee22-91a2-93bd-1fd99d3eb301@gmail.com> Date: Fri, 3 Nov 2023 12:38:35 -0700 MIME-Version: 1.0 Content-Language: en-US References: From: Jim Porter In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 10/26/2023 9:15 PM, Liu Hui wrote: > This patch fixes some corner cases of the eshell history command about > reading (-r) and appending (-a). Thanks for the patch. I think this makes sense overall, though I do want to go through em-hist.el at some point and rework how shared history functions. (I use shared history from multiple Zsh shells pretty extensively, so I'm hoping to at least provide the necessary hooks to make Eshell work like my setup.) In the meantime though, this is a step in the right direction. Some comments on the code: > +(defvar eshell-hist--new-items 0 > + "The number of new history items that have not been written to > +file. This variable is local in each eshell buffer.") To prevent mistakes, I'd set this to nil here, and then call '(setq-local eshell-hist--new-items 0)' in 'eshell-hist-initialize'. > -(defun eshell-write-history (&optional filename append) > +(defun eshell-write-history (&optional filename append new-items) I don't think this new argument is necessary. I suppose you did this for backwards-compatibility, but I'd say that the current appending behavior is just a bug, so you don't need to add an explicit way to opt into your new behavior; just do it whenever 'append' is non-nil. Some regression tests would also be nice. There are already a few in test/lisp/eshell/em-hist-tests.el that you should be able to use as a basis. From unknown Sun Jun 22 04:30:14 2025 X-Loop: help-debbugs@gnu.org Subject: bug#66768: 30.0.50; [PATCH] Improve read/append behavior of eshell history command Resent-From: Liu Hui Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 07 Nov 2023 10:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66768 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Jim Porter Cc: 66768@debbugs.gnu.org Received: via spool by 66768-submit@debbugs.gnu.org id=B66768.169935212718061 (code B ref 66768); Tue, 07 Nov 2023 10:16:01 +0000 Received: (at 66768) by debbugs.gnu.org; 7 Nov 2023 10:15:27 +0000 Received: from localhost ([127.0.0.1]:41349 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0J7H-0004hE-52 for submit@debbugs.gnu.org; Tue, 07 Nov 2023 05:15:27 -0500 Received: from mail-vk1-xa33.google.com ([2607:f8b0:4864:20::a33]:43469) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0J7F-0004h1-KQ for 66768@debbugs.gnu.org; Tue, 07 Nov 2023 05:15:26 -0500 Received: by mail-vk1-xa33.google.com with SMTP id 71dfb90a1353d-4ac211e5bbbso1732643e0c.1 for <66768@debbugs.gnu.org>; Tue, 07 Nov 2023 02:14:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699352082; x=1699956882; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=5Ekls6L27Tgsxca982FNrSkGSUPxeh8meGXrtxE1BI0=; b=Oc4SkbSq7Wc55zlmj1dA3D378zA4Qfc8a7k+Gq3VBhhohdBua1BZvqTm/Z3hwbNCFk TRdvnytDO6qhQTemmMpRXbbwWXZr1wB+4BYTMdMrxaSrdOYJMIwk6IOuWVLGO9HcKznb N711AQMZx4nYvpWJFz95J+8LiDfar3Cb7irGdRoFgEyyWUxtOR+qviWQ4aMa4M9OE0h+ +zAgTO5iblVM+6QFx56dfF6QiA8bkrYMHRp77emA9Es95eIjqQJlP6yzY9jUs4rvrR6h iEj+qj4DV+CRu0IQAQMiZAeobfacxc3iS56qdOrd92a5J/N/qdBqDmD05bWoPDv3REa/ qSTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699352082; x=1699956882; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=5Ekls6L27Tgsxca982FNrSkGSUPxeh8meGXrtxE1BI0=; b=GiclSqeDDCZlTH8SdQq6BEak33/NYl1Hc3tGd0GYbtc/71BGYcfkHBw7QggtmCJTM7 ROfOM/DHw2khpEf3IpcUaau0m8dvP+aiESmYmIEEmxfFcsgh1G0A4TuHdSsCIFlX4jD1 Q2w8zRDaNmqT24iNxrTtYGM6UTWlDpvVfGQPcAzGKOH2amAaa+G14Gz4lpvPKeChPW+O kled2Y9tDJCOHWCyxoaJQRGIyJIAwVEV//IvjF7WZ3o+xwpjaCsDBnfMey/qyATc20i7 DGtvTIgyrLTwlbBofRp4dhaQDJU+Ad9U5xD9ypTURh97x5HopFbkX/yOoY+/MxNAnp5r McjA== X-Gm-Message-State: AOJu0YwDKancPG6/j8OBarvcoFPTZGegZGoEoga6c3WqJQj2nspkPqRX BFJHolgkLKTYHvBItund/CQhy03lVphBqzCfebw= X-Google-Smtp-Source: AGHT+IH8s5H3vSr+h+ErRe6nD6z5bsWHU1hlCHmpFQgmy5TKaAU0TEqgiFc1M+S9TZeLs4MOohKUD2BxFvIKAajEf9E= X-Received: by 2002:a1f:ac04:0:b0:49a:b9ed:8c19 with SMTP id v4-20020a1fac04000000b0049ab9ed8c19mr1047264vke.7.1699352082015; Tue, 07 Nov 2023 02:14:42 -0800 (PST) MIME-Version: 1.0 References: <3d7b6c5e-ee22-91a2-93bd-1fd99d3eb301@gmail.com> In-Reply-To: <3d7b6c5e-ee22-91a2-93bd-1fd99d3eb301@gmail.com> From: Liu Hui Date: Tue, 7 Nov 2023 18:14:30 +0800 Message-ID: Content-Type: multipart/mixed; boundary="00000000000032d51a06098d3d03" X-Spam-Score: 0.3 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --00000000000032d51a06098d3d03 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Jim Porter =E4=BA=8E2023=E5=B9=B411=E6=9C=884=E6=97= =A5=E5=91=A8=E5=85=AD 03:38=E5=86=99=E9=81=93=EF=BC=9A > In the meantime though, this is a step in the right direction. Some > comments on the code: > > > +(defvar eshell-hist--new-items 0 > > + "The number of new history items that have not been written to > > +file. This variable is local in each eshell buffer.") > > To prevent mistakes, I'd set this to nil here, and then call > '(setq-local eshell-hist--new-items 0)' in 'eshell-hist-initialize'. > > > -(defun eshell-write-history (&optional filename append) > > +(defun eshell-write-history (&optional filename append new-items) > > I don't think this new argument is necessary. I suppose you did this for > backwards-compatibility, but I'd say that the current appending behavior > is just a bug, so you don't need to add an explicit way to opt into your > new behavior; just do it whenever 'append' is non-nil. > > Some regression tests would also be nice. There are already a few in > test/lisp/eshell/em-hist-tests.el that you should be able to use as a bas= is. Thanks for your comments! I've updated the patch to address all concerns. --00000000000032d51a06098d3d03 Content-Type: application/x-patch; name="0001-Improve-read-append-behavior-of-eshell-history-comma.patch" Content-Disposition: attachment; filename="0001-Improve-read-append-behavior-of-eshell-history-comma.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_loo6bfgh0 RnJvbSAzYjg3NWI4OWViNjliNDczMzM3M2Q4YTc5YzI3NmJkZGY4MzU2MTMwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMaXUgSHVpIDxsaXVodWkxNjEwQGdtYWlsLmNvbT4KRGF0ZTog VHVlLCA3IE5vdiAyMDIzIDA5OjEwOjU5ICswODAwClN1YmplY3Q6IFtQQVRDSF0gSW1wcm92ZSBy ZWFkL2FwcGVuZCBiZWhhdmlvciBvZiBlc2hlbGwgaGlzdG9yeSBjb21tYW5kCgoqIGxpc3AvZXNo ZWxsL2VtLWhpc3QuZWwgKGVzaGVsbC1oaXN0LS1uZXctaXRlbXMpOiBOZXcgdmFyaWFibGUuCihl c2hlbGwtaGlzdC1pbml0aWFsaXplKTogSW5pdGlhbGl6ZSBgZXNoZWxsLWhpc3QtLW5ldy1pdGVt cycgdG8gMC4KKGVzaGVsbC9oaXN0b3J5KTogQ2hhbmdlIHRoZSBiZWhhdmlvciBvZiAnaGlzdG9y eSAtYScgdG8gImFwcGVuZCBuZXcKaGlzdG9yeSBpbiBjdXJyZW50IGJ1ZmZlciB0byBoaXN0b3J5 IGZpbGUiLiAgQ2xhcmlmeSB0aGUgaGVscCB0ZXh0IG9mCidoaXN0b3J5IC1yJy4KKGVzaGVsbC1h ZGQtaW5wdXQtdG8taGlzdG9yeSk6IEluY3JlYXNlIGNvdW50ZXIgb2YgbmV3IGhpc3RvcnkgaXRl bXMuCihlc2hlbGwtcmVhZC1oaXN0b3J5KTogUmVzcGVjdCBlc2hlbGwtaGlzdC1pZ25vcmVkdXBz IG9wdGlvbi4KKGVzaGVsbC13cml0ZS1oaXN0b3J5KTogSWYgdGhlIG9wdGlvbmFsIGFyZ3VtZW50 IEFQUEVORCBpcyBub24tbmlsLAphcHBlbmRpbmcgbmV3IGhpc3RvcnkgaXRlbXMgcmF0aGVyIHRo YW4gdGhlIHdob2xlIGhpc3RvcnkuCiogdGVzdC9saXNwL2VzaGVsbC9lbS1oaXN0LXRlc3RzLmVs IChlbS1oaXN0LXRlc3QvaGlzdG9yeS1hcHBlbmQpOgooZW0taGlzdC10ZXN0L2hpc3RvcnktcmVh ZCk6IE5ldyB0ZXN0cy4KLS0tCiBsaXNwL2VzaGVsbC9lbS1oaXN0LmVsICAgICAgICAgICAgfCA0 NyArKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tCiB0ZXN0L2xpc3AvZXNoZWxsL2VtLWhp c3QtdGVzdHMuZWwgfCAzNCArKysrKysrKysrKysrKysrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQs IDY1IGluc2VydGlvbnMoKyksIDE2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpc3AvZXNo ZWxsL2VtLWhpc3QuZWwgYi9saXNwL2VzaGVsbC9lbS1oaXN0LmVsCmluZGV4IDlkNGI3MmIwMWRm Li43NzVmMzJjNjUxOCAxMDA2NDQKLS0tIGEvbGlzcC9lc2hlbGwvZW0taGlzdC5lbAorKysgYi9s aXNwL2VzaGVsbC9lbS1oaXN0LmVsCkBAIC0xOTUsNiArMTk1LDkgQEAgZXNoZWxsLWhpc3Rvcnkt cmluZwogKGRlZnZhciBlc2hlbGwtaGlzdG9yeS1pbmRleCBuaWwpCiAoZGVmdmFyIGVzaGVsbC1t YXRjaGluZy1pbnB1dC1mcm9tLWlucHV0LXN0cmluZyAiIikKIChkZWZ2YXIgZXNoZWxsLXNhdmUt aGlzdG9yeS1pbmRleCBuaWwpCisoZGVmdmFyIGVzaGVsbC1oaXN0LS1uZXctaXRlbXMgbmlsCisg ICJUaGUgbnVtYmVyIG9mIG5ldyBoaXN0b3J5IGl0ZW1zIHRoYXQgaGF2ZSBub3QgYmVlbiB3cml0 dGVuIHRvCitmaWxlLiAgVGhpcyB2YXJpYWJsZSBpcyBsb2NhbCBpbiBlYWNoIGVzaGVsbCBidWZm ZXIuIikKIAogKGRlZnZhci1rZXltYXAgZXNoZWxsLWlzZWFyY2gtbWFwCiAgIDpkb2MgIktleW1h cCB1c2VkIGluIGlzZWFyY2ggaW4gRXNoZWxsLiIKQEAgLTI4Myw2ICsyODYsNyBAQCBlc2hlbGwt aGlzdC1pbml0aWFsaXplCiAKICAgKG1ha2UtbG9jYWwtdmFyaWFibGUgJ2VzaGVsbC1oaXN0b3J5 LWluZGV4KQogICAobWFrZS1sb2NhbC12YXJpYWJsZSAnZXNoZWxsLXNhdmUtaGlzdG9yeS1pbmRl eCkKKyAgKHNldHEtbG9jYWwgZXNoZWxsLWhpc3QtLW5ldy1pdGVtcyAwKQogCiAgIChpZiAobWlu aWJ1ZmZlci13aW5kb3ctYWN0aXZlLXAgKHNlbGVjdGVkLXdpbmRvdykpCiAgICAgICAoc2V0cS1s b2NhbCBlc2hlbGwtc2F2ZS1oaXN0b3J5LW9uLWV4aXQgbmlsKQpAQCAtMzIzLDExICszMjcsMTEg QEAgZXNoZWxsL2hpc3RvcnkKICAgKGVzaGVsbC1ldmFsLXVzaW5nLW9wdGlvbnMKICAgICJoaXN0 b3J5IiBhcmdzCiAgICAnKCg/ciAicmVhZCIgbmlsIHJlYWQtaGlzdG9yeQotCSAicmVhZCBmcm9t IGhpc3RvcnkgZmlsZSB0byBjdXJyZW50IGhpc3RvcnkgbGlzdCIpCisJICJjbGVhciBjdXJyZW50 IGhpc3RvcnkgbGlzdCBhbmQgcmVhZCBmcm9tIGhpc3RvcnkgZmlsZSB0byBpdCIpCiAgICAgICg/ dyAid3JpdGUiIG5pbCB3cml0ZS1oaXN0b3J5CiAJICJ3cml0ZSBjdXJyZW50IGhpc3RvcnkgbGlz dCB0byBoaXN0b3J5IGZpbGUiKQogICAgICAoP2EgImFwcGVuZCIgbmlsIGFwcGVuZC1oaXN0b3J5 Ci0JICJhcHBlbmQgY3VycmVudCBoaXN0b3J5IGxpc3QgdG8gaGlzdG9yeSBmaWxlIikKKwkgImFw cGVuZCBuZXcgaGlzdG9yeSBpbiBjdXJyZW50IGJ1ZmZlciB0byBoaXN0b3J5IGZpbGUiKQogICAg ICAoP2ggImhlbHAiIG5pbCBuaWwgImRpc3BsYXkgdGhpcyB1c2FnZSBtZXNzYWdlIikKICAgICAg OnVzYWdlICJbbl0gWy1yd2EgW2ZpbGVuYW1lXV0iCiAgICAgIDpwb3N0LXVzYWdlCkBAIC0zOTQs NiArMzk4LDggQEAgZXNoZWxsLWFkZC1pbnB1dC10by1oaXN0b3J5CiAgICAgICAgICAgICAgICAo XyAgICAgICAgICAgICAgICAgICAgICAgOyBBZGQgaWYgbm90IGFscmVhZHkgdGhlIGxhdGVzdCBl bnRyeQogICAgICAgICAgICAgICAgIChvciAocmluZy1lbXB0eS1wIGVzaGVsbC1oaXN0b3J5LXJp bmcpCiAgICAgICAgICAgICAgICAgICAgIChub3QgKHN0cmluZy1lcXVhbCAoZXNoZWxsLWdldC1o aXN0b3J5IDApIGlucHV0KSkpKSkpCisgICAgKHNldHEgZXNoZWxsLWhpc3QtLW5ldy1pdGVtcwor ICAgICAgICAgIChtaW4gZXNoZWxsLWhpc3Rvcnktc2l6ZSAoMSsgZXNoZWxsLWhpc3QtLW5ldy1p dGVtcykpKQogICAgIChlc2hlbGwtcHV0LWhpc3RvcnkgaW5wdXQpKQogICAoc2V0cSBlc2hlbGwt c2F2ZS1oaXN0b3J5LWluZGV4IGVzaGVsbC1oaXN0b3J5LWluZGV4KQogICAoc2V0cSBlc2hlbGwt aGlzdG9yeS1pbmRleCBuaWwpKQpAQCAtNDU1LDIxICs0NjEsMjggQEAgZXNoZWxsLXJlYWQtaGlz dG9yeQogCQkgICAgICAocmUtc2VhcmNoLWJhY2t3YXJkICJeWyBcdF0qXFwoW14jXG5dLipcXClb IFx0XSokIgogCQkJCQkgIG5pbCB0KSkKIAkgICAgKGxldCAoKGhpc3RvcnkgKG1hdGNoLXN0cmlu ZyAxKSkpCi0JICAgICAgKGlmIChvciAobnVsbCBpZ25vcmUtZHVwcykKLQkJICAgICAgKHJpbmct ZW1wdHktcCByaW5nKQotCQkgICAgICAobm90IChzdHJpbmctZXF1YWwgKHJpbmctcmVmIHJpbmcg MCkgaGlzdG9yeSkpKQotCQkgIChyaW5nLWluc2VydC1hdC1iZWdpbm5pbmcKLQkJICAgcmluZyAo c3Vic3QtY2hhci1pbi1zdHJpbmcgP1wxNzcgP1xuIGhpc3RvcnkpKSkpCi0JICAgIChzZXRxIGNv dW50ICgxKyBjb3VudCkpKSkKKyAgICAgICAgICAgICAgKHdoZW4gKG9yIChyaW5nLWVtcHR5LXAg cmluZykKKyAgICAgICAgICAgICAgICAgICAgICAgIChudWxsIGlnbm9yZS1kdXBzKQorICAgICAg ICAgICAgICAgICAgICAgICAgKGFuZCAobm90IChzdHJpbmctZXF1YWwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgKHJpbmctcmVmIHJpbmcgKDEtIChyaW5nLWxlbmd0aCByaW5n KSkpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGhpc3RvcnkpKQorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAobm90IChhbmQgKGVxIGlnbm9yZS1kdXBzICdlcmFzZSkK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChyaW5nLW1lbWJlciByaW5n IGhpc3RvcnkpKSkpKQorICAgICAgICAgICAgICAgIChyaW5nLWluc2VydC1hdC1iZWdpbm5pbmcK KwkJIHJpbmcgKHN1YnN0LWNoYXItaW4tc3RyaW5nID9cMTc3ID9cbiBoaXN0b3J5KSkKKyAgICAg ICAgICAgICAgICAoc2V0cSBjb3VudCAoMSsgY291bnQpKSkpKSkKIAkoc2V0cSBlc2hlbGwtaGlz dG9yeS1yaW5nIHJpbmcKLQkgICAgICBlc2hlbGwtaGlzdG9yeS1pbmRleCBuaWwpKSkpKSkKKwkg ICAgICBlc2hlbGwtaGlzdG9yeS1pbmRleCBuaWwKKyAgICAgICAgICAgICAgZXNoZWxsLWhpc3Qt LW5ldy1pdGVtcyAwKSkpKSkpCiAKIChkZWZ1biBlc2hlbGwtd3JpdGUtaGlzdG9yeSAoJm9wdGlv bmFsIGZpbGVuYW1lIGFwcGVuZCkKICAgIldyaXRlcyB0aGUgYnVmZmVyJ3MgYGVzaGVsbC1oaXN0 b3J5LXJpbmcnIHRvIGEgaGlzdG9yeSBmaWxlLgotVGhlIG5hbWUgb2YgdGhlIGZpbGUgaXMgZ2l2 ZW4gYnkgdGhlIHZhcmlhYmxlCi1gZXNoZWxsLWhpc3RvcnktZmlsZS1uYW1lJy4gIFRoZSBvcmln aW5hbCBjb250ZW50cyBvZiB0aGUgZmlsZSBhcmUKLWxvc3QgaWYgYGVzaGVsbC1oaXN0b3J5LXJp bmcnIGlzIG5vdCBlbXB0eS4gIElmCi1gZXNoZWxsLWhpc3RvcnktZmlsZS1uYW1lJyBpcyBuaWwg dGhpcyBmdW5jdGlvbiBkb2VzIG5vdGhpbmcuCitJZiB0aGUgb3B0aW9uYWwgYXJndW1lbnQgRklM RU5BTUUgaXMgbmlsLCB0aGUgdmFsdWUgb2YKK2Blc2hlbGwtaGlzdG9yeS1maWxlLW5hbWUnIGlz IHVzZWQuICBUaGlzIGZ1bmN0aW9uIGRvZXMgbm90aGluZworaWYgdGhlIHZhbHVlIHJlc29sdmVz IHRvIG5pbC4gIElmIHRoZSBvcHRpb25hbCBhcmd1bWVudCBBUFBFTkQgaXMKK29taXR0ZWQgb3Ig bmlsLCB0aGUgb3JpZ2luYWwgY29udGVudHMgb2YgdGhlIGZpbGUgYXJlIGxvc3QgaWYKK2Blc2hl bGwtaGlzdG9yeS1yaW5nJyBpcyBub3QgZW1wdHkuICBBIG5vbi1uaWwgdmFsdWUgbWVhbnMgdG8K K2FwcGVuZCBuZXcgaGlzdG9yeSBpdGVtcyB0byB0aGUgaGlzdG9yeSBmaWxlLgogCiBVc2VmdWwg d2l0aGluIHByb2Nlc3Mgc2VudGluZWxzLgogCkBAIC00ODAsMTMgKzQ5MywxNCBAQCBlc2hlbGwt d3JpdGUtaGlzdG9yeQogICAgICAoKG9yIChudWxsIGZpbGUpCiAJICAoZXF1YWwgZmlsZSAiIikK IAkgIChudWxsIGVzaGVsbC1oaXN0b3J5LXJpbmcpCi0JICAocmluZy1lbXB0eS1wIGVzaGVsbC1o aXN0b3J5LXJpbmcpKQorCSAgKHJpbmctZW1wdHktcCBlc2hlbGwtaGlzdG9yeS1yaW5nKQorICAg ICAgICAgIChhbmQgYXBwZW5kICg9IGVzaGVsbC1oaXN0LS1uZXctaXRlbXMgMCkpKQogICAgICAg bmlsKQogICAgICAoKG5vdCAoZmlsZS13cml0YWJsZS1wIHJlc29sdmVkLWZpbGUpKQogICAgICAg KG1lc3NhZ2UgIkNhbm5vdCB3cml0ZSBoaXN0b3J5IGZpbGUgJXMiIHJlc29sdmVkLWZpbGUpKQog ICAgICAodAogICAgICAgKGxldCogKChyaW5nIGVzaGVsbC1oaXN0b3J5LXJpbmcpCi0JICAgICAo aW5kZXggKHJpbmctbGVuZ3RoIHJpbmcpKSkKKwkgICAgIChpbmRleCAoaWYgYXBwZW5kIGVzaGVs bC1oaXN0LS1uZXctaXRlbXMgKHJpbmctbGVuZ3RoIHJpbmcpKSkpCiAJOzsgV3JpdGUgaXQgYWxs IG91dCBpbnRvIGEgYnVmZmVyIGZpcnN0LiAgTXVjaCBmYXN0ZXIsIGJ1dAogCTs7IG1lc3NpZXIs IHRoYW4gd3JpdGluZyBpdCBvbmUgbGluZSBhdCBhIHRpbWUuCiAJKHdpdGgtdGVtcC1idWZmZXIK QEAgLTQ5OSw3ICs1MTMsOCBAQCBlc2hlbGwtd3JpdGUtaGlzdG9yeQogCSAgICAgIChzdWJzdC1j aGFyLWluLXJlZ2lvbiBzdGFydCAoMS0gKHBvaW50KSkgP1xuID9cMTc3KSkpCiAJICAoZXNoZWxs LXdpdGgtcHJpdmF0ZS1maWxlLW1vZGVzCiAJICAgKHdyaXRlLXJlZ2lvbiAocG9pbnQtbWluKSAo cG9pbnQtbWF4KSByZXNvbHZlZC1maWxlIGFwcGVuZAotCQkJICduby1tZXNzYWdlKSkpKSkpKSkK KwkJCSAnbm8tbWVzc2FnZSkpKQorICAgICAgICAoc2V0cSBlc2hlbGwtaGlzdC0tbmV3LWl0ZW1z IDApKSkpKSkKIAogKGRlZnVuIGVzaGVsbC1saXN0LWhpc3RvcnkgKCkKICAgIkxpc3QgaW4gaGVs cCBidWZmZXIgdGhlIGJ1ZmZlcidzIGlucHV0IGhpc3RvcnkuIgpkaWZmIC0tZ2l0IGEvdGVzdC9s aXNwL2VzaGVsbC9lbS1oaXN0LXRlc3RzLmVsIGIvdGVzdC9saXNwL2VzaGVsbC9lbS1oaXN0LXRl c3RzLmVsCmluZGV4IDBmMTQzMzU1MTE1Li40ODUxYmRjNTBiMiAxMDA2NDQKLS0tIGEvdGVzdC9s aXNwL2VzaGVsbC9lbS1oaXN0LXRlc3RzLmVsCisrKyBiL3Rlc3QvbGlzcC9lc2hlbGwvZW0taGlz dC10ZXN0cy5lbApAQCAtNDEsNiArNDEsNDAgQEAgZW0taGlzdC10ZXN0L3dyaXRlLXJlYWRvbmx5 LWhpc3RvcnkKICAgICAgICAgICAgICAgICAgICAocHJvcGVydGl6ZSAiZWNobyBiYXIiICdyZWFk LW9ubHkgdCkpCiAgICAgICAoZXNoZWxsLXdyaXRlLWhpc3RvcnkgaGlzdGZpbGUpKSkpCiAKKyhl cnQtZGVmdGVzdCBlbS1oaXN0LXRlc3QvaGlzdG9yeS1hcHBlbmQgKCkKKyAgIlRlc3QgJ2hpc3Rv cnkgLWEnLiIKKyAgKGVydC13aXRoLXRlbXAtZmlsZSBoaXN0ZmlsZQorICAgICh3aXRoLXRlbXAt ZXNoZWxsCisgICAgIChsZXQgKChlc2hlbGwtaGlzdG9yeS1maWxlLW5hbWUgaGlzdGZpbGUpKQor ICAgICAgIChlc2hlbGwtaW5zZXJ0LWNvbW1hbmQgImVjaG8gaGkiKQorICAgICAgIChlc2hlbGwt aW5zZXJ0LWNvbW1hbmQgImhpc3RvcnkgLXciKQorICAgICAgIChlc2hlbGwtaW5zZXJ0LWNvbW1h bmQgImhpc3RvcnkgLWEiKQorICAgICAgIChlc2hlbGwtaW5zZXJ0LWNvbW1hbmQgImVjaG8gYnll IikKKyAgICAgICAoZXNoZWxsLWluc2VydC1jb21tYW5kICJoaXN0b3J5IC1hIikKKyAgICAgICAo ZXNoZWxsLWluc2VydC1jb21tYW5kICJoaXN0b3J5IC1yIikKKyAgICAgICAoc2hvdWxkIChlcXVh bCAocmluZy1lbGVtZW50cyBlc2hlbGwtaGlzdG9yeS1yaW5nKQorICAgICAgICAgICAgICAgICAg ICAgICcoImhpc3RvcnkgLWEiICJlY2hvIGJ5ZSIKKyAgICAgICAgICAgICAgICAgICAgICAgICJo aXN0b3J5IC1hIiAiaGlzdG9yeSAtdyIgImVjaG8gaGkiKSkpKSkpKQorCisoZXJ0LWRlZnRlc3Qg ZW0taGlzdC10ZXN0L2hpc3RvcnktcmVhZCAoKQorICAiVGVzdCAnaGlzdG9yeSAtcicuIgorICAo ZXJ0LXdpdGgtdGVtcC1maWxlIGhpc3RmaWxlCisgICAgKHdpdGgtdGVtcC1lc2hlbGwKKyAgICAg KGxldCAoKGVzaGVsbC1oaXN0b3J5LWZpbGUtbmFtZSBoaXN0ZmlsZSkpCisgICAgICAgKGVzaGVs bC1pbnNlcnQtY29tbWFuZCAiZWNobyBoaSIpCisgICAgICAgKGVzaGVsbC1pbnNlcnQtY29tbWFu ZCAiZWNobyBieWUiKQorICAgICAgIChlc2hlbGwtaW5zZXJ0LWNvbW1hbmQgImVjaG8gYnllIikK KyAgICAgICAoZXNoZWxsLWluc2VydC1jb21tYW5kICJlY2hvIGhpIikKKyAgICAgICAoZXNoZWxs LWluc2VydC1jb21tYW5kICJoaXN0b3J5IC13IikKKyAgICAgICAobGV0ICgoZXNoZWxsLWhpc3Qt aWdub3JlZHVwcyB0KSkKKyAgICAgICAgIChlc2hlbGwtaW5zZXJ0LWNvbW1hbmQgImhpc3Rvcnkg LXIiKQorICAgICAgICAgKHNob3VsZCAoZXF1YWwgKHJpbmctZWxlbWVudHMgZXNoZWxsLWhpc3Rv cnktcmluZykKKyAgICAgICAgICAgICAgICAgICAgICAgICcoImhpc3RvcnkgLXciICJlY2hvIGhp IiAiZWNobyBieWUiICJlY2hvIGhpIikpKSkKKyAgICAgICAobGV0ICgoZXNoZWxsLWhpc3QtaWdu b3JlZHVwcyAnZXJhc2UpKQorICAgICAgICAgKGVzaGVsbC1pbnNlcnQtY29tbWFuZCAiaGlzdG9y eSAtciIpCisgICAgICAgICAoc2hvdWxkIChlcXVhbCAocmluZy1lbGVtZW50cyBlc2hlbGwtaGlz dG9yeS1yaW5nKQorICAgICAgICAgICAgICAgICAgICAgICAgJygiaGlzdG9yeSAtdyIgImVjaG8g aGkiICJlY2hvIGJ5ZSIpKSkpKSkpKQorCiAoZXJ0LWRlZnRlc3QgZW0taGlzdC10ZXN0L2FkZC10 by1oaXN0b3J5L2FsbG93LWR1cHMgKCkKICAgIlRlc3QgYWRkaW5nIHRvIGhpc3RvcnksIGFsbG93 aW5nIGR1cHMuIgogICAobGV0ICgoZXNoZWxsLWhpc3QtaWdub3JlZHVwcyBuaWwpKQotLSAKMi4y NS4xCgo= --00000000000032d51a06098d3d03-- From unknown Sun Jun 22 04:30:14 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Liu Hui Subject: bug#66768: closed (Re: bug#66768: 30.0.50; [PATCH] Improve read/append behavior of eshell history command) Message-ID: References: <358d06e6-0a07-ffda-1710-400dab7eaecb@gmail.com> X-Gnu-PR-Message: they-closed 66768 X-Gnu-PR-Package: emacs X-Gnu-PR-Keywords: patch Reply-To: 66768@debbugs.gnu.org Date: Sat, 11 Nov 2023 02:04:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1699668242-29237-1" This is a multi-part message in MIME format... ------------=_1699668242-29237-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #66768: 30.0.50; [PATCH] Improve read/append behavior of eshell history com= mand which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 66768@debbugs.gnu.org. --=20 66768: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D66768 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1699668242-29237-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 66768-done) by debbugs.gnu.org; 11 Nov 2023 02:03:58 +0000 Received: from localhost ([127.0.0.1]:51254 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1dLq-0007bJ-8Q for submit@debbugs.gnu.org; Fri, 10 Nov 2023 21:03:58 -0500 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]:43298) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1dLn-0007b3-0u for 66768-done@debbugs.gnu.org; Fri, 10 Nov 2023 21:03:57 -0500 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-1cc3388621cso28565585ad.1 for <66768-done@debbugs.gnu.org>; Fri, 10 Nov 2023 18:03:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699668189; x=1700272989; darn=debbugs.gnu.org; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:mime-version:date:message-id:from:to:cc :subject:date:message-id:reply-to; bh=AerlbqwmixODh4si75YtiqybN1SrR+LFq8+ShpDCXg4=; b=IHVGXspRNNfm+y5d/15Haf29VJXQStNUVFldwHQFx1QAwGk1Iw9bpQH2h6og+k8Iep 1CmcKwnbYBkO+KlpsXAkR0EJi4wLcaVMFGa7f+OEGaEkelTYdPhm0qq6LVJG5/NEwI0s 1P/q8CYm/FaoDYKKxjopzoYit2aNgF/+GMoVYze4fbSNKoP50ji+BaGJa5hRA68U3C2i XIHqAJF2A7xlsoqxzjpRt8TpUo+TxsS9EtQVICzD4ZCmbHMxfuQoa33QTb7PBfgd9ERQ eeHZEFjZfsBfD/th9ZsK6HjKcqaIYY2/zD3+Q5z0yHh0hvn4o0iJgXAzJv4wDzuo5iuV hFSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699668189; x=1700272989; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=AerlbqwmixODh4si75YtiqybN1SrR+LFq8+ShpDCXg4=; b=ijFIm1euZNH+NfwSHqBmOxUqrAFNtp8FKKxc3AJNRzq0vY6/7mTup/tqjBLCcVHFT0 YVuP6GJ2uGVyiiUB2487TOH5wfOcAOQjnJLIllp9CVzG1nyv4TyD2FLoz226XqjoTAFU wxdyTtgSAON4to+PrRYfcD/kUD0hXKCJ3mbxfx5n3y1AYrpxmQEruHQRXJrlJGWdLxzP ghmjRo1Kd8vU+uGGtWg6gu3OeWYb4LW76P7IAU58jwaMPp0Ja4LEwnPMxs6JtC52Bntz KM888+WqHi8p2X4EPZQR7Br8NzTDkpisJ4Vxq6stOH8YXuOpcslC8Aexk2dnTU46XSSR pekA== X-Gm-Message-State: AOJu0YyfPx7V76sloGL0nO0S/o1x3dmV1z1wcSxLDCAnKRmOl/2anKem irlmVhNyF8aju37tKpFFKrA= X-Google-Smtp-Source: AGHT+IE1ABohNJYfW79QcMUjIEh/02ft5KQsoix+AhMw9MJbGBSYfA/5KSRzvsW+TpLZFbBJiHV/CQ== X-Received: by 2002:a17:903:32cf:b0:1cc:4625:74e2 with SMTP id i15-20020a17090332cf00b001cc462574e2mr6270805plr.24.1699668188705; Fri, 10 Nov 2023 18:03:08 -0800 (PST) Received: from [192.168.1.2] (cpe-76-168-148-233.socal.res.rr.com. [76.168.148.233]) by smtp.googlemail.com with ESMTPSA id o21-20020a63fb15000000b005b7e803e672sm372578pgh.5.2023.11.10.18.03.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 10 Nov 2023 18:03:08 -0800 (PST) Message-ID: <358d06e6-0a07-ffda-1710-400dab7eaecb@gmail.com> Date: Fri, 10 Nov 2023 18:03:07 -0800 MIME-Version: 1.0 Subject: Re: bug#66768: 30.0.50; [PATCH] Improve read/append behavior of eshell history command Content-Language: en-US To: Liu Hui References: <3d7b6c5e-ee22-91a2-93bd-1fd99d3eb301@gmail.com> From: Jim Porter In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 66768-done Cc: 66768-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Version: 30.1 On 11/7/2023 2:14 AM, Liu Hui wrote: > Thanks for your comments! I've updated the patch to address all > concerns. Everything in your patch looks good to me. I've now merged it as 8b3969006fe (with a small editorial change to a docstring), and added a few extra regression tests for the history code on top as f2b162f8ee5. Closing this now. Thanks for helping improve Eshell! ------------=_1699668242-29237-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 27 Oct 2023 04:17:09 +0000 Received: from localhost ([127.0.0.1]:34871 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qwEHV-0006Ij-5c for submit@debbugs.gnu.org; Fri, 27 Oct 2023 00:17:09 -0400 Received: from lists.gnu.org ([2001:470:142::17]:58592) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qwEHT-0006Hf-19 for submit@debbugs.gnu.org; Fri, 27 Oct 2023 00:17:07 -0400 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 1qwEGs-0002UF-JZ for bug-gnu-emacs@gnu.org; Fri, 27 Oct 2023 00:16:30 -0400 Received: from mail-vs1-xe2f.google.com ([2607:f8b0:4864:20::e2f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwEGq-0007ju-Br for bug-gnu-emacs@gnu.org; Fri, 27 Oct 2023 00:16:30 -0400 Received: by mail-vs1-xe2f.google.com with SMTP id ada2fe7eead31-457cc01b805so759296137.0 for ; Thu, 26 Oct 2023 21:16:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698380185; x=1698984985; darn=gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=bhnIvqiTq2F0QR70md648u6cCoEVIQ0v3CNJrmHuztM=; b=eciDnADIC070qu8mz6pXCMdFIDdl9Az55rjP4e+soSEEgq0eEpY0NBZORWHf0yez7y DsN8MdVmmJWZmO/JglDWTACfD0b3oJ8yg5zuA/vzMKGPb1Cf9AqzAESCVBtLlBh710US nuJ6eTJIBNL0kEhXH1QJCOV/3Narim+5saUusBVokCxo/P3m9oQwV/cw0XgC22jxEt0V xBZRBTkz6ya9GNQ6LZyedVy/6+hKqPNyFJYAzaVQp+NrV4XjrYNQjbIU/669Wc134tFd fwec3tOUTti8yce/CGgAx3OaG+YfcrTvxmH2oP3i2xchP7joeaqbhGIIzWlpPXulF1nq fZqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698380185; x=1698984985; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=bhnIvqiTq2F0QR70md648u6cCoEVIQ0v3CNJrmHuztM=; b=NoXKR/S8sIsqTMOFo1tfAtO1Xw6ThYaQjgfY1Eu29IBEwld63UiNTzfqdfdRB9YqKl 4l5tSaPVq9N0s1vsJkqkhTvqyMdixA+r/fPfmtB90X2lMES0wQLDS7aCjQglSKBqmr4V 9SE0eEIh40NkXw+ArlpzGbEBNmtYs3Z0f22C4PHtK15JYJc/zIkrdbELf0hjdN7ws/h9 nNKRxwjFgMsUt9RH9fKmYye1YccuUTGktRAFIgznkAegV58GlrB8kMzohcqi9opjc3bj aZ0j/+jR7Hu68NJ5WYydLMvgzHAmvzOHNViTVvIQarOTka3t2buxmgwZ6lt0C6sH5p33 VLAQ== X-Gm-Message-State: AOJu0Yxbr4wRAD38Agu4SRJUyVhmqwtvKB5WWZeQAgUPtgBAE2cWsqvn fnfI+6On/JQ9+gORD4J8Nz3cbk1eM0/z4Fv6mQNIuGk/eu8= X-Google-Smtp-Source: AGHT+IEsaE49cRxauQmS1n3a4c1Ir8udb6NKePfd+wBq748vKIXAkoVjBL1wVy8ZHcrtz0cRCJ4GvxwGRFdom0o1nxs= X-Received: by 2002:a67:e013:0:b0:45a:b852:9d6d with SMTP id c19-20020a67e013000000b0045ab8529d6dmr1598151vsl.13.1698380185671; Thu, 26 Oct 2023 21:16:25 -0700 (PDT) MIME-Version: 1.0 From: Liu Hui Date: Fri, 27 Oct 2023 12:15:00 +0800 Message-ID: Subject: 30.0.50; [PATCH] Improve read/append behavior of eshell history command To: bug-gnu-emacs@gnu.org Content-Type: multipart/mixed; boundary="000000000000a9a8e60608aaf30a" Received-SPF: pass client-ip=2607:f8b0:4864:20::e2f; envelope-from=liuhui1610@gmail.com; helo=mail-vs1-xe2f.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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_ENVFROM_END_DIGIT=0.25, 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-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi, This patch fixes some corner cases of the eshell history command about reading (-r) and appending (-a). Recipe: Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liuhui1610[at]gmail.com) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (liuhui1610[at]gmail.com) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) --000000000000a9a8e60608aaf30a Content-Type: text/plain; charset="UTF-8" Hi, This patch fixes some corner cases of the eshell history command about reading (-r) and appending (-a). Recipe: 1. create a sample history file containing some lines, e.g. ls 2. emacs -Q --eval "(setq eshell-history-file-name ...)" -f eshell 3. type following commands: $ ls $ history -a $ cd /tmp $ history -a 'history -a' doesn't distinguish old history from new history items of current buffer, and always appends the whole history list whenever it is called, resulting in a mess of the content of history file: ls ls ls history -a ls ls history -a cd /tmp/ history -a If another eshell buffer or emacs instance is launched before we quit this eshell buffer, they will read messed history. Thus this patch changes behavior of 'history -a' from "append current history list to history file" to "append new history in current buffer to history file", which is also consistent with bash's 'history -a'. 4. continue to type: $ (setq eshell-hist-ignoredups t) $ history -a; history -r $ history 'history -r', which calls eshell-read-history, doesn't remove consecutive "ls" duplicates from the history file. Thus this patch amends eshell-read-history to make it respect the eshell-hist-ignoredups option (both t and 'erase). Since 'history -r' replaces current history list, which is actually equivalent to bash's 'history -c; history -r', I have updated the help text. Maybe it should be split into two commands, i.e. adding 'history -c'? Best, -- Liu Hui --000000000000a9a8e60608aaf30a Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Improve-read-append-behavior-of-eshell-history-comma.patch" Content-Disposition: attachment; filename="0001-Improve-read-append-behavior-of-eshell-history-comma.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lo7zdb4g0 RnJvbSAyMGFkNzA5OTVjNWZiYmI2NGU4NTAxZjVmMWIyMTZlMTdiMzkwMGFjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMaXUgSHVpIDxsaXVodWkxNjEwQGdtYWlsLmNvbT4KRGF0ZTog RnJpLCAyNyBPY3QgMjAyMyAxMDowNzowOSArMDgwMApTdWJqZWN0OiBbUEFUQ0hdIEltcHJvdmUg cmVhZC9hcHBlbmQgYmVoYXZpb3Igb2YgZXNoZWxsIGhpc3RvcnkgY29tbWFuZAoKKiBsaXNwL2Vz aGVsbC9lbS1oaXN0LmVsIChlc2hlbGwtaGlzdC0tbmV3LWl0ZW1zKTogTmV3IHZhcmlhYmxlLgoo ZXNoZWxsLWhpc3QtaW5pdGlhbGl6ZSk6IFNldCBgZXNoZWxsLWhpc3QtLW5ldy1pdGVtcycuCihl c2hlbGwvaGlzdG9yeSk6IENoYW5nZSB0aGUgYmVoYXZpb3Igb2YgJ2hpc3RvcnkgLWEnIHRvICJh cHBlbmQgbmV3Cmhpc3RvcnkgaW4gY3VycmVudCBidWZmZXIgdG8gaGlzdG9yeSBmaWxlIi4gIFVw ZGF0ZSBoZWxwIHRleHQuCihlc2hlbGwtYWRkLWlucHV0LXRvLWhpc3RvcnkpOiBJbmNyZWFzZSBj b3VudGVyIG9mIG5ldyBoaXN0b3J5IGl0ZW1zLgooZXNoZWxsLXJlYWQtaGlzdG9yeSk6IFJlc3Bl Y3QgZXNoZWxsLWhpc3QtaWdub3JlZHVwcyBvcHRpb24uCihlc2hlbGwtd3JpdGUtaGlzdG9yeSk6 IEFkZCBvcHRpb25hbCBhcmd1bWVudCBORVctSVRFTVMgYW5kIHN1cHBvcnQKd3JpdGluZyBvbmx5 IG5ldyBoaXN0b3J5IGl0ZW1zIHRvIGhpc3RvcnkgZmlsZS4KLS0tCiBsaXNwL2VzaGVsbC9lbS1o aXN0LmVsIHwgNDcgKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tCiAx IGZpbGUgY2hhbmdlZCwgMzEgaW5zZXJ0aW9ucygrKSwgMTYgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvbGlzcC9lc2hlbGwvZW0taGlzdC5lbCBiL2xpc3AvZXNoZWxsL2VtLWhpc3QuZWwKaW5k ZXggOWQ0YjcyYjAxZGYuLjQ2YmQ4NzM1YzNjIDEwMDY0NAotLS0gYS9saXNwL2VzaGVsbC9lbS1o aXN0LmVsCisrKyBiL2xpc3AvZXNoZWxsL2VtLWhpc3QuZWwKQEAgLTE5NSw2ICsxOTUsOSBAQCBl c2hlbGwtaGlzdG9yeS1yaW5nCiAoZGVmdmFyIGVzaGVsbC1oaXN0b3J5LWluZGV4IG5pbCkKIChk ZWZ2YXIgZXNoZWxsLW1hdGNoaW5nLWlucHV0LWZyb20taW5wdXQtc3RyaW5nICIiKQogKGRlZnZh ciBlc2hlbGwtc2F2ZS1oaXN0b3J5LWluZGV4IG5pbCkKKyhkZWZ2YXIgZXNoZWxsLWhpc3QtLW5l dy1pdGVtcyAwCisgICJUaGUgbnVtYmVyIG9mIG5ldyBoaXN0b3J5IGl0ZW1zIHRoYXQgaGF2ZSBu b3QgYmVlbiB3cml0dGVuIHRvCitmaWxlLiAgVGhpcyB2YXJpYWJsZSBpcyBsb2NhbCBpbiBlYWNo IGVzaGVsbCBidWZmZXIuIikKIAogKGRlZnZhci1rZXltYXAgZXNoZWxsLWlzZWFyY2gtbWFwCiAg IDpkb2MgIktleW1hcCB1c2VkIGluIGlzZWFyY2ggaW4gRXNoZWxsLiIKQEAgLTI4Myw2ICsyODYs NyBAQCBlc2hlbGwtaGlzdC1pbml0aWFsaXplCiAKICAgKG1ha2UtbG9jYWwtdmFyaWFibGUgJ2Vz aGVsbC1oaXN0b3J5LWluZGV4KQogICAobWFrZS1sb2NhbC12YXJpYWJsZSAnZXNoZWxsLXNhdmUt aGlzdG9yeS1pbmRleCkKKyAgKG1ha2UtbG9jYWwtdmFyaWFibGUgJ2VzaGVsbC1oaXN0LS1uZXct aXRlbXMpCiAKICAgKGlmIChtaW5pYnVmZmVyLXdpbmRvdy1hY3RpdmUtcCAoc2VsZWN0ZWQtd2lu ZG93KSkKICAgICAgIChzZXRxLWxvY2FsIGVzaGVsbC1zYXZlLWhpc3Rvcnktb24tZXhpdCBuaWwp CkBAIC0zMjMsMTEgKzMyNywxMSBAQCBlc2hlbGwvaGlzdG9yeQogICAoZXNoZWxsLWV2YWwtdXNp bmctb3B0aW9ucwogICAgImhpc3RvcnkiIGFyZ3MKICAgICcoKD9yICJyZWFkIiBuaWwgcmVhZC1o aXN0b3J5Ci0JICJyZWFkIGZyb20gaGlzdG9yeSBmaWxlIHRvIGN1cnJlbnQgaGlzdG9yeSBsaXN0 IikKKwkgImNsZWFyIGN1cnJlbnQgaGlzdG9yeSBsaXN0IGFuZCByZWFkIGZyb20gaGlzdG9yeSBm aWxlIHRvIGl0IikKICAgICAgKD93ICJ3cml0ZSIgbmlsIHdyaXRlLWhpc3RvcnkKIAkgIndyaXRl IGN1cnJlbnQgaGlzdG9yeSBsaXN0IHRvIGhpc3RvcnkgZmlsZSIpCiAgICAgICg/YSAiYXBwZW5k IiBuaWwgYXBwZW5kLWhpc3RvcnkKLQkgImFwcGVuZCBjdXJyZW50IGhpc3RvcnkgbGlzdCB0byBo aXN0b3J5IGZpbGUiKQorCSAiYXBwZW5kIG5ldyBoaXN0b3J5IGluIGN1cnJlbnQgYnVmZmVyIHRv IGhpc3RvcnkgZmlsZSIpCiAgICAgICg/aCAiaGVscCIgbmlsIG5pbCAiZGlzcGxheSB0aGlzIHVz YWdlIG1lc3NhZ2UiKQogICAgICA6dXNhZ2UgIltuXSBbLXJ3YSBbZmlsZW5hbWVdXSIKICAgICAg OnBvc3QtdXNhZ2UKQEAgLTM1MSw3ICszNTUsNyBAQCBlc2hlbGwvaGlzdG9yeQogICAgICAoY29u ZAogICAgICAgKHJlYWQtaGlzdG9yeSAoZXNoZWxsLXJlYWQtaGlzdG9yeSBmaWxlKSkKICAgICAg ICh3cml0ZS1oaXN0b3J5IChlc2hlbGwtd3JpdGUtaGlzdG9yeSBmaWxlKSkKLSAgICAgIChhcHBl bmQtaGlzdG9yeSAoZXNoZWxsLXdyaXRlLWhpc3RvcnkgZmlsZSB0KSkKKyAgICAgIChhcHBlbmQt aGlzdG9yeSAoZXNoZWxsLXdyaXRlLWhpc3RvcnkgZmlsZSAnYXBwZW5kICduZXctaXRlbXMpKQog ICAgICAgKHQKICAgICAgICAobGV0KiAoKGluZGV4ICgxLSAob3IgbGVuZ3RoIChyaW5nLWxlbmd0 aCBlc2hlbGwtaGlzdG9yeS1yaW5nKSkpKQogCSAgICAgIChyZWYgKC0gKHJpbmctbGVuZ3RoIGVz aGVsbC1oaXN0b3J5LXJpbmcpIGluZGV4KSkpCkBAIC0zOTQsNiArMzk4LDggQEAgZXNoZWxsLWFk ZC1pbnB1dC10by1oaXN0b3J5CiAgICAgICAgICAgICAgICAoXyAgICAgICAgICAgICAgICAgICAg ICAgOyBBZGQgaWYgbm90IGFscmVhZHkgdGhlIGxhdGVzdCBlbnRyeQogICAgICAgICAgICAgICAg IChvciAocmluZy1lbXB0eS1wIGVzaGVsbC1oaXN0b3J5LXJpbmcpCiAgICAgICAgICAgICAgICAg ICAgIChub3QgKHN0cmluZy1lcXVhbCAoZXNoZWxsLWdldC1oaXN0b3J5IDApIGlucHV0KSkpKSkp CisgICAgKHNldHEgZXNoZWxsLWhpc3QtLW5ldy1pdGVtcworICAgICAgICAgIChtaW4gZXNoZWxs LWhpc3Rvcnktc2l6ZSAoMSsgZXNoZWxsLWhpc3QtLW5ldy1pdGVtcykpKQogICAgIChlc2hlbGwt cHV0LWhpc3RvcnkgaW5wdXQpKQogICAoc2V0cSBlc2hlbGwtc2F2ZS1oaXN0b3J5LWluZGV4IGVz aGVsbC1oaXN0b3J5LWluZGV4KQogICAoc2V0cSBlc2hlbGwtaGlzdG9yeS1pbmRleCBuaWwpKQpA QCAtNDU1LDIxICs0NjEsMjggQEAgZXNoZWxsLXJlYWQtaGlzdG9yeQogCQkgICAgICAocmUtc2Vh cmNoLWJhY2t3YXJkICJeWyBcdF0qXFwoW14jXG5dLipcXClbIFx0XSokIgogCQkJCQkgIG5pbCB0 KSkKIAkgICAgKGxldCAoKGhpc3RvcnkgKG1hdGNoLXN0cmluZyAxKSkpCi0JICAgICAgKGlmIChv ciAobnVsbCBpZ25vcmUtZHVwcykKLQkJICAgICAgKHJpbmctZW1wdHktcCByaW5nKQotCQkgICAg ICAobm90IChzdHJpbmctZXF1YWwgKHJpbmctcmVmIHJpbmcgMCkgaGlzdG9yeSkpKQotCQkgIChy aW5nLWluc2VydC1hdC1iZWdpbm5pbmcKKyAgICAgICAgICAgICAgKGlmIChvciAocmluZy1lbXB0 eS1wIHJpbmcpCisgICAgICAgICAgICAgICAgICAgICAgKG51bGwgaWdub3JlLWR1cHMpCisgICAg ICAgICAgICAgICAgICAgICAgKGFuZCAobm90IChzdHJpbmctZXF1YWwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIChyaW5nLXJlZiByaW5nICgxLSAocmluZy1sZW5ndGggcmluZykp KQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaGlzdG9yeSkpCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAobm90IChhbmQgKGVxIGlnbm9yZS1kdXBzICdlcmFzZSkKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAocmluZy1tZW1iZXIgcmluZyBoaXN0b3J5 KSkpKSkKKyAgICAgICAgICAgICAgICAgIChyaW5nLWluc2VydC1hdC1iZWdpbm5pbmcKIAkJICAg cmluZyAoc3Vic3QtY2hhci1pbi1zdHJpbmcgP1wxNzcgP1xuIGhpc3RvcnkpKSkpCiAJICAgIChz ZXRxIGNvdW50ICgxKyBjb3VudCkpKSkKIAkoc2V0cSBlc2hlbGwtaGlzdG9yeS1yaW5nIHJpbmcK LQkgICAgICBlc2hlbGwtaGlzdG9yeS1pbmRleCBuaWwpKSkpKSkKKwkgICAgICBlc2hlbGwtaGlz dG9yeS1pbmRleCBuaWwKKyAgICAgICAgICAgICAgZXNoZWxsLWhpc3QtLW5ldy1pdGVtcyAwKSkp KSkpCiAKLShkZWZ1biBlc2hlbGwtd3JpdGUtaGlzdG9yeSAoJm9wdGlvbmFsIGZpbGVuYW1lIGFw cGVuZCkKKyhkZWZ1biBlc2hlbGwtd3JpdGUtaGlzdG9yeSAoJm9wdGlvbmFsIGZpbGVuYW1lIGFw cGVuZCBuZXctaXRlbXMpCiAgICJXcml0ZXMgdGhlIGJ1ZmZlcidzIGBlc2hlbGwtaGlzdG9yeS1y aW5nJyB0byBhIGhpc3RvcnkgZmlsZS4KLVRoZSBuYW1lIG9mIHRoZSBmaWxlIGlzIGdpdmVuIGJ5 IHRoZSB2YXJpYWJsZQotYGVzaGVsbC1oaXN0b3J5LWZpbGUtbmFtZScuICBUaGUgb3JpZ2luYWwg Y29udGVudHMgb2YgdGhlIGZpbGUgYXJlCi1sb3N0IGlmIGBlc2hlbGwtaGlzdG9yeS1yaW5nJyBp cyBub3QgZW1wdHkuICBJZgotYGVzaGVsbC1oaXN0b3J5LWZpbGUtbmFtZScgaXMgbmlsIHRoaXMg ZnVuY3Rpb24gZG9lcyBub3RoaW5nLgorSWYgdGhlIG9wdGlvbmFsIGFyZ3VtZW50IEZJTEVOQU1F IGlzIG5pbCwgdGhlIHZhbHVlIG9mCitgZXNoZWxsLWhpc3RvcnktZmlsZS1uYW1lJyBpcyB1c2Vk LiAgVGhpcyBmdW5jdGlvbiBkb2VzIG5vdGhpbmcKK2lmIHRoZSB2YWx1ZSByZXNvbHZlcyB0byBu aWwuICBUaGUgb3B0aW9uYWwgYXJndW1lbnQgQVBQRU5EIGhhcwordGhlIHNhbWUgbWVhbmluZyBh cyB0aGF0IGluIGB3cml0ZS1yZWdpb24nLiAgSWYgdGhlIG9wdGlvbmFsCithcmd1bWVudCBORVct SVRFTVMgaXMgbm9uLW5pbCwgd3JpdGVzIG9ubHkgbmV3IGhpc3RvcnkgaXRlbXMgdGhhdAoraGF2 ZSBub3QgYmVlbiB3cml0dGVuIHRvIGFueSBoaXN0b3J5IGZpbGUgeWV0LgogCiBVc2VmdWwgd2l0 aGluIHByb2Nlc3Mgc2VudGluZWxzLgogCkBAIC00ODAsMTMgKzQ5MywxNCBAQCBlc2hlbGwtd3Jp dGUtaGlzdG9yeQogICAgICAoKG9yIChudWxsIGZpbGUpCiAJICAoZXF1YWwgZmlsZSAiIikKIAkg IChudWxsIGVzaGVsbC1oaXN0b3J5LXJpbmcpCi0JICAocmluZy1lbXB0eS1wIGVzaGVsbC1oaXN0 b3J5LXJpbmcpKQorCSAgKHJpbmctZW1wdHktcCBlc2hlbGwtaGlzdG9yeS1yaW5nKQorICAgICAg ICAgIChhbmQgbmV3LWl0ZW1zICg9IGVzaGVsbC1oaXN0LS1uZXctaXRlbXMgMCkpKQogICAgICAg bmlsKQogICAgICAoKG5vdCAoZmlsZS13cml0YWJsZS1wIHJlc29sdmVkLWZpbGUpKQogICAgICAg KG1lc3NhZ2UgIkNhbm5vdCB3cml0ZSBoaXN0b3J5IGZpbGUgJXMiIHJlc29sdmVkLWZpbGUpKQog ICAgICAodAogICAgICAgKGxldCogKChyaW5nIGVzaGVsbC1oaXN0b3J5LXJpbmcpCi0JICAgICAo aW5kZXggKHJpbmctbGVuZ3RoIHJpbmcpKSkKKwkgICAgIChpbmRleCAoaWYgbmV3LWl0ZW1zIGVz aGVsbC1oaXN0LS1uZXctaXRlbXMgKHJpbmctbGVuZ3RoIHJpbmcpKSkpCiAJOzsgV3JpdGUgaXQg YWxsIG91dCBpbnRvIGEgYnVmZmVyIGZpcnN0LiAgTXVjaCBmYXN0ZXIsIGJ1dAogCTs7IG1lc3Np ZXIsIHRoYW4gd3JpdGluZyBpdCBvbmUgbGluZSBhdCBhIHRpbWUuCiAJKHdpdGgtdGVtcC1idWZm ZXIKQEAgLTQ5OSw3ICs1MTMsOCBAQCBlc2hlbGwtd3JpdGUtaGlzdG9yeQogCSAgICAgIChzdWJz dC1jaGFyLWluLXJlZ2lvbiBzdGFydCAoMS0gKHBvaW50KSkgP1xuID9cMTc3KSkpCiAJICAoZXNo ZWxsLXdpdGgtcHJpdmF0ZS1maWxlLW1vZGVzCiAJICAgKHdyaXRlLXJlZ2lvbiAocG9pbnQtbWlu KSAocG9pbnQtbWF4KSByZXNvbHZlZC1maWxlIGFwcGVuZAotCQkJICduby1tZXNzYWdlKSkpKSkp KSkKKwkJCSAnbm8tbWVzc2FnZSkpKQorICAgICAgICAoc2V0cSBlc2hlbGwtaGlzdC0tbmV3LWl0 ZW1zIDApKSkpKSkKIAogKGRlZnVuIGVzaGVsbC1saXN0LWhpc3RvcnkgKCkKICAgIkxpc3QgaW4g aGVscCBidWZmZXIgdGhlIGJ1ZmZlcidzIGlucHV0IGhpc3RvcnkuIgotLSAKMi4yNS4xCgo= --000000000000a9a8e60608aaf30a-- ------------=_1699668242-29237-1--