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#50538: [PATCH v3] 28.0.50; electric-pair-mode fails to pair double quotes in some cases in CC mode Date: Wed, 22 Sep 2021 19:01:11 -0700 Message-ID: <543ebfcc-d032-f0cd-f605-3f0607fe1df1@gmail.com> References: <021853bf-0169-c158-ab3d-296b6c144e08@gmail.com> <83r1dufgxu.fsf@gnu.org> <94c7b4ec-813b-515f-d947-116c294dd74b@gmail.com> <456ed31d-77dc-cc2d-2fe9-8fcd379e04c6@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------2B5B6D79F1130855D59AA036" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="35403"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 50538@debbugs.gnu.org To: Alan Mackenzie Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Sep 23 04:02:50 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 1mTE4X-0008x5-Qg for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 23 Sep 2021 04:02:49 +0200 Original-Received: from localhost ([::1]:55236 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mTE4V-00049g-Py for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 22 Sep 2021 22:02:47 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:34988) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mTE3m-00049O-L3 for bug-gnu-emacs@gnu.org; Wed, 22 Sep 2021 22:02:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:40729) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mTE3m-00045C-2D for bug-gnu-emacs@gnu.org; Wed, 22 Sep 2021 22:02:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mTE3l-0008Ns-PM for bug-gnu-emacs@gnu.org; Wed, 22 Sep 2021 22:02:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Jim Porter Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 23 Sep 2021 02:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50538 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 50538-submit@debbugs.gnu.org id=B50538.163236248232173 (code B ref 50538); Thu, 23 Sep 2021 02:02:01 +0000 Original-Received: (at 50538) by debbugs.gnu.org; 23 Sep 2021 02:01:22 +0000 Original-Received: from localhost ([127.0.0.1]:52275 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTE37-0008Mr-Hu for submit@debbugs.gnu.org; Wed, 22 Sep 2021 22:01:21 -0400 Original-Received: from mail-pj1-f44.google.com ([209.85.216.44]:55287) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mTE34-0008MV-O5 for 50538@debbugs.gnu.org; Wed, 22 Sep 2021 22:01:20 -0400 Original-Received: by mail-pj1-f44.google.com with SMTP id me1so3371769pjb.4 for <50538@debbugs.gnu.org>; Wed, 22 Sep 2021 19:01:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=subject:to:cc:references:from:message-id:date:mime-version :in-reply-to:content-language; bh=v0SBj8Kd3PNlEPLsezsCpExlf7YCN5SeidW80aLmGNQ=; b=mGbeM+nTBdNpEBurBS2nmKGBAL8M7ATF9Rs5xwPIoqwho9G2SvJ81tgK31MEo+vIgf 0Y2P6fR8Vp14GCA6TMdcwg/yC8MvoZqLA1lhz6fuK3MRGZyqUYjlHTa7qpTVCPSLfQyH 3j3q3QfvVboyY2Yz08w3y3tsZNFl12WUkL3Nq4EAbnLSMpmq41588krhy8gMFM9IJXlZ iT5p4HmqTk8lbdbGvUCMWMXfKrAGLf800/F/nlVJRU5Srkq9mN0OmiNU/lCpyqx1YoXZ ACv3Ao8b7jLYMGm7AfLrrs+45neAHMIrGr+2gtRZ7cVstsdPCY0hDy9E4e2mQKzZvkvt B9+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :mime-version:in-reply-to:content-language; bh=v0SBj8Kd3PNlEPLsezsCpExlf7YCN5SeidW80aLmGNQ=; b=ZU3MKbvMvcqugeQz8TSYY8h5YLqCH9JZcc5BUCz5KHRWBEzAatpvZW0skuiGBj+qqq rfVdzXXY0XIA+gjewcbOWEDNmWdg21Aos8+1fnwbwLswPHdI3o8Jzw8x3QxBly6F9TTf c6NRqqNsRTuY7yGFlXQcHc+REiV9gNGNt7EV1Z/cWFQiJBOWqWC3kK3WzG1fBeYS0Zib 9yYDNNc7A/Sd3sPlELltRA/mCpSAPtWlEe3mBB3ruVgLAdeFEFXNDjYk44AvEq9eTSag tfBmiMrp/02ApjDr6vqkYrZfTrGrJ8Rt0BdJmh8vvbHPE7ErxuLb5cpqoINPfLXL/9SS FCBA== X-Gm-Message-State: AOAM530DCL8hOijPNkQ4Tgv8nkZWuscm363AsF8cwEdzeVS0VzMY4Zvm cEfXZ2WCCshLnzXlKI1M/yPDjTsp8uc= X-Google-Smtp-Source: ABdhPJwVJ4CFn8skJcN7cruRLvvdJCjPIFuIllmB1wCVnHs/WGRawIUdK5GLaZ5ZEvBy14zmmUKCtg== X-Received: by 2002:a17:90a:718c:: with SMTP id i12mr14912424pjk.182.1632362472371; Wed, 22 Sep 2021 19:01:12 -0700 (PDT) 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 t13sm6154240pjj.1.2021.09.22.19.01.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 22 Sep 2021 19:01:11 -0700 (PDT) In-Reply-To: Content-Language: en-US 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:215156 Archived-At: This is a multi-part message in MIME format. --------------2B5B6D79F1130855D59AA036 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Ok, I've attached an updated patch that should apply cleanly on top of the patches for bug#49518. The tests still pass locally for me. If there's anything else that needs fixed/adjusted, just let me know. --------------2B5B6D79F1130855D59AA036 Content-Type: text/plain; charset=UTF-8; name="0001-Improve-behavior-of-electric-pair-mode-in-cc-mode.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-Improve-behavior-of-electric-pair-mode-in-cc-mode.patch" RnJvbSBjNGQwNjljMDEwZDVlNTI2ZmE4NWQ1ODAwZmY4ZGU1YmI2YTUyYjdlIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFRodSwgMTYgU2VwIDIwMjEgMTQ6MzI6MTcgLTA3MDAKU3ViamVjdDogW1BB VENIXSBJbXByb3ZlIGJlaGF2aW9yIG9mICdlbGVjdHJpYy1wYWlyLW1vZGUnIGluICdjYy1t b2RlJwoKVGhpcyBlbnN1cmVzIHRoYXQgcXVvdGVzIGFyZSBwYWlyZWQgY29ycmVjdGx5IHdp dGhpbiBjb21tZW50cywgYWxsb3dzIGZvcgppbnNlcnRpb24gb2YgcXVvdGUgcGFpcnMgaW1t ZWRpYXRlbHkgYmVmb3JlIGFub3RoZXIgcXVvdGUsIGFuZCBhbGxvd3MKaW5zZXJ0aW5nIHF1 b3RlIHBhaXJzIHdpdGhpbiBhIHN0cmluZyAodGh1cyBzcGxpdHRpbmcgdGhlIHN0cmluZyBp biB0d28pLgoKKiBsaXNwL3Byb2dtb2Rlcy9jYy1tb2RlLmVsIChjLWVsZWN0cmljLXBhaXIt aW5oaWJpdC1wcmVkaWNhdGUpOgpJbmhpYml0IGluc2VydGlvbiBvZiBwYWlyZWQgcXVvdGUg aW4gZmV3ZXIgY2FzZXMuCiogdGVzdC9saXNwL2VsZWN0cmljLXRlc3RzLmVsIChkZWZpbmUt ZWxlY3RyaWMtcGFpci10ZXN0KToKQWRkICdjLW1vZGUnIHRvIGxpc3Qgb2YgbW9kZXMgdG8g dGVzdCBieSBkZWZhdWx0LgotLS0KIGxpc3AvcHJvZ21vZGVzL2NjLW1vZGUuZWwgICB8IDIy ICsrKysrKysrKysrKysrKy0tLS0tLS0KIHRlc3QvbGlzcC9lbGVjdHJpYy10ZXN0cy5lbCB8 ICA1ICsrKystCiAyIGZpbGVzIGNoYW5nZWQsIDE5IGluc2VydGlvbnMoKyksIDggZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvbGlzcC9wcm9nbW9kZXMvY2MtbW9kZS5lbCBiL2xpc3Av cHJvZ21vZGVzL2NjLW1vZGUuZWwKaW5kZXggOGIzMDI0MTQ0OS4uODAxMzc1OTBjNyAxMDA2 NDQKLS0tIGEvbGlzcC9wcm9nbW9kZXMvY2MtbW9kZS5lbAorKysgYi9saXNwL3Byb2dtb2Rl cy9jYy1tb2RlLmVsCkBAIC0yNTQ5LDE4ICsyNTQ5LDI2IEBAIGMtZWxlY3RyaWMtcGFpci1p bmhpYml0LXByZWRpY2F0ZQogCiBBdCB0aGUgdGltZSBvZiBjYWxsLCBwb2ludCBpcyBqdXN0 IGFmdGVyIHRoZSBuZXdseSBpbnNlcnRlZCBDSEFSLgogCi1XaGVuIENIQVIgaXMgXCIsIHQg d2lsbCBiZSByZXR1cm5lZCB1bmxlc3MgdGhlIFwiIGlzIG1hcmtlZCB3aXRoCi1hIHN0cmlu ZyBmZW5jZSBzeW50YXgtdGFibGUgdGV4dCBwcm9wZXJ0eS4gIEZvciBvdGhlciBjaGFyYWN0 ZXJzLAotdGhlIGRlZmF1bHQgdmFsdWUgb2YgYGVsZWN0cmljLXBhaXItaW5oaWJpdC1wcmVk aWNhdGUnIGlzIGNhbGxlZAotYW5kIGl0cyB2YWx1ZSByZXR1cm5lZC4KK1doZW4gQ0hBUiBp cyBcIiBhbmQgbm90IHdpdGhpbiBhIGNvbW1lbnQsIHQgd2lsbCBiZSByZXR1cm5lZCBpZgor dGhlIHF1b3RlcyBvbiB0aGUgY3VycmVudCBsaW5lIGFyZSBhbHJlYWR5IGJhbGFuY2VkIChp LmUuIGlmIHRoZQorbGFzdCBcIiBpcyBub3QgbWFya2VkIHdpdGggYSBzdHJpbmcgZmVuY2Ug c3ludGF4LXRhYmxlIHRleHQKK3Byb3BlcnR5KS4gIEZvciBvdGhlciBjYXNlcywgdGhlIGRl ZmF1bHQgdmFsdWUgb2YKK2BlbGVjdHJpYy1wYWlyLWluaGliaXQtcHJlZGljYXRlJyBpcyBj YWxsZWQgYW5kIGl0cyB2YWx1ZQorcmV0dXJuZWQuCiAKIFRoaXMgZnVuY3Rpb24gaXMgdGhl IGFwcHJvcHJpYXRlIHZhbHVlIG9mCiBgZWxlY3RyaWMtcGFpci1pbmhpYml0LXByZWRpY2F0 ZScgZm9yIENDIE1vZGUgbW9kZXMsIHdoaWNoIG1hcmsKIGludmFsaWQgc3RyaW5ncyB3aXRo IHN1Y2ggYSBzeW50YXggdGFibGUgdGV4dCBwcm9wZXJ0eSBvbiB0aGUKIG9wZW5pbmcgXCIg YW5kIHRoZSBuZXh0IHVuZXNjYXBlZCBlbmQgb2YgbGluZS4iCi0gIChpZiAoZXEgY2hhciA/ XCIpCi0gICAgICAobm90IChlcXVhbCAoZ2V0LXRleHQtcHJvcGVydHkgKDEtIChwb2ludCkp ICdjLWZsLXN5bi10YWIpICcoMTUpKSkKLSAgICAoZnVuY2FsbCAoZGVmYXVsdC12YWx1ZSAn ZWxlY3RyaWMtcGFpci1pbmhpYml0LXByZWRpY2F0ZSkgY2hhcikpKQorICAob3IgKGFuZCAo ZXEgY2hhciA/XCIpCisJICAgKG5vdCAobWVtcSAoY2FkciAoYy1zZW1pLXBwLXRvLWxpdGVy YWwgKDEtIChwb2ludCkpKSkgJyhjIGMrKykpKQorCSAgIChsZXQgKChsYXN0LXF1b3RlIChz YXZlLW1hdGNoLWRhdGEKKwkJCSAgICAgICAoc2F2ZS1leGN1cnNpb24KKwkJCQkgKGdvdG8t Y2hhciAoYy1wb2ludCAnZW9sbCkpCisJCQkJIChzZWFyY2gtYmFja3dhcmQgIlwiIikpKSkp CisJICAgICAobm90IChlcXVhbCAoYy1nZXQtY2hhci1wcm9wZXJ0eSBsYXN0LXF1b3RlICdj LWZsLXN5bi10YWIpCisJCQkgJygxNSkpKSkpCisgICAgICAoZnVuY2FsbCAoZGVmYXVsdC12 YWx1ZSAnZWxlY3RyaWMtcGFpci1pbmhpYml0LXByZWRpY2F0ZSkgY2hhcikpKQogCiAMCiA7 OyBTdXBwb3J0IGZvciBDCmRpZmYgLS1naXQgYS90ZXN0L2xpc3AvZWxlY3RyaWMtdGVzdHMu ZWwgYi90ZXN0L2xpc3AvZWxlY3RyaWMtdGVzdHMuZWwKaW5kZXggNDZiY2JmY2UzMC4uNGIz YTM5Yjg1ZiAxMDA2NDQKLS0tIGEvdGVzdC9saXNwL2VsZWN0cmljLXRlc3RzLmVsCisrKyBi L3Rlc3QvbGlzcC9lbGVjdHJpYy10ZXN0cy5lbApAQCAtMzIsNiArMzIsOSBAQAogKHJlcXVp cmUgJ2VsZWMtcGFpcikKIChyZXF1aXJlICdjbC1saWIpCiAKKzs7IFdoZW4gcnVubmluZyB0 ZXN0cyBpbiBjLW1vZGUsIHVzZSBzaW5nbGUtbGluZSBjb21tZW50cyAoLy8pLgorKGFkZC1o b29rICdjLW1vZGUtaG9vayAobGFtYmRhICgpIChjLXRvZ2dsZS1jb21tZW50LXN0eWxlIC0x KSkpCisKIChkZWZ1biBjYWxsLXdpdGgtc2F2ZWQtZWxlY3RyaWMtbW9kZXMgKGZuKQogICAo bGV0ICgoc2F2ZWQtZWxlY3RyaWMgKGlmIGVsZWN0cmljLXBhaXItbW9kZSAxIC0xKSkKICAg ICAgICAgKHNhdmVkLWxheW91dCAoaWYgZWxlY3RyaWMtbGF5b3V0LW1vZGUgMSAtMSkpCkBA IC0xNzQsNyArMTc3LDcgQEAgZGVmaW5lLWVsZWN0cmljLXBhaXItdGVzdAogICAgICAgICAg IGV4cGVjdGVkLXN0cmluZwogICAgICAgICAgIGV4cGVjdGVkLXBvaW50CiAgICAgICAgICAg YmluZGluZ3MKLSAgICAgICAgICAobW9kZXMgJyhxdW90ZSAocnVieS1tb2RlIGpzLW1vZGUg cHl0aG9uLW1vZGUpKSkKKyAgICAgICAgICAobW9kZXMgJyhxdW90ZSAocnVieS1tb2RlIGpz LW1vZGUgcHl0aG9uLW1vZGUgYy1tb2RlKSkpCiAgICAgICAgICAgKHRlc3QtaW4tY29tbWVu dHMgdCkKICAgICAgICAgICAodGVzdC1pbi1zdHJpbmdzIHQpCiAgICAgICAgICAgKHRlc3Qt aW4tY29kZSB0KQotLSAKMi4yNS4xCgo= --------------2B5B6D79F1130855D59AA036--