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#52237: 29.0.50; [PATCH] Doubled separators in context-menu-mode Date: Wed, 1 Dec 2021 22:06:13 -0800 Message-ID: <0bbe5580-8e05-4e18-5b91-04b41b6f19bc@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------2E7E790652426583308AC00B" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="22943"; mail-complaints-to="usenet@ciao.gmane.io" To: 52237@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Dec 02 07:07:57 2021 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 1msfG9-0005oN-FN for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 02 Dec 2021 07:07:57 +0100 Original-Received: from localhost ([::1]:45802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1msfG7-0002zq-Lw for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 02 Dec 2021 01:07:55 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:54474) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1msfFG-0002zd-89 for bug-gnu-emacs@gnu.org; Thu, 02 Dec 2021 01:07:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:34804) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1msfFF-0000mI-Vh for bug-gnu-emacs@gnu.org; Thu, 02 Dec 2021 01:07:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1msfFF-0001Q5-Qr for bug-gnu-emacs@gnu.org; Thu, 02 Dec 2021 01:07:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Jim Porter Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 02 Dec 2021 06:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52237 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.16384251905382 (code B ref -1); Thu, 02 Dec 2021 06:07:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 2 Dec 2021 06:06:30 +0000 Original-Received: from localhost ([127.0.0.1]:46350 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msfEj-0001Ok-KE for submit@debbugs.gnu.org; Thu, 02 Dec 2021 01:06:29 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:47414) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msfEh-0001Oc-2W for submit@debbugs.gnu.org; Thu, 02 Dec 2021 01:06:28 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:54190) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1msfEg-0002um-IH for bug-gnu-emacs@gnu.org; Thu, 02 Dec 2021 01:06:26 -0500 Original-Received: from [2607:f8b0:4864:20::534] (port=41581 helo=mail-pg1-x534.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1msfEW-0000aE-8a for bug-gnu-emacs@gnu.org; Thu, 02 Dec 2021 01:06:24 -0500 Original-Received: by mail-pg1-x534.google.com with SMTP id k4so15875115pgb.8 for ; Wed, 01 Dec 2021 22:06:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:subject:to:message-id:date:mime-version:content-language; bh=1XWvp6Jzp0Ze/MGDl4JkhsasZVp2gr7y6guA71ZAi8M=; b=DK3nskfYaP7c20zfcTT+41+gUd52njhd4tZgM+uQfmIaU4tqDHMER/xse1q5atKdp+ bf2+flfhl+0yQA/+jARoqMP6Px9IV+AvyNLkBRxtrICUPa0/Nz+tIXRIajuqUnmi6S3u 2QKIaFhRIjVqEaU5bPfx0igei/tnsokAn2gV+Hws8189ma5M9aEuxUvH26l0pJ38/sXp /GakSE2HudxgGOxDuvOxcFjwan0208MIWB0YcEFPJqgaaDJT8Dbr78o6vnhOiMzm/2zZ itt9DCsJhgvy3Xodnw1GKERHWVdfOGL87/i+uxgJPIR++hhGZj/xc/NABL1pwZu7rxeI HQsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:subject:to:message-id:date:mime-version :content-language; bh=1XWvp6Jzp0Ze/MGDl4JkhsasZVp2gr7y6guA71ZAi8M=; b=zo+9U6/Mlc8gKTWCgVvJ4mzkMuh9Gw9dfQY5RN9zM4DNNgLWv1YdtBporjWRJFZR+v MLFuqG3uaPK8IwhA6y0Ae3VZzGFbM/stRAvumAlfP4r7KcyAdDJ2OSK4H47Gx/oKjkp0 h49xMcf6dtRfqVk1tfoIw/1t1AJHoCKHPJDsQ7aEC4y4W0zxneasarxKEuBMfZ38DNNe ZoVls7STK2cBOlYkEZetP5hmZK7jgNsuF1l+e1YxEEmMFVDjFZ3nCJ1D9FZQXP6OkBXE 8TYsTcVZeDRgi33ZUYUCXnB0fNu28PDH182Knr04ppb0o3jGNOgHt93naz1UliK+tOPo QQ4A== X-Gm-Message-State: AOAM532YtdPQi03pw6SXBXruNkA1RuNNdx64E1wTv53X5lAGdqZwV5vH MwOqS85D6iNWfERAIepIsnWWySpPHug= X-Google-Smtp-Source: ABdhPJxCkCI3zVXXov5zgL1n3NOyQoV6XN2eiag1I3LrdKLQ4MlYbwauck7AqC84nfyBaOxarc/y0A== X-Received: by 2002:a63:490c:: with SMTP id w12mr8351653pga.398.1638425174398; Wed, 01 Dec 2021 22:06:14 -0800 (PST) Original-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 c3sm1834029pfv.67.2021.12.01.22.06.13 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 01 Dec 2021 22:06:13 -0800 (PST) X-Mozilla-News-Host: news://news.gmane.org:119 Content-Language: en-US X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::534 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::534; envelope-from=jporterbugs@gmail.com; helo=mail-pg1-x534.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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" Xref: news.gmane.io gmane.emacs.bugs:221257 Archived-At: This is a multi-part message in MIME format. --------------2E7E790652426583308AC00B Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Sometimes, menu separators are doubled up in context-menu-mode. To see this in action: emacs -Q --eval '(context-menu-mode)' ;; Right-click somewhere in the scratch buffer, like the empty area. You should see a double separator just before "Lisp-Interaction". `context-menu-map' tries to eliminate doubled separators, but it doesn't account for *tripled* separators. If we have a menu like so ("->" is the current list item when iterating): -> (separator-foo "--") (separator-bar "--") (separator-baz "--") (regular-item "Item") The duplicate remover sees that both the current item and the next are separators, so removes it: -> (separator-foo "--") (separator-baz "--") (regular-item "Item") But then the very next operation is to move to the next list item: (separator-foo "--") -> (separator-baz "--") (regular-item "Item") Now, on the next iteration of the while loop, it won't detect the duplicate because it's too far ahead. Attached is a patch to fix this; it only advances to the next list item when it *didn't* just delete a duplicate separator. That way, it can keep deleting subsequent dupes until it sees a non-separator item. I've only tested this on Emacs 29 so far, but it may occur on Emacs 28 as well. Also, I noticed that separators can appear at the beginning and/or end of the context menu. Should they be removed too? --------------2E7E790652426583308AC00B Content-Type: text/plain; charset=UTF-8; name="0001-Ensure-there-are-no-duplicate-separators-when-creati.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-Ensure-there-are-no-duplicate-separators-when-creati.pa"; filename*1="tch" RnJvbSBiNTk4M2I5MjBlYmEzMmZhOTQ0NzU4ZjUxMGNiNWZlZTZjMjgxZDRiIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFdlZCwgMSBEZWMgMjAyMSAyMTo1NTozMSAtMDgwMApTdWJqZWN0OiBbUEFU Q0hdIEVuc3VyZSB0aGVyZSBhcmUgbm8gZHVwbGljYXRlIHNlcGFyYXRvcnMgd2hlbiBjcmVh dGluZyBhCiBjb250ZXh0IG1lbnUKClByZXZpb3VzbHksIGlmIHRoZXJlIHdlcmUgdGhyZWUg b3IgbW9yZSBjb25zZWN1dGl2ZSBtZW51IHNlcGFyYXRvcnMsCm5vdCBhbGwgb2YgdGhlbSB3 b3VsZCBiZSByZW1vdmVkLgoKKiBsaXNwL21vdXNlLmVsIChjb250ZXh0LW1lbnUtbWFwKTog RW5zdXJlIG5vIGR1cGxpY2F0ZSBzZXBhcmF0b3JzLgotLS0KIGxpc3AvbW91c2UuZWwgfCA4 ICsrKystLS0tCiAxIGZpbGUgY2hhbmdlZCwgNCBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2xpc3AvbW91c2UuZWwgYi9saXNwL21vdXNlLmVsCmluZGV4 IDNhYjlmYmNkZmUuLmVjNDNhZWNkZDAgMTAwNjQ0Ci0tLSBhL2xpc3AvbW91c2UuZWwKKysr IGIvbGlzcC9tb3VzZS5lbApAQCAtMzMwLDEwICszMzAsMTAgQEAgY29udGV4dC1tZW51LW1h cAogICAgIDs7IFJlbW92ZSBkdXBsaWNhdGUgc2VwYXJhdG9ycwogICAgIChsZXQgKChsIG1l bnUpKQogICAgICAgKHdoaWxlIChjb25zcCBsKQotICAgICAgICAod2hlbiAoYW5kIChlcXVh bCAoY2RyLXNhZmUgKGNhciBsKSkgbWVudS1iYXItc2VwYXJhdG9yKQotICAgICAgICAgICAg ICAgICAgIChlcXVhbCAoY2RyLXNhZmUgKGNhZHIgbCkpIG1lbnUtYmFyLXNlcGFyYXRvcikp Ci0gICAgICAgICAgKHNldGNkciBsIChjZGRyIGwpKSkKLSAgICAgICAgKHNldHEgbCAoY2Ry IGwpKSkpCisgICAgICAgIChpZiAoYW5kIChlcXVhbCAoY2RyLXNhZmUgKGNhciBsKSkgbWVu dS1iYXItc2VwYXJhdG9yKQorICAgICAgICAgICAgICAgICAoZXF1YWwgKGNkci1zYWZlIChj YWRyIGwpKSBtZW51LWJhci1zZXBhcmF0b3IpKQorICAgICAgICAgICAgKHNldGNkciBsIChj ZGRyIGwpKQorICAgICAgICAgIChzZXRxIGwgKGNkciBsKSkpKSkKIAogICAgICh3aGVuIChm dW5jdGlvbnAgY29udGV4dC1tZW51LWZpbHRlci1mdW5jdGlvbikKICAgICAgIChzZXRxIG1l bnUgKGZ1bmNhbGwgY29udGV4dC1tZW51LWZpbHRlci1mdW5jdGlvbiBtZW51IGNsaWNrKSkp Ci0tIAoyLjI1LjEKCg== --------------2E7E790652426583308AC00B--