Received: (at 76018) by debbugs.gnu.org; 28 May 2025 17:19:28 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed May 28 13:19:28 2025 Received: from localhost ([127.0.0.1]:55921 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1uKKR4-0000BN-8X for submit <at> debbugs.gnu.org; Wed, 28 May 2025 13:19:28 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]:44429) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <jporterbugs@HIDDEN>) id 1uKKR0-0000AA-AP for 76018 <at> debbugs.gnu.org; Wed, 28 May 2025 13:19:24 -0400 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-2320d06b728so1130575ad.1 for <76018 <at> debbugs.gnu.org>; Wed, 28 May 2025 10:19:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748452755; x=1749057555; darn=debbugs.gnu.org; h=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=jGfAnv/QQmVfSlGDqsbj5LysGTkw+fOM8TDPs4+QEsQ=; b=abNpeY+ehp3Nijs+clK2XTJEB36EUKNVLS71cwiz9DC+3mIU5IPPxKr/KxXhkqVmLS fFuxM+zuOffDPdaj2KG2bBZa4YYeHR3nQOJ+Rk/uV76L+ySVo/CuKQp7jSqvzhSOFdel /LigFadOwuyE4vnN7w0/QPmuwGhg9pxqEuO+UsR6mSo9x2NyXuFCj9bkLLNbAP/ww6rp XU2TGTrDYoRZrUJgvl1wO4l1jDF2oZD7vyE73G4Zax8x5bnHHxQNmZMG5dQEAsHU/ls7 R+TWOnxihXbI8/2gv0r4zsdk9QXliLBbRifRRAglCmkNsmfwgyJAgJK2YL9qYcTFnlRM 4PMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748452755; x=1749057555; h=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=jGfAnv/QQmVfSlGDqsbj5LysGTkw+fOM8TDPs4+QEsQ=; b=a8zTPeNCqvx969EX8sPtqOLMBzsfb4s+kfxh4NdlSXPN5zFCt4xobSNlqEQm/Bu3Bk u5RT/6J3FTNGEUM/PyVkS4UY71KtTx8+JMtWet4RV1i2VV7hSDgP0bEkfgtOAMH34UgV 8H5PJ2GL2maJT0ogTgl81Nvr7tMNkomsxiYBVLwNoxf5jZmNitEnXptB2qi3bQH/Ggc2 qwMyL1PXuv7gEKpfJtliUtO/W4dn146Y2LVTBvpnwQvokn37s7Okk3YGMaPyagv+Lzoi XPePWCQMb/RHWA09RmxdlmJhoyVLFJ4FOXY4/5WgmA3gC+Z2fI3g0tlAR9brB4pWMO/p /Jpw== X-Forwarded-Encrypted: i=1; AJvYcCUN8L6RL02ZwLYie+LDxWEFDy/1jL7+P1glRRJDJ3rjIdZCd1pqcuysgKhWrN3DYAOhYheN4A==@debbugs.gnu.org X-Gm-Message-State: AOJu0YylpPw3MPQpL8kf75qzY68nDeWowyvsAQhvHIbNrpqmIdPQh610 AC7G4o5xIbhdnwIwka4ir/Zvl4AMszT7AsLO68PFqs2eRpidTeLCCxMn X-Gm-Gg: ASbGncvPSdmFrrPprpDjEi8H6ZYSvocCFqdTNWznqsAU4PI5n07ZvcI+oc8EFMYAQ36 R88v5RajW8wbCjzHnaJT9BixLIS589qUEa9VwVv61uKeXWbaBkRKtRmsDMJ6nOLGH5Ns3KAYOSs gB/mlH3ys5OkuXKgG0MHaU9RN+dh2fHQoy8MSF6C5bD0zYcyTn8TAArcI+gCUH/f4FJAoSFjgyw MgH3XDBlOAsyPrqenIze6n5EydKYefismWt/masJJp18qN9w0abXpSL3NkAdGbF8OMuy1yNWdbr MPPZXH/HnkW5iifro9sS9Y500P5rjkQyG8h8VT3a+a0N6yB/0IWXmbP99NAYN4C9Nr7VeQdJmt9 wXE9Xn/AocPrDOZ8FBwpBKkUk6R0bgPw= X-Google-Smtp-Source: AGHT+IEKDCRJ+sqcOky8Dx7ZPpAhxWFSWppltR3bGG4RD1A7Qogb1J7zr4S63Au9Z7YX8RrjurSOzA== X-Received: by 2002:a17:903:41c7:b0:234:c8f6:1b11 with SMTP id d9443c01a7336-234d2c4a4f9mr48148015ad.44.1748452754813; Wed, 28 May 2025 10:19:14 -0700 (PDT) Received: from [192.168.1.2] (syn-076-168-144-128.res.spectrum.com. [76.168.144.128]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-234d35bd617sm14320725ad.235.2025.05.28.10.19.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 28 May 2025 10:19:14 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------Rqc9jJRLftXUKkOFT0R8ZQls" Message-ID: <3ee6e9f1-0d02-97a7-2676-06f7e67755cd@HIDDEN> Date: Wed, 28 May 2025 10:19:15 -0700 MIME-Version: 1.0 Subject: Re: bug#76018: 31.0.50; wrap-prefix properties from visual-wrap-prefix-mode proliferate Content-Language: en-US To: Stefan Monnier <monnier@HIDDEN> References: <87a5b42q33.fsf@HIDDEN> <9b10777c-6b8c-2b2e-c906-b2d797dece00@HIDDEN> <19a7b709-5b05-dd29-92e5-ac6163ef1873@HIDDEN> <86h616xp94.fsf@HIDDEN> <jwvzfeynqhd.fsf-monnier+emacs@HIDDEN> <76bc329d-e588-4357-13ec-2d6e5510a97c@HIDDEN> <jwvbjrdolu0.fsf-monnier+emacs@HIDDEN> <73ae4a9b-9987-ea94-646b-7a0f3154af7e@HIDDEN> <jwv7c20n6eq.fsf-monnier+emacs@HIDDEN> From: Jim Porter <jporterbugs@HIDDEN> In-Reply-To: <jwv7c20n6eq.fsf-monnier+emacs@HIDDEN> X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 76018 Cc: Po Lu <luangruo@HIDDEN>, 76018 <at> debbugs.gnu.org, Eli Zaretskii <eliz@HIDDEN>, kevin.legouguec@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------Rqc9jJRLftXUKkOFT0R8ZQls Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 5/28/2025 7:46 AM, Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors wrote: > Using the `rear-nonsticky` or `front-sticky` properties is a PITA with > lots of odd corner cases, so I'd much rather we try to use the > standard approach of removing all our properties at start. Ok, I removed that. That means we don't need to add 'append-text-property' just yet, though it would probably be a useful function to add one day. I also wrote some tests for 'remove-display-text-property'. In the process of doing so, I found a nasty bug in the existing implementation (fixed in the first patch). --------------Rqc9jJRLftXUKkOFT0R8ZQls Content-Type: text/plain; charset=UTF-8; name="0001-Don-t-delete-in-place-when-replacing-a-display-prope.patch" Content-Disposition: attachment; filename*0="0001-Don-t-delete-in-place-when-replacing-a-display-prope.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSA2ZTM2MmFkMzc4NDMxYzMzOWYyYmFiN2U0MTc1MzBmYjQ5ZDQwMjIwIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFdlZCwgMjggTWF5IDIwMjUgMDk6NTU6NTggLTA3MDAKU3ViamVjdDogW1BB VENIIDEvM10gRG9uJ3QgZGVsZXRlIGluLXBsYWNlIHdoZW4gcmVwbGFjaW5nIGEgZGlzcGxh eSBwcm9wZXJ0eQoKV2hlbiBjYWxsaW5nICdhZGQtZGlzcGxheS1wcm9wZXJ0eScgb24gYSBy ZWdpb24gb2YgdGV4dCB0aGF0IGFscmVhZHkKY29udGFpbnMgdGhlIHNwZWNpZmllZCBkaXNw bGF5IFBST1AsIHdlIGRlbGV0ZSB0aGUgb2xkIHByb3BlcnR5IGZyb20gdGhlCmxpc3Qgb2Yg dmFsdWVzLiAgSWYgdGhpcyBsaXN0IGNhbWUgZGlyZWN0bHkgZnJvbSB0aGUgcHJvcGVydHkg dmFsdWUsIHdlCm5lZWQgdG8gYmUgY2FyZWZ1bCBub3QgdG8gZGVsZXRlIGl0IGluLXBsYWNl LCBzaW5jZSBvdGhlciByZWdpb25zIG9mCnRleHQgY291bGQgYmUgdXNpbmcgdGhlIHNhbWUg bGlzdCBvYmplY3QuICBJbnN0ZWFkLCBpZiBkZWxldGluZyBhCnByb3BlcnR5IGZyb20gYSBs aXN0LCB1c2UgJ3JlbW92ZScuCgoqIGxpc3AvZW1hY3MtbGlzcC9zdWJyLXguZWwgKGFkZC1k aXNwbGF5LXRleHQtcHJvcGVydHkpOiBEb24ndCBkZWxldGUKaW4tcGxhY2UgZm9yIGxpc3Qg dmFsdWVzLgoKKiB0ZXN0L2xpc3AvZW1hY3MtbGlzcC9zdWJyLXgtdGVzdHMuZWwKKHN1YnIt eC10ZXN0LWFkZC1kaXNwbGF5LXRleHQtcHJvcGVydHkpOiBVcGRhdGUgdGVzdC4KLS0tCiBs aXNwL2VtYWNzLWxpc3Avc3Vici14LmVsICAgICAgICAgICAgfCAxNSArKysrKysrKysrKy0t LS0KIHRlc3QvbGlzcC9lbWFjcy1saXNwL3N1YnIteC10ZXN0cy5lbCB8IDI1ICsrKysrKysr KysrKysrKysrLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMjggaW5zZXJ0aW9ucygrKSwg MTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGlzcC9lbWFjcy1saXNwL3N1YnIteC5l bCBiL2xpc3AvZW1hY3MtbGlzcC9zdWJyLXguZWwKaW5kZXggZWFhODExOWVhZDcuLjVmMWYy ODA1YjY5IDEwMDY0NAotLS0gYS9saXNwL2VtYWNzLWxpc3Avc3Vici14LmVsCisrKyBiL2xp c3AvZW1hY3MtbGlzcC9zdWJyLXguZWwKQEAgLTQzOCwyMiArNDM4LDI5IEBAIGFkZC1kaXNw bGF5LXRleHQtcHJvcGVydHkKICAgICAgICAgICAocHV0LXRleHQtcHJvcGVydHkgc3ViLXN0 YXJ0IHN1Yi1lbmQgJ2Rpc3BsYXkgKGxpc3QgcHJvcCB2YWx1ZSkKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgb2JqZWN0KQogICAgICAgICA7OyBXZSBoYXZlIG9sZCBwcm9wZXJ0 aWVzLgotICAgICAgICAobGV0ICgodmVjdG9yIG5pbCkpCisgICAgICAgIChsZXQgKHR5cGUp CiAgICAgICAgICAgOzsgTWFrZSBkaXNwIGludG8gYSBsaXN0LgogICAgICAgICAgIChzZXRx IGRpc3AKICAgICAgICAgICAgICAgICAoY29uZAogICAgICAgICAgICAgICAgICAoKHZlY3Rv cnAgZGlzcCkKLSAgICAgICAgICAgICAgICAgIChzZXRxIHZlY3RvciB0KQorICAgICAgICAg ICAgICAgICAgKHNldHEgdHlwZSAndmVjdG9yKQogICAgICAgICAgICAgICAgICAgKHNlcS1p bnRvIGRpc3AgJ2xpc3QpKQogICAgICAgICAgICAgICAgICAoKG5vdCAoY29uc3AgKGNhciBk aXNwKSkpCisgICAgICAgICAgICAgICAgICAoc2V0cSB0eXBlICdzY2FsYXIpCiAgICAgICAg ICAgICAgICAgICAobGlzdCBkaXNwKSkKICAgICAgICAgICAgICAgICAgKHQKKyAgICAgICAg ICAgICAgICAgIChzZXRxIHR5cGUgJ2xpc3QpCiAgICAgICAgICAgICAgICAgICBkaXNwKSkp CiAgICAgICAgICAgOzsgUmVtb3ZlIGFueSBvbGQgaW5zdGFuY2VzLgogICAgICAgICAgICh3 aGVuLWxldCogKChvbGQgKGFzc29jIHByb3AgZGlzcCkpKQotICAgICAgICAgICAgKHNldHEg ZGlzcCAoZGVsZXRlIG9sZCBkaXNwKSkpCisgICAgICAgICAgICA7OyBJZiB0aGUgcHJvcGVy dHkgdmFsdWUgd2FzIGEgbGlzdCwgZG9uJ3QgbW9kaWZ5IHRoZQorICAgICAgICAgICAgOzsg b3JpZ2luYWwgdmFsdWUgaW4gcGxhY2U7IGl0IGNvdWxkIGJlIHVzZWQgYnkgb3RoZXIKKyAg ICAgICAgICAgIDs7IHJlZ2lvbnMgb2YgdGV4dC4KKyAgICAgICAgICAgIChzZXRxIGRpc3Ag KGlmIChlcSB0eXBlICdsaXN0KQorICAgICAgICAgICAgICAgICAgICAgICAgICAgKHJlbW92 ZSBvbGQgZGlzcCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAoZGVsZXRlIG9sZCBkaXNw KSkpKQogICAgICAgICAgIChzZXRxIGRpc3AgKGNvbnMgKGxpc3QgcHJvcCB2YWx1ZSkgZGlz cCkpCi0gICAgICAgICAgKHdoZW4gdmVjdG9yCisgICAgICAgICAgKHdoZW4gKGVxIHR5cGUg J3ZlY3RvcikKICAgICAgICAgICAgIChzZXRxIGRpc3AgKHNlcS1pbnRvIGRpc3AgJ3ZlY3Rv cikpKQogICAgICAgICAgIDs7IEZpbmFsbHkgdXBkYXRlIHRoZSByYW5nZS4KICAgICAgICAg ICAocHV0LXRleHQtcHJvcGVydHkgc3ViLXN0YXJ0IHN1Yi1lbmQgJ2Rpc3BsYXkgZGlzcCBv YmplY3QpKSkKZGlmZiAtLWdpdCBhL3Rlc3QvbGlzcC9lbWFjcy1saXNwL3N1YnIteC10ZXN0 cy5lbCBiL3Rlc3QvbGlzcC9lbWFjcy1saXNwL3N1YnIteC10ZXN0cy5lbAppbmRleCBmNjY3 NTYzN2ZlZi4uNWNlZWZkOGQxMWMgMTAwNjQ0Ci0tLSBhL3Rlc3QvbGlzcC9lbWFjcy1saXNw L3N1YnIteC10ZXN0cy5lbAorKysgYi90ZXN0L2xpc3AvZW1hY3MtbGlzcC9zdWJyLXgtdGVz dHMuZWwKQEAgLTY5NiwxOCArNjk2LDI3IEBAIHN1YnIteC10ZXN0LWFkZC1kaXNwbGF5LXRl eHQtcHJvcGVydHkKICAgICAoaW5zZXJ0ICJGb28gYmFyIHpvdCBnYXpvbmsiKQogICAgIChh ZGQtZGlzcGxheS10ZXh0LXByb3BlcnR5IDQgOCAnaGVpZ2h0IDIuMCkKICAgICAoYWRkLWRp c3BsYXktdGV4dC1wcm9wZXJ0eSAyIDEyICdyYWlzZSAwLjUpCi0gICAgKHNob3VsZCAoZXF1 YWwgKGdldC10ZXh0LXByb3BlcnR5IDIgJ2Rpc3BsYXkpICcocmFpc2UgMC41KSkpCi0gICAg KHNob3VsZCAoZXF1YWwgKGdldC10ZXh0LXByb3BlcnR5IDUgJ2Rpc3BsYXkpCi0gICAgICAg ICAgICAgICAgICAgJygocmFpc2UgMC41KSAoaGVpZ2h0IDIuMCkpKSkKLSAgICAoc2hvdWxk IChlcXVhbCAoZ2V0LXRleHQtcHJvcGVydHkgOSAnZGlzcGxheSkgJyhyYWlzZSAwLjUpKSkp CisgICAgKGFkZC1kaXNwbGF5LXRleHQtcHJvcGVydHkgNiAxMCAnaGVpZ2h0IDEuMCkKKyAg ICAoc2hvdWxkIChlcXVhbC1pbmNsdWRpbmctcHJvcGVydGllcworICAgICAgICAgICAgIChi dWZmZXItc3RyaW5nKQorICAgICAgICAgICAgICMoIkZvbyBiYXIgem90IGdhem9uayIKKyAg ICAgICAgICAgICAgIDEgMyAoZGlzcGxheSAocmFpc2UgMC41KSkKKyAgICAgICAgICAgICAg IDMgNSAoZGlzcGxheSAoKHJhaXNlIDAuNSkgKGhlaWdodCAyLjApKSkKKyAgICAgICAgICAg ICAgIDUgOSAoZGlzcGxheSAoKGhlaWdodCAxLjApIChyYWlzZSAwLjUpKSkKKyAgICAgICAg ICAgICAgIDkgMTEgKGRpc3BsYXkgKHJhaXNlIDAuNSkpKSkpKQogICAod2l0aC10ZW1wLWJ1 ZmZlcgogICAgIChpbnNlcnQgIkZvbyBiYXIgem90IGdhem9uayIpCiAgICAgKHB1dC10ZXh0 LXByb3BlcnR5IDQgOCAnZGlzcGxheSBbKGhlaWdodCAyLjApXSkKICAgICAoYWRkLWRpc3Bs YXktdGV4dC1wcm9wZXJ0eSAyIDEyICdyYWlzZSAwLjUpCi0gICAgKHNob3VsZCAoZXF1YWwg KGdldC10ZXh0LXByb3BlcnR5IDIgJ2Rpc3BsYXkpICcocmFpc2UgMC41KSkpCi0gICAgKHNo b3VsZCAoZXF1YWwgKGdldC10ZXh0LXByb3BlcnR5IDUgJ2Rpc3BsYXkpCi0gICAgICAgICAg ICAgICAgICAgWyhyYWlzZSAwLjUpIChoZWlnaHQgMi4wKV0pKQotICAgIChzaG91bGQgKGVx dWFsIChnZXQtdGV4dC1wcm9wZXJ0eSA5ICdkaXNwbGF5KSAnKHJhaXNlIDAuNSkpKSkKKyAg ICAoYWRkLWRpc3BsYXktdGV4dC1wcm9wZXJ0eSA2IDEwICdoZWlnaHQgMS4wKQorICAgIChz aG91bGQgKGVxdWFsLWluY2x1ZGluZy1wcm9wZXJ0aWVzCisgICAgICAgICAgICAgKGJ1ZmZl ci1zdHJpbmcpCisgICAgICAgICAgICAgIygiRm9vIGJhciB6b3QgZ2F6b25rIgorICAgICAg ICAgICAgICAgMSAzIChkaXNwbGF5IChyYWlzZSAwLjUpKQorICAgICAgICAgICAgICAgMyA1 IChkaXNwbGF5IFsocmFpc2UgMC41KSAoaGVpZ2h0IDIuMCldKQorICAgICAgICAgICAgICAg NSA3IChkaXNwbGF5IFsoaGVpZ2h0IDEuMCkgKHJhaXNlIDAuNSldKQorICAgICAgICAgICAg ICAgNyA5IChkaXNwbGF5ICgoaGVpZ2h0IDEuMCkgKHJhaXNlIDAuNSkpKQorICAgICAgICAg ICAgICAgOSAxMSAoZGlzcGxheSAocmFpc2UgMC41KSkpKSkpCiAgICh3aXRoLXRlbXAtYnVm ZmVyCiAgICAgKHNob3VsZCAoZXF1YWwtaW5jbHVkaW5nLXByb3BlcnRpZXMKICAgICAgICAg ICAgICAobGV0ICgoc3RyIChjb3B5LXNlcXVlbmNlICJzb21lIHVzZWxlc3Mgc3RyaW5nIikp KQotLSAKMi4yNS4xCgo= --------------Rqc9jJRLftXUKkOFT0R8ZQls Content-Type: text/plain; charset=UTF-8; name="0002-Clean-up-text-properties-in-visual-wrap-prefix-mode.patch" Content-Disposition: attachment; filename*0="0002-Clean-up-text-properties-in-visual-wrap-prefix-mode.pat"; filename*1="ch" Content-Transfer-Encoding: base64 RnJvbSAzNmY1MmRjZTI5OWUxOGUyMDUzNWFmNTM4N2QzODhjZWI1MWVmNzExIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFdlZCwgMjggTWF5IDIwMjUgMDk6NDQ6MzQgLTA3MDAKU3ViamVjdDogW1BB VENIIDIvM10gQ2xlYW4gdXAgdGV4dCBwcm9wZXJ0aWVzIGluICd2aXN1YWwtd3JhcC1wcmVm aXgtbW9kZScKCkJlZm9yZSByZWZvbnRpZnlpbmcgYSByZWdpb24sIHJlbW92ZSBhbnkgdGV4 dCBwcm9wZXJ0aWVzIHdlIGNhcmUgYWJvdXQKc28gdGhhdCB3ZSBkb24ndCBlbmQgdXAgd2l0 aCBzdHJheSBwcm9wZXJ0aWVzLiAgQWRkaXRpb25hbGx5LCBtYWtlIHN1cmUKdG8gcmVtb3Zl IGFsbCB0aGUgcHJvcGVydGllcyB3aGVuIGRlYWN0aXZhdGluZyB0aGUgbW9kZS4KCiogbGlz cC9lbWFjcy1saXNwL3N1YnIteC5lbCAoYWRkLXJlbW92ZS0tZGlzcGxheS10ZXh0LXByb3Bl cnR5KTogTmV3CmZ1bmN0aW9uLCBleHRyYWN0ZWQgZnJvbS4uLgooYWRkLWRpc3BsYXktdGV4 dC1wcm9wZXJ0eSk6IC4uLiBoZXJlLgoocmVtb3ZlLWRpc3BsYXktdGV4dC1wcm9wZXJ0eSk6 IE5ldyBmdW5jdGlvbi4KCiogbGlzcC92aXN1YWwtd3JhcC5lbCAodmlzdWFsLXdyYXAtLXJl bW92ZS1wcm9wZXJ0aWVzKTogTmV3IGZ1bmN0aW9uLi4uCih2aXN1YWwtd3JhcC1wcmVmaXgt ZnVuY3Rpb24sIHZpc3VhbC13cmFwLXByZWZpeC1tb2RlKTogLi4uIGNhbGwgaXQuCgoqIHRl c3QvbGlzcC9lbWFjcy1saXNwL3N1YnIteC10ZXN0cy5lbAooc3Vici14LXRlc3QtcmVtb3Zl LWRpc3BsYXktdGV4dC1wcm9wZXJ0eSk6IE5ldyB0ZXN0LgoKKiB0ZXN0L2xpc3AvdmlzdWFs LXdyYXAtdGVzdHMuZWwKKHZpc3VhbC13cmFwLXRlc3RzL3dyYXAtcHJlZml4LXN0aWNraW5l c3MsIHZpc3VhbC13cmFwLXRlc3RzL2NsZWFudXApOgpOZXcgdGVzdHMuCgoqIGRvYy9saXNw cmVmL2Rpc3BsYXkudGV4aSAoRGlzcGxheSBQcm9wZXJ0eSk6IERvY3VtZW50CidyZW1vdmUt ZGlzcGxheS10ZXh0LXByb3BlcnR5Jy4KCiogZXRjL05FV1M6IEFubm91bmNlICdyZW1vdmUt ZGlzcGxheS10ZXh0LXByb3BlcnR5JyAoYnVnIzc2MDE4KS4KLS0tCiBkb2MvbGlzcHJlZi9k aXNwbGF5LnRleGkgICAgICAgICAgICAgfCAzMiArKysrKysrKysrKysrKwogZXRjL05FV1Mg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgIDYgKysrCiBsaXNwL2VtYWNzLWxpc3Av c3Vici14LmVsICAgICAgICAgICAgfCA2NSArKysrKysrKysrKysrKysrKysrLS0tLS0tLS0t CiBsaXNwL3Zpc3VhbC13cmFwLmVsICAgICAgICAgICAgICAgICAgfCAxMSArKysrLQogdGVz dC9saXNwL2VtYWNzLWxpc3Avc3Vici14LXRlc3RzLmVsIHwgMzggKysrKysrKysrKysrKysr KwogdGVzdC9saXNwL3Zpc3VhbC13cmFwLXRlc3RzLmVsICAgICAgIHwgNDAgKysrKysrKysr KysrKysrKy0KIDYgZmlsZXMgY2hhbmdlZCwgMTY4IGluc2VydGlvbnMoKyksIDI0IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RvYy9saXNwcmVmL2Rpc3BsYXkudGV4aSBiL2RvYy9s aXNwcmVmL2Rpc3BsYXkudGV4aQppbmRleCAzYjQ4Y2I5MzQwNS4uNzdhNTM5NDhiNWUgMTAw NjQ0Ci0tLSBhL2RvYy9saXNwcmVmL2Rpc3BsYXkudGV4aQorKysgYi9kb2MvbGlzcHJlZi9k aXNwbGF5LnRleGkKQEAgLTUyOTksNiArNTI5OSwzOCBAQCBEaXNwbGF5IFByb3BlcnR5CiBJ ZiBAY29kZXtuaWx9LCB0aGlzIGRlZmF1bHRzIHRvIHRoZSBjdXJyZW50IGJ1ZmZlci4KIEBl bmQgZGVmdW4KIAorQGRlZnVuIHJlbW92ZS1kaXNwbGF5LXRleHQtcHJvcGVydHkgc3RhcnQg ZW5kIHByb3AgJm9wdGlvbmFsIG9iamVjdAorUmVtb3ZlIEBjb2Rle2Rpc3BsYXl9IHByb3Bl cnR5IEB2YXJ7cHJvcH0gZnJvbSB0aGUgdGV4dCBmcm9tIEB2YXJ7c3RhcnR9Cit0byBAdmFy e2VuZH0uCisKK0lmIGFueSB0ZXh0IGluIHRoZSByZWdpb24gaGFzIGFueSBvdGhlciBAY29k ZXtkaXNwbGF5fSBwcm9wZXJ0aWVzLCB0aG9zZQorcHJvcGVydGllcyBhcmUgcmV0YWluZWQu ICBGb3IgaW5zdGFuY2U6CisKK0BsaXNwCisoYWRkLWRpc3BsYXktdGV4dC1wcm9wZXJ0eSAx IDggJ3JhaXNlIDAuNSkKKyhhZGQtZGlzcGxheS10ZXh0LXByb3BlcnR5IDQgOCAnaGVpZ2h0 IDIuMCkKKyhyZW1vdmUtZGlzcGxheS10ZXh0LXByb3BlcnR5IDIgNiAncmFpc2UpCitAZW5k IGxpc3AKKworQWZ0ZXIgZG9pbmcgdGhpcywgdGhlIHRleHQgd2lsbCBoYXZlIHRoZSBmb2xs b3dpbmcgQGNvZGV7ZGlzcGxheX0KK3Byb3BlcnRpZXM6CisKK0BpdGVtaXplIEBidWxsZXQK K0BpdGVtCitUaGUgcmVnaW9uIGZyb20gMSB0byAyLCBvbmx5IEBjb2Rle3JhaXNlfQorCitA aXRlbQorVGhlIHJlZ2lvbiBmcm9tIDIgdG8gNCwgbm8gcHJvcGVydGllcworCitAaXRlbQor VGhlIHJlZ2lvbiBmcm9tIDQgdG8gNiwgb25seSBAY29kZXtoZWlnaHR9CisKK0BpdGVtCitU aGUgcmVnaW9uIGZyb20gNiB0byA4LCBib3RoIEBjb2Rle3JhaXNlfSBhbmQgQGNvZGV7aGVp Z2h0fQorCitAZW5kIGl0ZW1pemUKK0BlbmQgZGVmdW4KKwogQGNpbmRleCBkaXNwbGF5IHBy b3BlcnR5LCB1bnNhZmUgZXZhbHVhdGlvbgogQGNpbmRleCBzZWN1cml0eSwgYW5kIGRpc3Bs YXkgc3BlY2lmaWNhdGlvbnMKICAgU29tZSBvZiB0aGUgZGlzcGxheSBzcGVjaWZpY2F0aW9u cyBhbGxvdyBpbmNsdXNpb24gb2YgTGlzcCBmb3JtcywKZGlmZiAtLWdpdCBhL2V0Yy9ORVdT IGIvZXRjL05FV1MKaW5kZXggMzNiMDQyNzIwYjUuLmMyNGNlNDVjMjI4IDEwMDY0NAotLS0g YS9ldGMvTkVXUworKysgYi9ldGMvTkVXUwpAQCAtMjMzOSw2ICsyMzM5LDEyIEBAIFRoaXMg J2Rpc3BsYXknIHByb3BlcnR5IHdhcyBwcmV2aW91c2x5IHN1cHBvcnRlZCBvbmx5IGFzIHRl eHQgcHJvcGVydHkuCiBOb3cgb3ZlcmxheXMgY2FuIGFsc28gaGF2ZSB0aGlzIHByb3BlcnR5 LCB3aXRoIHRoZSBzYW1lIGVmZmVjdCBmb3IgdGhlCiB0ZXh0ICJjb3ZlcmVkIiBieSB0aGUg b3ZlcmxheS4KIAorKysrCisqKiBOZXcgZnVuY3Rpb24gJ3JlbW92ZS1kaXNwbGF5LXRleHQt cHJvcGVydHknLgorVGhpcyBmdW5jdGlvbiByZW1vdmVzIGEgZGlzcGxheSBwcm9wZXJ0eSBm cm9tIHRoZSBzcGVjaWZpZWQgcmVnaW9uIG9mCit0ZXh0LCBwcmVzZXJ2aW5nIGFueSBvdGhl ciBkaXNwbGF5IHByb3BlcnRpZXMgYWxyZWFkeSBzZXQgZm9yIHRoYXQKK3JlZ2lvbi4KKwog KysrCiAqKiBOZXcgbWFjcm8gJ2NvbmQqJy4KIFRoZSBuZXcgbWFjcm8gJ2NvbmQqJyBpcyBh biBhbHRlcm5hdGl2ZSB0byAnY29uZCcgYW5kICdwY2FzZScuCmRpZmYgLS1naXQgYS9saXNw L2VtYWNzLWxpc3Avc3Vici14LmVsIGIvbGlzcC9lbWFjcy1saXNwL3N1YnIteC5lbAppbmRl eCA1ZjFmMjgwNWI2OS4uYThjZDI1NjY1MGIgMTAwNjQ0Ci0tLSBhL2xpc3AvZW1hY3MtbGlz cC9zdWJyLXguZWwKKysrIGIvbGlzcC9lbWFjcy1saXNwL3N1YnIteC5lbApAQCAtNDE2LDI5 ICs0MTYsMjUgQEAgc3RyaW5nLWdseXBoLXNwbGl0CiAgICAgICAgIChzZXRxIHN0YXJ0ICgx KyBzdGFydCkpKSkKICAgICAobnJldmVyc2UgcmVzdWx0KSkpCiAKLTs7OyMjI2F1dG9sb2Fk Ci0oZGVmdW4gYWRkLWRpc3BsYXktdGV4dC1wcm9wZXJ0eSAoc3RhcnQgZW5kIHByb3AgdmFs dWUKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmb3B0aW9uYWwg b2JqZWN0KQotICAiQWRkIGRpc3BsYXkgcHJvcGVydHkgUFJPUCB3aXRoIFZBTFVFIHRvIHRo ZSB0ZXh0IGZyb20gU1RBUlQgdG8gRU5ELgotSWYgYW55IHRleHQgaW4gdGhlIHJlZ2lvbiBo YXMgYSBub24tbmlsIGBkaXNwbGF5JyBwcm9wZXJ0eSwgdGhvc2UKLXByb3BlcnRpZXMgYXJl IHJldGFpbmVkLgotCi1JZiBPQkpFQ1QgaXMgbm9uLW5pbCwgaXQgc2hvdWxkIGJlIGEgc3Ry aW5nIG9yIGEgYnVmZmVyLiAgSWYgbmlsLAotdGhpcyBkZWZhdWx0cyB0byB0aGUgY3VycmVu dCBidWZmZXIuIgorKGRlZnVuIGFkZC1yZW1vdmUtLWRpc3BsYXktdGV4dC1wcm9wZXJ0eSAo c3RhcnQgZW5kIHByb3AgdmFsdWUKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICZvcHRpb25hbCBvYmplY3QgcmVtb3ZlKQogICAobGV0ICgoc3Vi LXN0YXJ0IHN0YXJ0KQogICAgICAgICAoc3ViLWVuZCAwKQorICAgICAgICAobGltaXQgKGlm IChzdHJpbmdwIG9iamVjdCkKKyAgICAgICAgICAgICAgICAgICAobWluIChsZW5ndGggb2Jq ZWN0KSBlbmQpCisgICAgICAgICAgICAgICAgIChtaW4gZW5kIChwb2ludC1tYXgpKSkpCiAg ICAgICAgIGRpc3ApCiAgICAgKHdoaWxlICg8IHN1Yi1lbmQgZW5kKQogICAgICAgKHNldHEg c3ViLWVuZCAobmV4dC1zaW5nbGUtcHJvcGVydHktY2hhbmdlIHN1Yi1zdGFydCAnZGlzcGxh eSBvYmplY3QKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAoaWYgKHN0cmluZ3Agb2JqZWN0KQotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAobWluIChsZW5ndGggb2JqZWN0KSBlbmQpCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAobWlu IGVuZCAocG9pbnQtbWF4KSkpKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBsaW1pdCkpCiAgICAgICAoaWYgKG5vdCAoc2V0cSBkaXNwIChn ZXQtdGV4dC1wcm9wZXJ0eSBzdWItc3RhcnQgJ2Rpc3BsYXkgb2JqZWN0KSkpCiAgICAgICAg ICAgOzsgTm8gb2xkIHByb3BlcnRpZXMgaW4gdGhpcyByYW5nZS4KLSAgICAgICAgICAocHV0 LXRleHQtcHJvcGVydHkgc3ViLXN0YXJ0IHN1Yi1lbmQgJ2Rpc3BsYXkgKGxpc3QgcHJvcCB2 YWx1ZSkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb2JqZWN0KQorICAgICAgICAg ICh1bmxlc3MgcmVtb3ZlCisgICAgICAgICAgICAocHV0LXRleHQtcHJvcGVydHkgc3ViLXN0 YXJ0IHN1Yi1lbmQgJ2Rpc3BsYXkgKGxpc3QgcHJvcCB2YWx1ZSkKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBvYmplY3QpKQogICAgICAgICA7OyBXZSBoYXZlIG9sZCBwcm9w ZXJ0aWVzLgotICAgICAgICAobGV0ICh0eXBlKQorICAgICAgICAobGV0ICgoY2hhbmdlZCBu aWwpCisgICAgICAgICAgICAgIHR5cGUpCiAgICAgICAgICAgOzsgTWFrZSBkaXNwIGludG8g YSBsaXN0LgogICAgICAgICAgIChzZXRxIGRpc3AKICAgICAgICAgICAgICAgICAoY29uZApA QCAtNDU4LDE0ICs0NTQsNDEgQEAgYWRkLWRpc3BsYXktdGV4dC1wcm9wZXJ0eQogICAgICAg ICAgICAgOzsgcmVnaW9ucyBvZiB0ZXh0LgogICAgICAgICAgICAgKHNldHEgZGlzcCAoaWYg KGVxIHR5cGUgJ2xpc3QpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAocmVtb3ZlIG9s ZCBkaXNwKQotICAgICAgICAgICAgICAgICAgICAgICAgIChkZWxldGUgb2xkIGRpc3ApKSkp Ci0gICAgICAgICAgKHNldHEgZGlzcCAoY29ucyAobGlzdCBwcm9wIHZhbHVlKSBkaXNwKSkK LSAgICAgICAgICAod2hlbiAoZXEgdHlwZSAndmVjdG9yKQotICAgICAgICAgICAgKHNldHEg ZGlzcCAoc2VxLWludG8gZGlzcCAndmVjdG9yKSkpCi0gICAgICAgICAgOzsgRmluYWxseSB1 cGRhdGUgdGhlIHJhbmdlLgotICAgICAgICAgIChwdXQtdGV4dC1wcm9wZXJ0eSBzdWItc3Rh cnQgc3ViLWVuZCAnZGlzcGxheSBkaXNwIG9iamVjdCkpKQorICAgICAgICAgICAgICAgICAg ICAgICAgIChkZWxldGUgb2xkIGRpc3ApKQorICAgICAgICAgICAgICAgICAgY2hhbmdlZCB0 KSkKKyAgICAgICAgICAodW5sZXNzIHJlbW92ZQorICAgICAgICAgICAgKHNldHEgZGlzcCAo Y29ucyAobGlzdCBwcm9wIHZhbHVlKSBkaXNwKQorICAgICAgICAgICAgICAgICAgY2hhbmdl ZCB0KSkKKyAgICAgICAgICAod2hlbiBjaGFuZ2VkCisgICAgICAgICAgICAoaWYgKG5vdCBk aXNwKQorICAgICAgICAgICAgICAgIChyZW1vdmUtdGV4dC1wcm9wZXJ0aWVzIHN1Yi1zdGFy dCBzdWItZW5kICcoZGlzcGxheSBuaWwpIG9iamVjdCkKKyAgICAgICAgICAgICAgKHdoZW4g KGVxIHR5cGUgJ3ZlY3RvcikKKyAgICAgICAgICAgICAgICAoc2V0cSBkaXNwIChzZXEtaW50 byBkaXNwICd2ZWN0b3IpKSkKKyAgICAgICAgICAgICAgOzsgRmluYWxseSB1cGRhdGUgdGhl IHJhbmdlLgorICAgICAgICAgICAgICAocHV0LXRleHQtcHJvcGVydHkgc3ViLXN0YXJ0IHN1 Yi1lbmQgJ2Rpc3BsYXkgZGlzcCBvYmplY3QpKSkpKQogICAgICAgKHNldHEgc3ViLXN0YXJ0 IHN1Yi1lbmQpKSkpCiAKKzs7OyMjI2F1dG9sb2FkCisoZGVmdW4gYWRkLWRpc3BsYXktdGV4 dC1wcm9wZXJ0eSAoc3RhcnQgZW5kIHByb3AgdmFsdWUKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAmb3B0aW9uYWwgb2JqZWN0KQorICAiQWRkIGRpc3BsYXkg cHJvcGVydHkgUFJPUCB3aXRoIFZBTFVFIHRvIHRoZSB0ZXh0IGZyb20gU1RBUlQgdG8gRU5E LgorSWYgYW55IHRleHQgaW4gdGhlIHJlZ2lvbiBoYXMgYSBub24tbmlsIGBkaXNwbGF5JyBw cm9wZXJ0eSwgdGhvc2UKK3Byb3BlcnRpZXMgYXJlIHJldGFpbmVkLgorCitJZiBPQkpFQ1Qg aXMgbm9uLW5pbCwgaXQgc2hvdWxkIGJlIGEgc3RyaW5nIG9yIGEgYnVmZmVyLiAgSWYgbmls LAordGhpcyBkZWZhdWx0cyB0byB0aGUgY3VycmVudCBidWZmZXIuIgorICAoYWRkLXJlbW92 ZS0tZGlzcGxheS10ZXh0LXByb3BlcnR5IHN0YXJ0IGVuZCBwcm9wIHZhbHVlIG9iamVjdCkp CisKKzs7OyMjI2F1dG9sb2FkCisoZGVmdW4gcmVtb3ZlLWRpc3BsYXktdGV4dC1wcm9wZXJ0 eSAoc3RhcnQgZW5kIHByb3AgJm9wdGlvbmFsIG9iamVjdCkKKyAgIlJlbW92ZSBkaXNwbGF5 IHByb3BlcnR5IFBST1AgZnJvbSB0aGUgdGV4dCBmcm9tIFNUQVJUIHRvIEVORC4KK0lmIGFu eSB0ZXh0IGluIHRoZSByZWdpb24gaGFzIG90aGVyIGBkaXNwbGF5JyBzcGVjcywgdGhvc2Ug c3BlY3MgYXJlCityZXRhaW5lZC4KKworSWYgT0JKRUNUIGlzIG5vbi1uaWwsIGl0IHNob3Vs ZCBiZSBhIHN0cmluZyBvciBhIGJ1ZmZlci4gIElmIG5pbCwKK3RoaXMgZGVmYXVsdHMgdG8g dGhlIGN1cnJlbnQgYnVmZmVyLiIKKyAgKGFkZC1yZW1vdmUtLWRpc3BsYXktdGV4dC1wcm9w ZXJ0eSBzdGFydCBlbmQgcHJvcCBuaWwgb2JqZWN0ICdyZW1vdmUpKQorCiA7OzsjIyNhdXRv bG9hZAogKGRlZnVuIHJlYWQtcHJvY2Vzcy1uYW1lIChwcm9tcHQpCiAgICJRdWVyeSB0aGUg dXNlciBmb3IgYSBwcm9jZXNzIGFuZCByZXR1cm4gdGhlIHByb2Nlc3Mgb2JqZWN0LiIKZGlm ZiAtLWdpdCBhL2xpc3AvdmlzdWFsLXdyYXAuZWwgYi9saXNwL3Zpc3VhbC13cmFwLmVsCmlu ZGV4IGI5MjFlMWYwNTQ5Li45ZGExOWE2ZmYyYSAxMDA2NDQKLS0tIGEvbGlzcC92aXN1YWwt d3JhcC5lbAorKysgYi9saXNwL3Zpc3VhbC13cmFwLmVsCkBAIC0yMjYsNiArMjI2LDE0IEBA IHZpc3VhbC13cmFwLWZpbGwtY29udGV4dC1wcmVmaXgKICAgICAgICAgKHByb3BlcnRpemUg cHJlZml4ICdmYWNlIGZhY2UpCiAgICAgICBwcmVmaXgpKSkKIAorKGRlZnVuIHZpc3VhbC13 cmFwLS1yZW1vdmUtcHJvcGVydGllcyAoc3RhcnQgZW5kKQorICAiUmVtb3ZlIHZpc3VhbCB3 cmFwcGluZyB0ZXh0IHByb3BlcnRpZXMgZnJvbSBTVEFSVCB0byBFTkQuIgorICA7OyBSZW1v dmUgYG1pbi13aWR0aCcgZnJvbSBhbnkgcHJlZml4ZXMgd2UgZGV0ZWN0ZWQuCisgIChyZW1v dmUtZGlzcGxheS10ZXh0LXByb3BlcnR5IHN0YXJ0IGVuZCAnbWluLXdpZHRoKQorICA7OyBS ZW1vdmUgYHdyYXAtcHJlZml4JyByZWxhdGVkIHByb3BlcnRpZXMgZnJvbSBhbnkgbGluZXMg d2l0aAorICA7OyBwcmVmaXhlcyB3ZSBkZXRlY3RlZC4KKyAgKHJlbW92ZS10ZXh0LXByb3Bl cnRpZXMgc3RhcnQgZW5kICcod3JhcC1wcmVmaXggbmlsKSkpCisKIChkZWZ1biB2aXN1YWwt d3JhcC1wcmVmaXgtZnVuY3Rpb24gKGJlZyBlbmQpCiAgICJJbmRlbnQgdGhlIHJlZ2lvbiBi ZXR3ZWVuIEJFRyBhbmQgRU5EIHdpdGggdmlzdWFsIGZpbGxpbmcuIgogICA7OyBBbnkgY2hh bmdlIGF0IHRoZSBiZWdpbm5pbmcgb2YgYSBsaW5lIG1pZ2h0IGNoYW5nZSBpdHMgd3JhcApA QCAtMjM4LDYgKzI0Niw3IEBAIHZpc3VhbC13cmFwLXByZWZpeC1mdW5jdGlvbgogICAoZ290 by1jaGFyIGJlZykKICAgKGZvcndhcmQtbGluZSAwKQogICAoc2V0cSBiZWcgKHBvaW50KSkK KyAgKHZpc3VhbC13cmFwLS1yZW1vdmUtcHJvcGVydGllcyBiZWcgZW5kKQogICAod2hpbGUg KDwgKHBvaW50KSBlbmQpCiAgICAgOzsgQ2hlY2sgaWYgdGhlIGRpc3BsYXkgcHJvcGVydHkg YXQgdGhlIGVuZCBvZiB0aGlzIGxpbmUgaXMgInNhZmUiLgogICAgIChpZiAodmlzdWFsLXdy YXAtLWRpc3BsYXktcHJvcGVydHktc2FmZS1wCkBAIC0yODMsNyArMjkyLDcgQEAgdmlzdWFs LXdyYXAtcHJlZml4LW1vZGUKICAgICAod2l0aC1zaWxlbnQtbW9kaWZpY2F0aW9ucwogICAg ICAgKHNhdmUtcmVzdHJpY3Rpb24KICAgICAgICAgKHdpZGVuKQotICAgICAgICAocmVtb3Zl LXRleHQtcHJvcGVydGllcyAocG9pbnQtbWluKSAocG9pbnQtbWF4KSAnKHdyYXAtcHJlZml4 IG5pbCkpKSkpKQorICAgICAgICAodmlzdWFsLXdyYXAtLXJlbW92ZS1wcm9wZXJ0aWVzIChw b2ludC1taW4pIChwb2ludC1tYXgpKSkpKSkKIAogOzs7IyMjYXV0b2xvYWQKIChkZWZpbmUt Z2xvYmFsaXplZC1taW5vci1tb2RlIGdsb2JhbC12aXN1YWwtd3JhcC1wcmVmaXgtbW9kZQpk aWZmIC0tZ2l0IGEvdGVzdC9saXNwL2VtYWNzLWxpc3Avc3Vici14LXRlc3RzLmVsIGIvdGVz dC9saXNwL2VtYWNzLWxpc3Avc3Vici14LXRlc3RzLmVsCmluZGV4IDVjZWVmZDhkMTFjLi5l YWY4ZTFlNDEyZSAxMDA2NDQKLS0tIGEvdGVzdC9saXNwL2VtYWNzLWxpc3Avc3Vici14LXRl c3RzLmVsCisrKyBiL3Rlc3QvbGlzcC9lbWFjcy1saXNwL3N1YnIteC10ZXN0cy5lbApAQCAt NzI4LDYgKzcyOCw0NCBAQCBzdWJyLXgtdGVzdC1hZGQtZGlzcGxheS10ZXh0LXByb3BlcnR5 CiAgICAgICAgICAgICAgICA0IDggKGRpc3BsYXkgKChyYWlzZSAwLjUpIChoZWlnaHQgMi4w KSkpCiAgICAgICAgICAgICAgICA4IDEyIChkaXNwbGF5IChyYWlzZSAwLjUpKSkpKSkpCiAK KyhlcnQtZGVmdGVzdCBzdWJyLXgtdGVzdC1yZW1vdmUtZGlzcGxheS10ZXh0LXByb3BlcnR5 ICgpCisgICh3aXRoLXRlbXAtYnVmZmVyCisgICAgKGluc2VydCAiRm9vIGJhciB6b3QgZ2F6 b25rIikKKyAgICAoYWRkLWRpc3BsYXktdGV4dC1wcm9wZXJ0eSA0IDEyICdoZWlnaHQgMi4w KQorICAgIChhZGQtZGlzcGxheS10ZXh0LXByb3BlcnR5IDIgOCAncmFpc2UgMC41KQorICAg IChyZW1vdmUtZGlzcGxheS10ZXh0LXByb3BlcnR5IDYgMTAgJ2hlaWdodCkKKyAgICAoc2hv dWxkIChlcXVhbC1pbmNsdWRpbmctcHJvcGVydGllcworICAgICAgICAgICAgIChidWZmZXIt c3RyaW5nKQorICAgICAgICAgICAgICMoIkZvbyBiYXIgem90IGdhem9uayIKKyAgICAgICAg ICAgICAgIDEgMyAoZGlzcGxheSAocmFpc2UgMC41KSkKKyAgICAgICAgICAgICAgIDMgNSAo ZGlzcGxheSAoKHJhaXNlIDAuNSkgKGhlaWdodCAyLjApKSkKKyAgICAgICAgICAgICAgIDUg NyAoZGlzcGxheSAoKHJhaXNlIDAuNSkpKQorICAgICAgICAgICAgICAgOSAxMSAoZGlzcGxh eSAoaGVpZ2h0IDIuMCkpKSkpKQorICAod2l0aC10ZW1wLWJ1ZmZlcgorICAgIChpbnNlcnQg IkZvbyBiYXIgem90IGdhem9uayIpCisgICAgKHB1dC10ZXh0LXByb3BlcnR5IDQgMTIgJ2Rp c3BsYXkgWyhoZWlnaHQgMi4wKV0pCisgICAgKGFkZC1kaXNwbGF5LXRleHQtcHJvcGVydHkg MiA4ICdyYWlzZSAwLjUpCisgICAgKHJlbW92ZS1kaXNwbGF5LXRleHQtcHJvcGVydHkgNiAx MCAnaGVpZ2h0KQorICAgIChzaG91bGQgKGVxdWFsLWluY2x1ZGluZy1wcm9wZXJ0aWVzCisg ICAgICAgICAgICAgKGJ1ZmZlci1zdHJpbmcpCisgICAgICAgICAgICAgIygiRm9vIGJhciB6 b3QgZ2F6b25rIgorICAgICAgICAgICAgICAgMSAzIChkaXNwbGF5IChyYWlzZSAwLjUpKQor ICAgICAgICAgICAgICAgMyA1IChkaXNwbGF5IFsocmFpc2UgMC41KSAoaGVpZ2h0IDIuMCld KQorICAgICAgICAgICAgICAgNSA3IChkaXNwbGF5IFsocmFpc2UgMC41KV0pCisgICAgICAg ICAgICAgICA5IDExIChkaXNwbGF5IFsoaGVpZ2h0IDIuMCldKSkpKSkKKyAgKHdpdGgtdGVt cC1idWZmZXIKKyAgICAoc2hvdWxkIChlcXVhbC1pbmNsdWRpbmctcHJvcGVydGllcworICAg ICAgICAgICAgIChsZXQgKChzdHIgKGNvcHktc2VxdWVuY2UgIkZvbyBiYXIgem90IGdhem9u ayIpKSkKKyAgICAgICAgICAgICAgIChhZGQtZGlzcGxheS10ZXh0LXByb3BlcnR5IDMgMTEg J2hlaWdodCAyLjAgc3RyKQorICAgICAgICAgICAgICAgKGFkZC1kaXNwbGF5LXRleHQtcHJv cGVydHkgMSA3ICdyYWlzZSAwLjUgc3RyKQorICAgICAgICAgICAgICAgKHJlbW92ZS1kaXNw bGF5LXRleHQtcHJvcGVydHkgNSA5ICdoZWlnaHQgc3RyKQorICAgICAgICAgICAgICAgc3Ry KQorICAgICAgICAgICAgICMoIkZvbyBiYXIgem90IGdhem9uayIKKyAgICAgICAgICAgICAg IDEgMyAoZGlzcGxheSAocmFpc2UgMC41KSkKKyAgICAgICAgICAgICAgIDMgNSAoZGlzcGxh eSAoKHJhaXNlIDAuNSkgKGhlaWdodCAyLjApKSkKKyAgICAgICAgICAgICAgIDUgNyAoZGlz cGxheSAoKHJhaXNlIDAuNSkpKQorICAgICAgICAgICAgICAgOSAxMSAoZGlzcGxheSAoaGVp Z2h0IDIuMCkpKSkpKSkKKwogKGVydC1kZWZ0ZXN0IHN1YnIteC1uYW1lZC1sZXQgKCkKICAg KGxldCAoKGZ1bnMgKCkpKQogICAgIChuYW1lZC1sZXQgbG9vcApkaWZmIC0tZ2l0IGEvdGVz dC9saXNwL3Zpc3VhbC13cmFwLXRlc3RzLmVsIGIvdGVzdC9saXNwL3Zpc3VhbC13cmFwLXRl c3RzLmVsCmluZGV4IDA0OTc3YWZlMjA3Li5kMDU3ZWJlZjA3NCAxMDA2NDQKLS0tIGEvdGVz dC9saXNwL3Zpc3VhbC13cmFwLXRlc3RzLmVsCisrKyBiL3Rlc3QvbGlzcC92aXN1YWwtd3Jh cC10ZXN0cy5lbApAQCAtMSw2ICsxLDYgQEAKIDs7OyB2aXN1YWwtd3JhcC10ZXN0cy5lbCAt LS0gVGVzdHMgZm9yIGB2aXN1YWwtd3JhcC1wcmVmaXgtbW9kZScgIC0qLSBsZXhpY2FsLWJp bmRpbmc6IHQ7IC0qLQogCi07OyBDb3B5cmlnaHQgKEMpIDIwMjQgRnJlZSBTb2Z0d2FyZSBG b3VuZGF0aW9uLCBJbmMuCis7OyBDb3B5cmlnaHQgKEMpIDIwMjQtMjAyNSBGcmVlIFNvZnR3 YXJlIEZvdW5kYXRpb24sIEluYy4KIAogOzsgVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05VIEVt YWNzLgogCkBAIC0xOSw3ICsxOSw3IEBACiAKIDs7OyBDb21tZW50YXJ5OgogCi07OyBUZXRz IGZvciBgdmlzdWFsLXdyYXAtcHJlZml4LW1vZGUnLgorOzsgVGVzdHMgZm9yIGB2aXN1YWwt d3JhcC1wcmVmaXgtbW9kZScuCiAKIDs7OyBDb2RlOgogCkBAIC0xMTcsNCArMTE3LDQwIEBA IHZpc3VhbC13cmFwLXRlc3RzL3Vuc2FmZS1kaXNwbGF5L211bHRpcGxlLTIKICAgICAgICAg ICAgICAgMCA0IChkaXNwbGF5ICgoaW1hZ2UgOnR5cGUgYm1wKSkpCiAgICAgICAgICAgICAg IDQgOCAoZGlzcGxheSAoKGltYWdlIDp0eXBlIGJtcCkgKGhlaWdodCAxLjUpKSkpKSkpKQog CisoZXJ0LWRlZnRlc3QgdmlzdWFsLXdyYXAtdGVzdHMvd3JhcC1wcmVmaXgtc3RpY2tpbmVz cyAoKQorICAiVGVzdCB0aGF0IGB3cmFwLXByZWZpeCcgZG9lc24ndCBwZXJzaXN0IGFjcm9z cyBtdWx0aXBsZSBsaW5lcyB3aGVuIHR5cGluZy4KK1NlZSBidWcjNzYwMTguIgorICAod2l0 aC10ZW1wLWJ1ZmZlcgorICAgIChpbnNlcnQgIiogdGhpcyB6b28gY29udGFpbnMgZ29hdHMi KQorICAgICh2aXN1YWwtd3JhcC1wcmVmaXgtZnVuY3Rpb24gKHBvaW50LW1pbikgKHBvaW50 LW1heCkpCisgICAgKHNob3VsZCAoZXF1YWwtaW5jbHVkaW5nLXByb3BlcnRpZXMKKyAgICAg ICAgICAgICAoYnVmZmVyLXN0cmluZykKKyAgICAgICAgICAgICAjKCIqIHRoaXMgem9vIGNv bnRhaW5zIGdvYXRzIgorICAgICAgICAgICAgICAgMCAgMiAoIHdyYXAtcHJlZml4IChzcGFj ZSA6YWxpZ24tdG8gKDIgLiB3aWR0aCkpCisgICAgICAgICAgICAgICAgICAgICAgZGlzcGxh eSAobWluLXdpZHRoICgoMiAuIHdpZHRoKSkpKQorICAgICAgICAgICAgICAgMiAyNSAoIHdy YXAtcHJlZml4IChzcGFjZSA6YWxpZ24tdG8gKDIgLiB3aWR0aCkpKSkpKQorICAgIChsZXQg KChzdGFydCAocG9pbnQpKSkKKyAgICAgIChpbnNlcnQtYW5kLWluaGVyaXQgIlxuXG5pdCBh bHNvIGNvbnRhaW5zIHBhbmRhcyIpCisgICAgICAodmlzdWFsLXdyYXAtcHJlZml4LWZ1bmN0 aW9uIHN0YXJ0IChwb2ludC1tYXgpKSkKKyAgICAoc2hvdWxkIChlcXVhbC1pbmNsdWRpbmct cHJvcGVydGllcworICAgICAgICAgICAgIChidWZmZXItc3RyaW5nKQorICAgICAgICAgICAg ICMoIiogdGhpcyB6b28gY29udGFpbnMgZ29hdHNcblxuaXQgYWxzbyBjb250YWlucyBwYW5k YXMiCisgICAgICAgICAgICAgICAwICAyICggd3JhcC1wcmVmaXggKHNwYWNlIDphbGlnbi10 byAoMiAuIHdpZHRoKSkKKyAgICAgICAgICAgICAgICAgICAgICBkaXNwbGF5IChtaW4td2lk dGggKCgyIC4gd2lkdGgpKSkpCisgICAgICAgICAgICAgICAyIDI1ICggd3JhcC1wcmVmaXgg KHNwYWNlIDphbGlnbi10byAoMiAuIHdpZHRoKSkpKSkpKSkKKworKGVydC1kZWZ0ZXN0IHZp c3VhbC13cmFwLXRlc3RzL2NsZWFudXAgKCkKKyAgIlRlc3QgdGhhdCBkZWFjdGl2YXRpbmcg YHZpc3VhbC13cmFwLXByZWZpeC1tb2RlJyBjbGVhbnMgdXAgdGV4dCBwcm9wZXJ0aWVzLiIK KyAgKHdpdGgtdGVtcC1idWZmZXIKKyAgICAoaW5zZXJ0ICIqIGhlbGxvXG4qIGhpIikKKyAg ICAodmlzdWFsLXdyYXAtcHJlZml4LWZ1bmN0aW9uIChwb2ludC1taW4pIChwb2ludC1tYXgp KQorICAgIDs7IE1ha2Ugc3VyZSB3ZSd2ZSBhZGRlZCB0aGUgdmlzdWFsLXdyYXBwaW5nIHBy b3BlcnRpZXMuCisgICAgKHNob3VsZCAoZXF1YWwgKHRleHQtcHJvcGVydGllcy1hdCAocG9p bnQtbWluKSkKKyAgICAgICAgICAgICAgICAgICAnKCB3cmFwLXByZWZpeCAoc3BhY2UgOmFs aWduLXRvICgyIC4gd2lkdGgpKQorICAgICAgICAgICAgICAgICAgICAgIGRpc3BsYXkgKG1p bi13aWR0aCAoKDIgLiB3aWR0aCkpKSkpKQorICAgICh2aXN1YWwtd3JhcC1wcmVmaXgtbW9k ZSAtMSkKKyAgICAoc2hvdWxkIChlcXVhbC1pbmNsdWRpbmctcHJvcGVydGllcworICAgICAg ICAgICAgIChidWZmZXItc3RyaW5nKQorICAgICAgICAgICAgICIqIGhlbGxvXG4qIGhpIikp KSkKKwogOzsgdmlzdWFsLXdyYXAtdGVzdHMuZWwgZW5kcyBoZXJlCi0tIAoyLjI1LjEKCg== --------------Rqc9jJRLftXUKkOFT0R8ZQls Content-Type: text/plain; charset=UTF-8; name="0003-Remove-superfluous-POSITION-argument-from-visual-wra.patch" Content-Disposition: attachment; filename*0="0003-Remove-superfluous-POSITION-argument-from-visual-wra.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSAzNzY3MmYwNDU5MGFjMzhhOWFkNGNhODY0MjlmNzIyMGY4NTZkOTA0IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFdlZCwgMjggTWF5IDIwMjUgMTA6MTY6MDIgLTA3MDAKU3ViamVjdDogW1BB VENIIDMvM10gOyBSZW1vdmUgc3VwZXJmbHVvdXMgUE9TSVRJT04gYXJndW1lbnQgZnJvbQog J3Zpc3VhbC13cmFwLS1hcHBseS10by1saW5lJwoKKiBsaXNwL3Zpc3VhbC13cmFwLmVsICh2 aXN1YWwtd3JhcC0tYXBwbHktdG8tbGluZSk6IFJlbW92ZSBQT1NJVElPTiBhbmQKanVzdCB1 c2UgcG9pbnQgaW5zdGVhZC4gIFVwZGF0ZSBjYWxsZXIuCi0tLQogbGlzcC92aXN1YWwtd3Jh cC5lbCB8IDQ2ICsrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0t LQogMSBmaWxlIGNoYW5nZWQsIDIyIGluc2VydGlvbnMoKyksIDI0IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2xpc3AvdmlzdWFsLXdyYXAuZWwgYi9saXNwL3Zpc3VhbC13cmFwLmVs CmluZGV4IDlkYTE5YTZmZjJhLi5jMDllODM4MjNmNyAxMDA2NDQKLS0tIGEvbGlzcC92aXN1 YWwtd3JhcC5lbAorKysgYi9saXNwL3Zpc3VhbC13cmFwLmVsCkBAIC0xNDMsMjkgKzE0Mywy NyBAQCB2aXN1YWwtd3JhcC0tYWRqdXN0LXByZWZpeAogICAgICAgICh0CiAgICAgICAgICIi KSkpKSkKIAotKGRlZnVuIHZpc3VhbC13cmFwLS1hcHBseS10by1saW5lIChwb3NpdGlvbikK LSAgIkFwcGx5IHZpc3VhbC13cmFwcGluZyBwcm9wZXJ0aWVzIHRvIHRoZSBsb2dpY2FsIGxp bmUgc3RhcnRpbmcgYXQgUE9TSVRJT04uIgotICAoc2F2ZS1leGN1cnNpb24KLSAgICAoZ290 by1jaGFyIHBvc2l0aW9uKQotICAgICh3aGVuLWxldCogKChmaXJzdC1saW5lLXByZWZpeCAo ZmlsbC1tYXRjaC1hZGFwdGl2ZS1wcmVmaXgpKQotICAgICAgICAgICAgICAgIChuZXh0LWxp bmUtcHJlZml4ICh2aXN1YWwtd3JhcC0tY29udGVudC1wcmVmaXgKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgZmlyc3QtbGluZS1wcmVmaXggcG9zaXRpb24pKSkKLSAg ICAgICh3aGVuIChudW1iZXJwIG5leHQtbGluZS1wcmVmaXgpCi0gICAgICAgIDs7IFNldCBh IG1pbmltdW0gd2lkdGggZm9yIHRoZSBwcmVmaXggc28gaXQgbGluZXMgdXAgY29ycmVjdGx5 Ci0gICAgICAgIDs7IHdpdGggc3Vic2VxdWVudCBsaW5lcy4gIE1ha2Ugc3VyZSBub3QgdG8g ZG8gdGhpcyBwYXN0IHRoZSBlbmQKLSAgICAgICAgOzsgb2YgdGhlIGxpbmUgdGhvdWdoISAg KGBmaWxsLW1hdGNoLWFkYXB0aXZlLXByZWZpeCcgY291bGQKLSAgICAgICAgOzsgcG90ZW50 aWFsbHkgcmV0dXJuIGEgcHJlZml4IGxvbmdlciB0aGFuIHRoZSBjdXJyZW50IGxpbmUgaW4K LSAgICAgICAgOzsgdGhlIGJ1ZmZlci4pCi0gICAgICAgIChhZGQtZGlzcGxheS10ZXh0LXBy b3BlcnR5Ci0gICAgICAgICBwb3NpdGlvbiAobWluICgrIHBvc2l0aW9uIChsZW5ndGggZmly c3QtbGluZS1wcmVmaXgpKQotICAgICAgICAgICAgICAgICAgICAgICAocG9zLWVvbCkpCi0g ICAgICAgICAnbWluLXdpZHRoIGAoKCxuZXh0LWxpbmUtcHJlZml4IC4gd2lkdGgpKSkpCi0g ICAgICAoc2V0cSBuZXh0LWxpbmUtcHJlZml4ICh2aXN1YWwtd3JhcC0tYWRqdXN0LXByZWZp eCBuZXh0LWxpbmUtcHJlZml4KSkKLSAgICAgIChwdXQtdGV4dC1wcm9wZXJ0eQotICAgICAg IHBvc2l0aW9uIChwb3MtZW9sKSAnd3JhcC1wcmVmaXgKLSAgICAgICAoaWYgKG51bWJlcnAg bmV4dC1saW5lLXByZWZpeCkKLSAgICAgICAgICAgYChzcGFjZSA6YWxpZ24tdG8gKCxuZXh0 LWxpbmUtcHJlZml4IC4gd2lkdGgpKQotICAgICAgICAgbmV4dC1saW5lLXByZWZpeCkpKSkp CisoZGVmdW4gdmlzdWFsLXdyYXAtLWFwcGx5LXRvLWxpbmUgKCkKKyAgIkFwcGx5IHZpc3Vh bC13cmFwcGluZyBwcm9wZXJ0aWVzIHRvIHRoZSBsb2dpY2FsIGxpbmUgc3RhcnRpbmcgYXQg cG9pbnQuIgorICAod2hlbi1sZXQqICgoZmlyc3QtbGluZS1wcmVmaXggKGZpbGwtbWF0Y2gt YWRhcHRpdmUtcHJlZml4KSkKKyAgICAgICAgICAgICAgKG5leHQtbGluZS1wcmVmaXggKHZp c3VhbC13cmFwLS1jb250ZW50LXByZWZpeAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZmlyc3QtbGluZS1wcmVmaXggKHBvaW50KSkpKQorICAgICh3aGVuIChudW1iZXJw IG5leHQtbGluZS1wcmVmaXgpCisgICAgICA7OyBTZXQgYSBtaW5pbXVtIHdpZHRoIGZvciB0 aGUgcHJlZml4IHNvIGl0IGxpbmVzIHVwIGNvcnJlY3RseQorICAgICAgOzsgd2l0aCBzdWJz ZXF1ZW50IGxpbmVzLiAgTWFrZSBzdXJlIG5vdCB0byBkbyB0aGlzIHBhc3QgdGhlIGVuZAor ICAgICAgOzsgb2YgdGhlIGxpbmUgdGhvdWdoISAgKGBmaWxsLW1hdGNoLWFkYXB0aXZlLXBy ZWZpeCcgY291bGQKKyAgICAgIDs7IHBvdGVudGlhbGx5IHJldHVybiBhIHByZWZpeCBsb25n ZXIgdGhhbiB0aGUgY3VycmVudCBsaW5lIGluIHRoZQorICAgICAgOzsgYnVmZmVyLikKKyAg ICAgIChhZGQtZGlzcGxheS10ZXh0LXByb3BlcnR5CisgICAgICAgKHBvaW50KSAobWluICgr IChwb2ludCkgKGxlbmd0aCBmaXJzdC1saW5lLXByZWZpeCkpCisgICAgICAgICAgICAgICAg ICAgICAocG9zLWVvbCkpCisgICAgICAgJ21pbi13aWR0aCBgKCgsbmV4dC1saW5lLXByZWZp eCAuIHdpZHRoKSkpKQorICAgIChzZXRxIG5leHQtbGluZS1wcmVmaXggKHZpc3VhbC13cmFw LS1hZGp1c3QtcHJlZml4IG5leHQtbGluZS1wcmVmaXgpKQorICAgIChwdXQtdGV4dC1wcm9w ZXJ0eQorICAgICAocG9pbnQpIChwb3MtZW9sKSAnd3JhcC1wcmVmaXgKKyAgICAgKGlmIChu dW1iZXJwIG5leHQtbGluZS1wcmVmaXgpCisgICAgICAgICBgKHNwYWNlIDphbGlnbi10byAo LG5leHQtbGluZS1wcmVmaXggLiB3aWR0aCkpCisgICAgICAgbmV4dC1saW5lLXByZWZpeCkp KSkKIAogKGRlZnVuIHZpc3VhbC13cmFwLS1jb250ZW50LXByZWZpeCAocHJlZml4IHBvc2l0 aW9uKQogICAiR2V0IHRoZSBuZXh0LWxpbmUgcHJlZml4IGZvciB0aGUgc3BlY2lmaWVkIGZp cnN0LWxpbmUgUFJFRklYLgpAQCAtMjU0LDcgKzI1Miw3IEBAIHZpc3VhbC13cmFwLXByZWZp eC1mdW5jdGlvbgogICAgICAgICA7OyBJZiBzbywgd2UgY2FuIGFwcGx5IG91ciB2aXN1YWwg d3JhcHBpbmcgcHJvcGVydGllcyB0byB0aGlzCiAgICAgICAgIDs7IGxpbmUgYW5kIGNvbnRp bnVlIHRvIHRoZSBuZXh0IGxpbmUuCiAgICAgICAgIChwcm9nbgotICAgICAgICAgICh2aXN1 YWwtd3JhcC0tYXBwbHktdG8tbGluZSAocG9pbnQpKQorICAgICAgICAgICh2aXN1YWwtd3Jh cC0tYXBwbHktdG8tbGluZSkKICAgICAgICAgICAoZm9yd2FyZC1saW5lKSkKICAgICAgIDs7 IE90aGVyd2lzZSwgc2tpcCBhaGVhZCB1bnRpbCB0aGUgZW5kIG9mIGFueSB1bnNhZmUgZGlz cGxheQogICAgICAgOzsgcHJvcGVydGllcy4gIE5PVEU6IFdlIGRvIHRoaXMgb3V0IG9mIGFu IGFidW5kYW5jZSBvZiBjYXV0aW9uIHRvCi0tIAoyLjI1LjEKCg== --------------Rqc9jJRLftXUKkOFT0R8ZQls--
bug-gnu-emacs@HIDDEN:bug#76018; Package emacs.
Full text available.
Received: (at 76018) by debbugs.gnu.org; 28 May 2025 14:46:15 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed May 28 10:46:15 2025
Received: from localhost ([127.0.0.1]:54665 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1uKI2o-0004oj-OF
for submit <at> debbugs.gnu.org; Wed, 28 May 2025 10:46:15 -0400
Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:45006)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <monnier@HIDDEN>)
id 1uKI2m-0004oG-5L
for 76018 <at> debbugs.gnu.org; Wed, 28 May 2025 10:46:12 -0400
Received: from pmg1.iro.umontreal.ca (localhost.localdomain [127.0.0.1])
by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id 00B131002EC;
Wed, 28 May 2025 10:46:06 -0400 (EDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca;
s=mail; t=1748443565;
bh=trle89jZyxtHE4mSi1vQYSM7KpPF8Za782Q2XPZS16A=;
h=From:To:Cc:Subject:In-Reply-To:References:Date:From;
b=MD6T3rjxHPzhWIvavf7OOEkwgllCKh3mPopq8Y+PmR1UHCTOrWXKWJbImocatAn+e
wuWHsN3/JLm/nNdjqDaSOZ8rBSHr73W8KYCYoVv9u8Z8bhz+TVbZqiBrVo67ZZG8ke
OAkNFJftlCF8xZVqtLAUNtJ/+1QO1vRrXF8dcYNJ1heiN4Rj23HurLDghss3hdiCTU
uMYYFIBwLfkBvQkgfpoH3sS4xexSGuB5AwrRXXq/qgA2YUIX1dkW7Sp0UhSV3Xl/q6
BqwXGu3akmasWY/QKFKKwQDTRK7MwiC8Ks2lxOJHIX7phOKQ6a3siQvuBed+kI6aR5
ty3HLrsCheUIw==
Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1])
by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id 2C38A100034;
Wed, 28 May 2025 10:46:05 -0400 (EDT)
Received: from lechazo (lechon.iro.umontreal.ca [132.204.27.242])
by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 1439F1204C9;
Wed, 28 May 2025 10:46:05 -0400 (EDT)
From: Stefan Monnier <monnier@HIDDEN>
To: Jim Porter <jporterbugs@HIDDEN>
Subject: Re: bug#76018: 31.0.50; wrap-prefix properties from
visual-wrap-prefix-mode proliferate
In-Reply-To: <73ae4a9b-9987-ea94-646b-7a0f3154af7e@HIDDEN>
Message-ID: <jwv7c20n6eq.fsf-monnier+emacs@HIDDEN>
References: <87a5b42q33.fsf@HIDDEN>
<9b10777c-6b8c-2b2e-c906-b2d797dece00@HIDDEN>
<19a7b709-5b05-dd29-92e5-ac6163ef1873@HIDDEN>
<86h616xp94.fsf@HIDDEN> <jwvzfeynqhd.fsf-monnier+emacs@HIDDEN>
<76bc329d-e588-4357-13ec-2d6e5510a97c@HIDDEN>
<jwvbjrdolu0.fsf-monnier+emacs@HIDDEN>
<73ae4a9b-9987-ea94-646b-7a0f3154af7e@HIDDEN>
Date: Wed, 28 May 2025 10:46:03 -0400
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-SPAM-INFO: Spam detection results: 0
ALL_TRUSTED -1 Passed through trusted hosts only via SMTP
AWL 0.084 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DKIM_SIGNED 0.1 Message has a DKIM or DK signature,
not necessarily valid
DKIM_VALID -0.1 Message has at least one valid DKIM or DK signature
DKIM_VALID_AU -0.1 Message has a valid DKIM or DK signature from author's
domain
DKIM_VALID_EF -0.1 Message has a valid DKIM or DK signature from envelope-from
domain
X-SPAM-LEVEL:
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 76018
Cc: Po Lu <luangruo@HIDDEN>, 76018 <at> debbugs.gnu.org,
Eli Zaretskii <eliz@HIDDEN>, kevin.legouguec@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
> --- a/lisp/visual-wrap.el
> +++ b/lisp/visual-wrap.el
> @@ -165,7 +165,12 @@ visual-wrap--apply-to-line
> position (pos-eol) 'wrap-prefix
> (if (numberp next-line-prefix)
> `(space :align-to (,next-line-prefix . width))
> - next-line-prefix)))))
> + next-line-prefix))
> + ;; Make sure that when typing at the end of a line with
> + ;; `wrap-prefix' set, we don't continue that property over
> + ;; subsequent lines. See bug#76018.
> + (append-text-property position (pos-eol)
> + 'rear-nonsticky '(wrap-prefix)))))
Using the `rear-nonsticky` or `front-sticky` properties is a PITA with
lots of odd corner cases, so I'd much rather we try to use the
standard approach of removing all our properties at start.
We have to write the "remove" code for the case where we turn the mode
off anyway.
Stefan
bug-gnu-emacs@HIDDEN:bug#76018; Package emacs.
Full text available.Received: (at 76018) by debbugs.gnu.org; 28 May 2025 01:05:27 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue May 27 21:05:27 2025 Received: from localhost ([127.0.0.1]:46718 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1uK5ET-0004hw-FB for submit <at> debbugs.gnu.org; Tue, 27 May 2025 21:05:27 -0400 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]:52566) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <jporterbugs@HIDDEN>) id 1uK5EQ-0004ch-5K for 76018 <at> debbugs.gnu.org; Tue, 27 May 2025 21:05:23 -0400 Received: by mail-pj1-x102b.google.com with SMTP id 98e67ed59e1d1-311d5fdf1f0so501932a91.1 for <76018 <at> debbugs.gnu.org>; Tue, 27 May 2025 18:05:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748394316; x=1748999116; darn=debbugs.gnu.org; h=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=+m0Le7ISHggAd3PMNS8TpkoAcVy/NPOdy9AuKMDOxeI=; b=dHz/SQ/fFUiHrvuBM4M4lV31BnMUjEMQw2W7LbWlrby0ttRbvVo+QW4J1PV2WPMffg /ZehcC+dDL06uYtI/mIZZZ/MvYG6OcXT3GcZ08enfSy+Z+MK+VEYmlBejMe8kVQZVIJP BArsafkL7yp1gHt51fgRJ8I5h6FZ9qtO4Vpihw2G3JjityWD5sOD9tG8S8BPvGWn78Ii 3bWaxV+AKMeUBzYzBBAVidh0DYvdqtt7e5XeGAyz79VI41ARhLUIherLKiycUK8S7M9V fszaRVXSwexnQ9K9rC8S/6P00Ct0KwKjFZ8CBcc2XHm5mBZ8jwnUNdvMX9+/TDk96a4g JNKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748394316; x=1748999116; h=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=+m0Le7ISHggAd3PMNS8TpkoAcVy/NPOdy9AuKMDOxeI=; b=GwYdIcjBGIxMfdNBAGfYW8fY1kvXoXhVcx1PJKdnw0wCNk6XPJy+ip3QfvE6sLD+tj lh4z3brfjvdYxGVitmyX4MySuKsrTlOC7kwQ1cNP49nat4dUYmFo9jzJaqxkf82YNuGY UvGbhT7Q0g3l1q5Y/FrHeZayPa0G7TTZo5pBT36ysDCwdODaGyIFqBBhyB7VxK1AEXIf tvCCcmW+EeL15le58CEeKtQA5KinpeT1u/2j9Q60tilZdLzt01D9NS3UDmLwqHCXYQr3 UdRFR52x3lh40I7y0PyYra6b3jLSBrOOe8OiYyWYXF5DeIBk8MbUZd5UjokWCgtqPYwg xpWA== X-Forwarded-Encrypted: i=1; AJvYcCV0/1nAFnr2cNAA/MDSUKAVJvaaiw6Mwk+Q4DNmgH0uEFb86B11Z6S09msY++eAakFaba7bJw==@debbugs.gnu.org X-Gm-Message-State: AOJu0YxPoXzmLa3lH51A0lEit/kyshFIBKZzjkKUwhqZ94yRfes0IbLn obSxIpco1uwvX/x/JvNi3GLqkTYmiHxDbpl2FX16LPosqbqCHzICa17I X-Gm-Gg: ASbGncseOPYHyl7UD6FsGKDtXxoghta1GNM9uLm0dlVIdzSqLWn7qShWd9HG3AKWSEB VbmPcbQ7UhYzGKT7whgJuMiOze/Ya2XAkiHVm6DmxPgcyglamc2bYbuaxUM3pTE5VbGEPdINHL4 WmrWSa0vp8fjMfk8z22Vydo2NPX7M3nHjdLqDtOe8HSA0xewpwFMvC3GsuyLOXbT/lThS/HAD1Q VfrgucXnbEiTwrF0WYjmPKXgxrPwUHN0VyEzRIcZBQTt1xHQWup4G4uCVMRs6iLhnDtua50F/zr D+wXM+crIS4W3OjsJwjhc/I+JoY+PJ52sMIpDevGcsNR6pncstmbuRbOEWDXUzRhfw1dJtQdDRy W03NTM2HVDPTVJDdXc50oIYeBZ7ZZWuo= X-Google-Smtp-Source: AGHT+IEnRq5DJ93AMTRwsvSr5nUBdC5kV7wRaCzAmMGOp9IxWzymPVEiJZarqpxqKlMvd8DVSZrqEw== X-Received: by 2002:a17:90b:554f:b0:2ee:f440:53ed with SMTP id 98e67ed59e1d1-31111946373mr19616181a91.31.1748394315670; Tue, 27 May 2025 18:05:15 -0700 (PDT) Received: from [192.168.1.2] (syn-076-168-144-128.res.spectrum.com. [76.168.144.128]) by smtp.googlemail.com with ESMTPSA id 98e67ed59e1d1-311e46ce2efsm198525a91.34.2025.05.27.18.05.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 27 May 2025 18:05:14 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------7Hn7sDNiBWAdxfV0q0MjSWC7" Message-ID: <73ae4a9b-9987-ea94-646b-7a0f3154af7e@HIDDEN> Date: Tue, 27 May 2025 18:05:14 -0700 MIME-Version: 1.0 Subject: Re: bug#76018: 31.0.50; wrap-prefix properties from visual-wrap-prefix-mode proliferate Content-Language: en-US To: Stefan Monnier <monnier@HIDDEN> References: <87a5b42q33.fsf@HIDDEN> <9b10777c-6b8c-2b2e-c906-b2d797dece00@HIDDEN> <19a7b709-5b05-dd29-92e5-ac6163ef1873@HIDDEN> <86h616xp94.fsf@HIDDEN> <jwvzfeynqhd.fsf-monnier+emacs@HIDDEN> <76bc329d-e588-4357-13ec-2d6e5510a97c@HIDDEN> <jwvbjrdolu0.fsf-monnier+emacs@HIDDEN> From: Jim Porter <jporterbugs@HIDDEN> In-Reply-To: <jwvbjrdolu0.fsf-monnier+emacs@HIDDEN> X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 76018 Cc: Po Lu <luangruo@HIDDEN>, 76018 <at> debbugs.gnu.org, Eli Zaretskii <eliz@HIDDEN>, kevin.legouguec@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------7Hn7sDNiBWAdxfV0q0MjSWC7 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 5/27/2025 1:23 PM, Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors wrote: > So far, we generally don't try to interact properly with other packages > using the same property. It's usually good enough. > In the present case, our minor mode tends to place a `wrap-prefix` > property over pretty much the hole buffer anyway, so there's not much > room for another package to use that property without conflict. How about something like this? This should also address Juri and Eli's comments elsewhere in the bug. One remaining bit that might be valuable is adding a few regression tests for 'append-text-property' and 'remove-display-text-property'. --------------7Hn7sDNiBWAdxfV0q0MjSWC7 Content-Type: text/plain; charset=UTF-8; name="0001-Make-wrap-prefix-nonsticky-when-using-visual-wrap-pr.patch" Content-Disposition: attachment; filename*0="0001-Make-wrap-prefix-nonsticky-when-using-visual-wrap-pr.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSAzMTMwZmM2MjQwMThjZTBiM2M2NjNhOWZiYTMwNDVhYzU3N2JjNjQ1IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IE1vbiwgMjYgTWF5IDIwMjUgMTY6NTc6MjUgLTA3MDAKU3ViamVjdDogW1BB VENIIDEvMl0gTWFrZSAnd3JhcC1wcmVmaXgnIG5vbnN0aWNreSB3aGVuIHVzaW5nCiAndmlz dWFsLXdyYXAtcHJlZml4LW1vZGUnCgoqIGxpc3AvZXNoZWxsL2VtLXByb21wdC5lbCAoZXNo ZWxsLS1hcHBlbmQtdGV4dC1wcm9wZXJ0eSk6IE1vdmUgZnJvbQpoZXJlLi4uCiogbGlzcC9l bWFjcy1saXNwL3N1YnIteC5lbCAoYXBwZW5kLXRleHQtcHJvcGVydHkpOiAuLi4gdG8gaGVy ZS4gIFVwZGF0ZQpjYWxsZXJzLgoKKiBsaXNwL3Zpc3VhbC13cmFwLmVsICh2aXN1YWwtd3Jh cC0tYXBwbHktdG8tbGluZSk6IFVzZQonYXBwZW5kLXRleHQtcHJvcGVydHknLgoKKiB0ZXN0 L2xpc3AvdmlzdWFsLXdyYXAtdGVzdHMuZWwgKHZpc3VhbC13cmFwLXRlc3RzL3NpbXBsZSkK KHZpc3VhbC13cmFwLXRlc3RzL3NhZmUtZGlzcGxheSkKKHZpc3VhbC13cmFwLXRlc3RzL3Vu c2FmZS1kaXNwbGF5L3dpdGhpbi1saW5lKTogVXBkYXRlIHRlc3RzLgoodmlzdWFsLXdyYXAt dGVzdHMvd3JhcC1wcmVmaXgtc3RpY2tpbmVzcyk6IE5ldyB0ZXN0LgoKKiBkb2MvbGlzcHJl Zi90ZXh0LnRleGkgKENoYW5naW5nIFByb3BlcnRpZXMpOiBEb2N1bWVudAonYXBwZW5kLXRl eHQtcHJvcGVydHknLgoKKiBldGMvTkVXUzogQW5ub3VuY2UgJ2FwcGVuZC10ZXh0LXByb3Bl cnR5JyAoYnVnIzc2MDE4KS4KLS0tCiBkb2MvbGlzcHJlZi90ZXh0LnRleGkgICAgICAgICAg fCAyNCArKysrKysrKysrKysrKysrKwogZXRjL05FV1MgICAgICAgICAgICAgICAgICAgICAg IHwgIDYgKysrKysKIGxpc3AvZW1hY3MtbGlzcC9zdWJyLXguZWwgICAgICB8IDE0ICsrKysr KysrKysKIGxpc3AvZXNoZWxsL2VtLXByb21wdC5lbCAgICAgICB8IDE3ICsrLS0tLS0tLS0t LQogbGlzcC92aXN1YWwtd3JhcC5lbCAgICAgICAgICAgIHwgIDcgKysrKy0KIHRlc3QvbGlz cC92aXN1YWwtd3JhcC10ZXN0cy5lbCB8IDQ4ICsrKysrKysrKysrKysrKysrKysrKysrKysr KystLS0tLS0KIDYgZmlsZXMgY2hhbmdlZCwgOTIgaW5zZXJ0aW9ucygrKSwgMjQgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZG9jL2xpc3ByZWYvdGV4dC50ZXhpIGIvZG9jL2xpc3By ZWYvdGV4dC50ZXhpCmluZGV4IDc1YjJiMWMzZDYwLi4zYmI1ZDVlZTA4NyAxMDA2NDQKLS0t IGEvZG9jL2xpc3ByZWYvdGV4dC50ZXhpCisrKyBiL2RvYy9saXNwcmVmL3RleHQudGV4aQpA QCAtMzEzNyw2ICszMTM3LDMwIEBAIENoYW5naW5nIFByb3BlcnRpZXMKIEBlbmQgZXhhbXBs ZQogQGVuZCBkZWZ1bgogCitAZGVmdW4gYXBwZW5kLXRleHQtcHJvcGVydHkgc3RhcnQgZW5k IHByb3AgdmFsdWVzICZvcHRpb25hbCBvYmplY3QKK1RoaXMgZnVuY3Rpb24gQGVtcGh7YXBw ZW5kc30gYSBsaXN0IG9mIEB2YXJ7dmFsdWVzfSB0byB0aGUgQHZhcntwcm9wfQorcHJvcGVy dHkgZm9yIHRoZSB0ZXh0IGJldHdlZW4gQHZhcntzdGFydH0gYW5kIEB2YXJ7ZW5kfSBpbiB0 aGUgc3RyaW5nIG9yCitidWZmZXIgQHZhcntvYmplY3R9LiAgSWYgQHZhcntvYmplY3R9IGlz IEBjb2Rle25pbH0sIGl0IGRlZmF1bHRzIHRvIHRoZQorY3VycmVudCBidWZmZXIuCisKK0Zv ciBpbnN0YW5jZToKKworQGxpc3AKK0Bncm91cAorKGFwcGVuZC10ZXh0LXByb3BlcnR5IDIg NCAncmVhci1ub25zdGlja3kgJyhyZWFkLW9ubHkgZmllbGQpKQorKGFwcGVuZC10ZXh0LXBy b3BlcnR5IDMgNSAncmVhci1ub25zdGlja3kgJyhmb250LWxvY2stZmFjZSkpCitAZW5kIGdy b3VwCitAZW5kIGxpc3AKKworQWZ0ZXIgZG9pbmcgdGhpcywgdGhlIHJlZ2lvbiBmcm9tIDIg dG8gMyB3aWxsIGhhdmUgYQorQGNvZGV7cmVhci1ub25zdGlja3l9IHByb3BlcnR5IG9mIEBj b2RleycocmVhZC1vbmx5IGZpZWxkKX0sIHRoZSByZWdpb24KK2Zyb20gMyB0byA0IHdpbGwg aGF2ZSBhIEBjb2Rle3JlYXItbm9uc3RpY2t5fSBwcm9wZXJ0eSBvZgorQGNvZGV7JyhyZWFk LW9ubHkgZmllbGQgZm9udC1sb2NrLWZhY2UpfSwgYW5kIGZpbmFsbHkgdGhlIHJlZ2lvbiBm cm9tIDQKK3RvIDUgd2lsbCBoYXZlIGEgQGNvZGV7cmVhci1ub25zdGlja3l9IHByb3BlcnR5 IG9mCitAY29kZXsnKGZvbnQtbG9jay1mYWNlKX0uCisKK0BlbmQgZGVmdW4KKwogQGRlZnVu IHJlbW92ZS10ZXh0LXByb3BlcnRpZXMgc3RhcnQgZW5kIHByb3BzICZvcHRpb25hbCBvYmpl Y3QKIFRoaXMgZnVuY3Rpb24gZGVsZXRlcyBzcGVjaWZpZWQgdGV4dCBwcm9wZXJ0aWVzIGZy b20gdGhlIHRleHQgYmV0d2VlbgogQHZhcntzdGFydH0gYW5kIEB2YXJ7ZW5kfSBpbiB0aGUg c3RyaW5nIG9yIGJ1ZmZlciBAdmFye29iamVjdH0uICBJZgpkaWZmIC0tZ2l0IGEvZXRjL05F V1MgYi9ldGMvTkVXUwppbmRleCAzM2IwNDI3MjBiNS4uZTA3ODhiNDIxYTEgMTAwNjQ0Ci0t LSBhL2V0Yy9ORVdTCisrKyBiL2V0Yy9ORVdTCkBAIC0yMzM5LDYgKzIzMzksMTIgQEAgVGhp cyAnZGlzcGxheScgcHJvcGVydHkgd2FzIHByZXZpb3VzbHkgc3VwcG9ydGVkIG9ubHkgYXMg dGV4dCBwcm9wZXJ0eS4KIE5vdyBvdmVybGF5cyBjYW4gYWxzbyBoYXZlIHRoaXMgcHJvcGVy dHksIHdpdGggdGhlIHNhbWUgZWZmZWN0IGZvciB0aGUKIHRleHQgImNvdmVyZWQiIGJ5IHRo ZSBvdmVybGF5LgogCisrKysKKyoqIE5ldyBmdW5jdGlvbiAnYXBwZW5kLXRleHQtcHJvcGVy dHknLgorVGhpcyBmdW5jdGlvbiBhcHBlbmRzIGEgbGlzdCBvZiB2YWx1ZXMgdG8gYSB0ZXh0 IHByb3BlcnR5IGZvciB0aGUKK3NwZWNpZmllZCByZWdpb24gb2YgdGV4dCwgcHJlc2Vydmlu ZyBhbnkgdmFsdWVzIGFscmVhZHkgc2V0IGZvciB0aGF0Citwcm9wZXJ0eS4KKwogKysrCiAq KiBOZXcgbWFjcm8gJ2NvbmQqJy4KIFRoZSBuZXcgbWFjcm8gJ2NvbmQqJyBpcyBhbiBhbHRl cm5hdGl2ZSB0byAnY29uZCcgYW5kICdwY2FzZScuCmRpZmYgLS1naXQgYS9saXNwL2VtYWNz LWxpc3Avc3Vici14LmVsIGIvbGlzcC9lbWFjcy1saXNwL3N1YnIteC5lbAppbmRleCBlYWE4 MTE5ZWFkNy4uNzc3MzgyNjVmMjUgMTAwNjQ0Ci0tLSBhL2xpc3AvZW1hY3MtbGlzcC9zdWJy LXguZWwKKysrIGIvbGlzcC9lbWFjcy1saXNwL3N1YnIteC5lbApAQCAtNDE2LDYgKzQxNiwy MCBAQCBzdHJpbmctZ2x5cGgtc3BsaXQKICAgICAgICAgKHNldHEgc3RhcnQgKDErIHN0YXJ0 KSkpKQogICAgIChucmV2ZXJzZSByZXN1bHQpKSkKIAorOzs7IyMjYXV0b2xvYWQKKyhkZWZ1 biBhcHBlbmQtdGV4dC1wcm9wZXJ0eSAoc3RhcnQgZW5kIHByb3AgdmFsdWVzICZvcHRpb25h bCBvYmplY3QpCisgICJBcHBlbmQgYSBsaXN0IG9mIHZhbHVlcyB0byBhIHRleHQgcHJvcGVy dHkgZnJvbSBTVEFSVCB0byBFTkQuCitQUk9QIGlzIHRoZSB0ZXh0IHByb3BlcnR5IHRvIGFw cGVuZCB0bywgYW5kIFZBTFVFUyBpcyB0aGUgbGlzdCBvZgorcHJvcGVydHkgdmFsdWVzIHRv IGFwcGVuZC4gIE9CSkVDVCBpcyB0aGUgb2JqZWN0IHRvIHByb3BlcnRpemUsIGFzIHdpdGgK K2BwdXQtdGV4dC1wcm9wZXJ0eScgKHdoaWNoIHNlZSkuIgorICAobGV0IChuZXh0KQorICAg ICh3aGlsZSAoPCBzdGFydCBlbmQpCisgICAgICAoc2V0cSBuZXh0IChuZXh0LXNpbmdsZS1w cm9wZXJ0eS1jaGFuZ2Ugc3RhcnQgcHJvcCBvYmplY3QgZW5kKSkKKyAgICAgIChwdXQtdGV4 dC1wcm9wZXJ0eSBzdGFydCBuZXh0IHByb3AKKyAgICAgICAgICAgICAgICAgICAgICAgICAo YXBwZW5kIChnZXQtdGV4dC1wcm9wZXJ0eSBzdGFydCBwcm9wIG9iamVjdCkgdmFsdWVzKQor ICAgICAgICAgICAgICAgICAgICAgICAgIG9iamVjdCkKKyAgICAgIChzZXRxIHN0YXJ0IG5l eHQpKSkpCisKIDs7OyMjI2F1dG9sb2FkCiAoZGVmdW4gYWRkLWRpc3BsYXktdGV4dC1wcm9w ZXJ0eSAoc3RhcnQgZW5kIHByb3AgdmFsdWUKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAmb3B0aW9uYWwgb2JqZWN0KQpkaWZmIC0tZ2l0IGEvbGlzcC9lc2hl bGwvZW0tcHJvbXB0LmVsIGIvbGlzcC9lc2hlbGwvZW0tcHJvbXB0LmVsCmluZGV4IDE1MjAw NDVkMDYzLi42NTc2OGRlODJiYiAxMDA2NDQKLS0tIGEvbGlzcC9lc2hlbGwvZW0tcHJvbXB0 LmVsCisrKyBiL2xpc3AvZXNoZWxsL2VtLXByb21wdC5lbApAQCAtMTE5LDE5ICsxMTksNiBA QCBlc2hlbGwtcHJvbXB0LWluaXRpYWxpemUKICAgICAoYWRkLWhvb2sgJ2VzaGVsbC1wb3N0 LWNvbW1hbmQtaG9vayAnZXNoZWxsLWVtaXQtcHJvbXB0IG5pbCB0KQogICAgIChlc2hlbGwt cHJvbXB0LW1vZGUpKSkKIAotKGRlZnVuIGVzaGVsbC0tYXBwZW5kLXRleHQtcHJvcGVydHkg KHN0YXJ0IGVuZCBwcm9wIHZhbHVlICZvcHRpb25hbCBvYmplY3QpCi0gICJBcHBlbmQgdG8g YSB0ZXh0IHByb3BlcnR5IGZyb20gU1RBUlQgdG8gRU5ELgotUFJPUCBpcyB0aGUgdGV4dCBw cm9wZXJ0eSB0byBhcHBlbmQgdG8sIGFuZCBWQUxVRSBpcyB0aGUgbGlzdCBvZgotcHJvcGVy dHkgdmFsdWVzIHRvIGFwcGVuZC4gIE9CSkVDVCBpcyB0aGUgb2JqZWN0IHRvIHByb3BlcnRp emUsIGFzIHdpdGgKLWBwdXQtdGV4dC1wcm9wZXJ0eScgKHdoaWNoIHNlZSkuIgotICAobGV0 IChuZXh0KQotICAgICh3aGlsZSAoPCBzdGFydCBlbmQpCi0gICAgICAoc2V0cSBuZXh0IChu ZXh0LXNpbmdsZS1wcm9wZXJ0eS1jaGFuZ2Ugc3RhcnQgcHJvcCBvYmplY3QgZW5kKSkKLSAg ICAgIChwdXQtdGV4dC1wcm9wZXJ0eSBzdGFydCBuZXh0IHByb3AKLSAgICAgICAgICAgICAg ICAgICAgICAgICAoYXBwZW5kIChnZXQtdGV4dC1wcm9wZXJ0eSBzdGFydCBwcm9wIG9iamVj dCkgdmFsdWUpCi0gICAgICAgICAgICAgICAgICAgICAgICAgb2JqZWN0KQotICAgICAgKHNl dHEgc3RhcnQgbmV4dCkpKSkKLQogKGRlZnVuIGVzaGVsbC1lbWl0LXByb21wdCAoKQogICAi RW1pdCBhIHByb21wdCBpZiBlc2hlbGwgaXMgYmVpbmcgdXNlZCBpbnRlcmFjdGl2ZWx5LiIK ICAgKHdoZW4gKGJvdW5kcCAnYW5zaS1jb2xvci1jb250ZXh0LXJlZ2lvbikKQEAgLTE0Nyw4 ICsxMzQsOCBAQCBlc2hlbGwtZW1pdC1wcm9tcHQKICAgICAgICAgKGFkZC10ZXh0LXByb3Bl cnRpZXMKICAgICAgICAgIDAgbGVuICcocmVhZC1vbmx5IHQgZm9udC1sb2NrLWZhY2UgZXNo ZWxsLXByb21wdCkgcHJvbXB0KQogICAgICAgICAoc2V0cSBzdGlja3ktcHJvcHMgYChyZWFk LW9ubHkgZm9udC1sb2NrLWZhY2UgLiAsc3RpY2t5LXByb3BzKSkpCi0gICAgICAoZXNoZWxs LS1hcHBlbmQtdGV4dC1wcm9wZXJ0eSAwIGxlbiAnZnJvbnQtc3RpY2t5IHN0aWNreS1wcm9w cyBwcm9tcHQpCi0gICAgICAoZXNoZWxsLS1hcHBlbmQtdGV4dC1wcm9wZXJ0eSAwIGxlbiAn cmVhci1ub25zdGlja3kgc3RpY2t5LXByb3BzIHByb21wdCkKKyAgICAgIChhcHBlbmQtdGV4 dC1wcm9wZXJ0eSAwIGxlbiAnZnJvbnQtc3RpY2t5IHN0aWNreS1wcm9wcyBwcm9tcHQpCisg ICAgICAoYXBwZW5kLXRleHQtcHJvcGVydHkgMCBsZW4gJ3JlYXItbm9uc3RpY2t5IHN0aWNr eS1wcm9wcyBwcm9tcHQpCiAgICAgICAoZXNoZWxsLWludGVyYWN0aXZlLWZpbHRlciBuaWwg cHJvbXB0KSkpCiAgIChydW4taG9va3MgJ2VzaGVsbC1hZnRlci1wcm9tcHQtaG9vaykpCiAK ZGlmZiAtLWdpdCBhL2xpc3AvdmlzdWFsLXdyYXAuZWwgYi9saXNwL3Zpc3VhbC13cmFwLmVs CmluZGV4IGI5MjFlMWYwNTQ5Li5lZjYxOWM5ZjE3NyAxMDA2NDQKLS0tIGEvbGlzcC92aXN1 YWwtd3JhcC5lbAorKysgYi9saXNwL3Zpc3VhbC13cmFwLmVsCkBAIC0xNjUsNyArMTY1LDEy IEBAIHZpc3VhbC13cmFwLS1hcHBseS10by1saW5lCiAgICAgICAgcG9zaXRpb24gKHBvcy1l b2wpICd3cmFwLXByZWZpeAogICAgICAgIChpZiAobnVtYmVycCBuZXh0LWxpbmUtcHJlZml4 KQogICAgICAgICAgICBgKHNwYWNlIDphbGlnbi10byAoLG5leHQtbGluZS1wcmVmaXggLiB3 aWR0aCkpCi0gICAgICAgICBuZXh0LWxpbmUtcHJlZml4KSkpKSkKKyAgICAgICAgIG5leHQt bGluZS1wcmVmaXgpKQorICAgICAgOzsgTWFrZSBzdXJlIHRoYXQgd2hlbiB0eXBpbmcgYXQg dGhlIGVuZCBvZiBhIGxpbmUgd2l0aAorICAgICAgOzsgYHdyYXAtcHJlZml4JyBzZXQsIHdl IGRvbid0IGNvbnRpbnVlIHRoYXQgcHJvcGVydHkgb3ZlcgorICAgICAgOzsgc3Vic2VxdWVu dCBsaW5lcy4gIFNlZSBidWcjNzYwMTguCisgICAgICAoYXBwZW5kLXRleHQtcHJvcGVydHkg cG9zaXRpb24gKHBvcy1lb2wpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ3JlYXIt bm9uc3RpY2t5ICcod3JhcC1wcmVmaXgpKSkpKQogCiAoZGVmdW4gdmlzdWFsLXdyYXAtLWNv bnRlbnQtcHJlZml4IChwcmVmaXggcG9zaXRpb24pCiAgICJHZXQgdGhlIG5leHQtbGluZSBw cmVmaXggZm9yIHRoZSBzcGVjaWZpZWQgZmlyc3QtbGluZSBQUkVGSVguCmRpZmYgLS1naXQg YS90ZXN0L2xpc3AvdmlzdWFsLXdyYXAtdGVzdHMuZWwgYi90ZXN0L2xpc3AvdmlzdWFsLXdy YXAtdGVzdHMuZWwKaW5kZXggMDQ5NzdhZmUyMDcuLmQzZmFhMTI4NjM3IDEwMDY0NAotLS0g YS90ZXN0L2xpc3AvdmlzdWFsLXdyYXAtdGVzdHMuZWwKKysrIGIvdGVzdC9saXNwL3Zpc3Vh bC13cmFwLXRlc3RzLmVsCkBAIC0zNywxMSArMzcsMTUgQEAgdmlzdWFsLXdyYXAtdGVzdHMv c2ltcGxlCiAgICAgICAgICAgICAgKGJ1ZmZlci1zdHJpbmcpCiAgICAgICAgICAgICAgIygi Z3JlZXRpbmdzXG4qIGhlbGxvXG4qIGhpIgogICAgICAgICAgICAgICAgMTAgMTIgKCB3cmFw LXByZWZpeCAoc3BhY2UgOmFsaWduLXRvICgyIC4gd2lkdGgpKQotICAgICAgICAgICAgICAg ICAgICAgICBkaXNwbGF5IChtaW4td2lkdGggKCgyIC4gd2lkdGgpKSkpCi0gICAgICAgICAg ICAgICAxMiAxNyAoIHdyYXAtcHJlZml4IChzcGFjZSA6YWxpZ24tdG8gKDIgLiB3aWR0aCkp KQorICAgICAgICAgICAgICAgICAgICAgICBkaXNwbGF5IChtaW4td2lkdGggKCgyIC4gd2lk dGgpKSkKKyAgICAgICAgICAgICAgICAgICAgICAgcmVhci1ub25zdGlja3kgKHdyYXAtcHJl Zml4KSkKKyAgICAgICAgICAgICAgIDEyIDE3ICggd3JhcC1wcmVmaXggKHNwYWNlIDphbGln bi10byAoMiAuIHdpZHRoKSkKKyAgICAgICAgICAgICAgICAgICAgICAgcmVhci1ub25zdGlj a3kgKHdyYXAtcHJlZml4KSkKICAgICAgICAgICAgICAgIDE4IDIwICggd3JhcC1wcmVmaXgg KHNwYWNlIDphbGlnbi10byAoMiAuIHdpZHRoKSkKLSAgICAgICAgICAgICAgICAgICAgICAg ZGlzcGxheSAobWluLXdpZHRoICgoMiAuIHdpZHRoKSkpKQotICAgICAgICAgICAgICAgMjAg MjIgKCB3cmFwLXByZWZpeCAoc3BhY2UgOmFsaWduLXRvICgyIC4gd2lkdGgpKSkpKSkpKQor ICAgICAgICAgICAgICAgICAgICAgICBkaXNwbGF5IChtaW4td2lkdGggKCgyIC4gd2lkdGgp KSkKKyAgICAgICAgICAgICAgICAgICAgICAgcmVhci1ub25zdGlja3kgKHdyYXAtcHJlZml4 KSkKKyAgICAgICAgICAgICAgIDIwIDIyICggd3JhcC1wcmVmaXggKHNwYWNlIDphbGlnbi10 byAoMiAuIHdpZHRoKSkKKyAgICAgICAgICAgICAgICAgICAgICAgcmVhci1ub25zdGlja3kg KHdyYXAtcHJlZml4KSkpKSkpKQogCiAoZXJ0LWRlZnRlc3QgdmlzdWFsLXdyYXAtdGVzdHMv c2FmZS1kaXNwbGF5ICgpCiAgICJUZXN0IGFkZGluZyB3cmFwcGluZyBwcm9wZXJ0aWVzIHRv IHRleHQgd2l0aCBzYWZlIGRpc3BsYXkgcHJvcGVydGllcy4iCkBAIC01Miw5ICs1NiwxMSBA QCB2aXN1YWwtd3JhcC10ZXN0cy9zYWZlLWRpc3BsYXkKICAgICAgICAgICAgICAoYnVmZmVy LXN0cmluZykKICAgICAgICAgICAgICAjKCIqIGhlbGxvIgogICAgICAgICAgICAgICAgMCAy ICggd3JhcC1wcmVmaXggKHNwYWNlIDphbGlnbi10byAoMiAuIHdpZHRoKSkKLSAgICAgICAg ICAgICAgICAgICAgIGRpc3BsYXkgKG1pbi13aWR0aCAoKDIgLiB3aWR0aCkpKSkKKyAgICAg ICAgICAgICAgICAgICAgIGRpc3BsYXkgKG1pbi13aWR0aCAoKDIgLiB3aWR0aCkpKQorICAg ICAgICAgICAgICAgICAgICAgcmVhci1ub25zdGlja3kgKHdyYXAtcHJlZml4KSkKICAgICAg ICAgICAgICAgIDIgNyAoIHdyYXAtcHJlZml4IChzcGFjZSA6YWxpZ24tdG8gKDIgLiB3aWR0 aCkpCi0gICAgICAgICAgICAgICAgICAgICBkaXNwbGF5IChyYWlzZSAxKSkpKSkpKQorICAg ICAgICAgICAgICAgICAgICAgZGlzcGxheSAocmFpc2UgMSkKKyAgICAgICAgICAgICAgICAg ICAgIHJlYXItbm9uc3RpY2t5ICh3cmFwLXByZWZpeCkpKSkpKSkKIAogKGVydC1kZWZ0ZXN0 IHZpc3VhbC13cmFwLXRlc3RzL3Vuc2FmZS1kaXNwbGF5L3dpdGhpbi1saW5lICgpCiAgICJU ZXN0IGFkZGluZyB3cmFwcGluZyBwcm9wZXJ0aWVzIHRvIHRleHQgd2l0aCB1bnNhZmUgZGlz cGxheSBwcm9wZXJ0aWVzLgpAQCAtNjcsOSArNzMsMTEgQEAgdmlzdWFsLXdyYXAtdGVzdHMv dW5zYWZlLWRpc3BsYXkvd2l0aGluLWxpbmUKICAgICAgICAgICAgICAoYnVmZmVyLXN0cmlu ZykKICAgICAgICAgICAgICAjKCIqIFtpbWddIgogICAgICAgICAgICAgICAgMCAyICggd3Jh cC1wcmVmaXggKHNwYWNlIDphbGlnbi10byAoMiAuIHdpZHRoKSkKLSAgICAgICAgICAgICAg ICAgICAgIGRpc3BsYXkgKG1pbi13aWR0aCAoKDIgLiB3aWR0aCkpKSkKKyAgICAgICAgICAg ICAgICAgICAgIGRpc3BsYXkgKG1pbi13aWR0aCAoKDIgLiB3aWR0aCkpKQorICAgICAgICAg ICAgICAgICAgICAgcmVhci1ub25zdGlja3kgKHdyYXAtcHJlZml4KSkKICAgICAgICAgICAg ICAgIDIgNyAoIHdyYXAtcHJlZml4IChzcGFjZSA6YWxpZ24tdG8gKDIgLiB3aWR0aCkpCi0g ICAgICAgICAgICAgICAgICAgICBkaXNwbGF5IChpbWFnZSA6dHlwZSBibXApKSkpKSkpCisg ICAgICAgICAgICAgICAgICAgICBkaXNwbGF5IChpbWFnZSA6dHlwZSBibXApCisgICAgICAg ICAgICAgICAgICAgICByZWFyLW5vbnN0aWNreSAod3JhcC1wcmVmaXgpKSkpKSkpCiAKIChl cnQtZGVmdGVzdCB2aXN1YWwtd3JhcC10ZXN0cy91bnNhZmUtZGlzcGxheS9zcGFubmluZy1s aW5lcyAoKQogICAiVGVzdCBhZGRpbmcgd3JhcHBpbmcgcHJvcGVydGllcyB0byB0ZXh0IHdp dGggdW5zYWZlIGRpc3BsYXkgcHJvcGVydGllcy4KQEAgLTExNyw0ICsxMjUsMjggQEAgdmlz dWFsLXdyYXAtdGVzdHMvdW5zYWZlLWRpc3BsYXkvbXVsdGlwbGUtMgogICAgICAgICAgICAg ICAwIDQgKGRpc3BsYXkgKChpbWFnZSA6dHlwZSBibXApKSkKICAgICAgICAgICAgICAgNCA4 IChkaXNwbGF5ICgoaW1hZ2UgOnR5cGUgYm1wKSAoaGVpZ2h0IDEuNSkpKSkpKSkpCiAKKyhl cnQtZGVmdGVzdCB2aXN1YWwtd3JhcC10ZXN0cy93cmFwLXByZWZpeC1zdGlja2luZXNzICgp CisgICJUZXN0IHRoYXQgYHdyYXAtcHJlZml4JyBkb2Vzbid0IHBlcnNpc3QgYWNyb3NzIG11 bHRpcGxlIGxpbmVzIHdoZW4gdHlwaW5nLgorU2VlIGJ1ZyM3NjAxOC4iCisgICh3aXRoLXRl bXAtYnVmZmVyCisgICAgKGluc2VydCAiKiB0aGlzIHpvbyBjb250YWlucyBnb2F0cyIpCisg ICAgKHZpc3VhbC13cmFwLXByZWZpeC1mdW5jdGlvbiAocG9pbnQtbWluKSAocG9pbnQtbWF4 KSkKKyAgICAoc2hvdWxkIChlcXVhbC1pbmNsdWRpbmctcHJvcGVydGllcworICAgICAgICAg ICAgIChidWZmZXItc3RyaW5nKQorICAgICAgICAgICAgICMoIiogdGhpcyB6b28gY29udGFp bnMgZ29hdHMiCisgICAgICAgICAgICAgICAwICAyICggd3JhcC1wcmVmaXggKHNwYWNlIDph bGlnbi10byAoMiAuIHdpZHRoKSkKKyAgICAgICAgICAgICAgICAgICAgICBkaXNwbGF5ICht aW4td2lkdGggKCgyIC4gd2lkdGgpKSkKKyAgICAgICAgICAgICAgICAgICAgICByZWFyLW5v bnN0aWNreSAod3JhcC1wcmVmaXgpKQorICAgICAgICAgICAgICAgMiAyNSAoIHdyYXAtcHJl Zml4IChzcGFjZSA6YWxpZ24tdG8gKDIgLiB3aWR0aCkpCisgICAgICAgICAgICAgICAgICAg ICAgcmVhci1ub25zdGlja3kgKHdyYXAtcHJlZml4KSkpKSkKKyAgICAoaW5zZXJ0LWFuZC1p bmhlcml0ICJcblxuaXQgYWxzbyBjb250YWlucyBwYW5kYXMiKQorICAgIChzaG91bGQgKGVx dWFsLWluY2x1ZGluZy1wcm9wZXJ0aWVzCisgICAgICAgICAgICAgKGJ1ZmZlci1zdHJpbmcp CisgICAgICAgICAgICAgIygiKiB0aGlzIHpvbyBjb250YWlucyBnb2F0c1xuXG5pdCBhbHNv IGNvbnRhaW5zIHBhbmRhcyIKKyAgICAgICAgICAgICAgIDAgIDIgKCB3cmFwLXByZWZpeCAo c3BhY2UgOmFsaWduLXRvICgyIC4gd2lkdGgpKQorICAgICAgICAgICAgICAgICAgICAgIGRp c3BsYXkgKG1pbi13aWR0aCAoKDIgLiB3aWR0aCkpKQorICAgICAgICAgICAgICAgICAgICAg IHJlYXItbm9uc3RpY2t5ICh3cmFwLXByZWZpeCkpCisgICAgICAgICAgICAgICAyIDI1ICgg d3JhcC1wcmVmaXggKHNwYWNlIDphbGlnbi10byAoMiAuIHdpZHRoKSkKKyAgICAgICAgICAg ICAgICAgICAgICByZWFyLW5vbnN0aWNreSAod3JhcC1wcmVmaXgpKSkpKSkpCisKIDs7IHZp c3VhbC13cmFwLXRlc3RzLmVsIGVuZHMgaGVyZQotLSAKMi4yNS4xCgo= --------------7Hn7sDNiBWAdxfV0q0MjSWC7 Content-Type: text/plain; charset=UTF-8; name="0002-Properly-clean-up-after-deactivating-visual-wrap-pre.patch" Content-Disposition: attachment; filename*0="0002-Properly-clean-up-after-deactivating-visual-wrap-pre.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSA2ZTZlYWI5ODlmNzZlYzhmMGU4NmNmNWMxMzhiOGExNGYwZWI2NWJkIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFR1ZSwgMjcgTWF5IDIwMjUgMTg6MDA6MjUgLTA3MDAKU3ViamVjdDogW1BB VENIIDIvMl0gUHJvcGVybHkgY2xlYW4gdXAgYWZ0ZXIgZGVhY3RpdmF0aW5nCiAndmlzdWFs LXdyYXAtcHJlZml4LW1vZGUnCgoqIGxpc3AvZW1hY3MtbGlzcC9zdWJyLXguZWwgKGFkZC1y ZW1vdmUtLWRpc3BsYXktdGV4dC1wcm9wZXJ0eSk6IE5ldwpmdW5jdGlvbiwgZXh0cmFjdGVk IGZyb20uLi4KKGFkZC1kaXNwbGF5LXRleHQtcHJvcGVydHkpOiAuLi4gaGVyZS4KKHJlbW92 ZS1kaXNwbGF5LXRleHQtcHJvcGVydHkpOiBOZXcgZnVuY3Rpb24uCgoqIGxpc3AvdmlzdWFs LXdyYXAuZWwgKHZpc3VhbC13cmFwLS1kZWxxLXRleHQtcHJvcGVydHkpOiBOZXcgZnVuY3Rp b24uCih2aXN1YWwtd3JhcC0tcmVtb3ZlLXByb3BlcnRpZXMpOiBOZXcgZnVuY3Rpb24uLi4K KHZpc3VhbC13cmFwLXByZWZpeC1mdW5jdGlvbiwgdmlzdWFsLXdyYXAtcHJlZml4LW1vZGUp OiAuLi4gY2FsbCBpdC4KCiogdGVzdC9saXNwL3Zpc3VhbC13cmFwLXRlc3RzLmVsICh2aXN1 YWwtd3JhcC10ZXN0cy9jbGVhbnVwKTogTmV3IHRlc3QuCgoqIGRvYy9saXNwcmVmL2Rpc3Bs YXkudGV4aSAoRGlzcGxheSBQcm9wZXJ0eSk6RG9jdW1lbnQKJ3JlbW92ZS1kaXNwbGF5LXRl eHQtcHJvcGVydHknLgoKKiBldGMvTkVXUzogQW5ub3VuY2UgJ3JlbW92ZS1kaXNwbGF5LXRl eHQtcHJvcGVydHknLgotLS0KIGRvYy9saXNwcmVmL2Rpc3BsYXkudGV4aSAgICAgICB8IDMy ICsrKysrKysrKysrKysrKysrCiBldGMvTkVXUyAgICAgICAgICAgICAgICAgICAgICAgfCAg NiArKysrCiBsaXNwL2VtYWNzLWxpc3Avc3Vici14LmVsICAgICAgfCA2NSArKysrKysrKysr KysrKysrKysrKysrKy0tLS0tLS0tLS0tCiBsaXNwL3Zpc3VhbC13cmFwLmVsICAgICAgICAg ICAgfCAzMiArKysrKysrKysrKysrKysrLQogdGVzdC9saXNwL3Zpc3VhbC13cmFwLXRlc3Rz LmVsIHwgMTUgKysrKysrKysKIDUgZmlsZXMgY2hhbmdlZCwgMTI4IGluc2VydGlvbnMoKyks IDIyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RvYy9saXNwcmVmL2Rpc3BsYXkudGV4 aSBiL2RvYy9saXNwcmVmL2Rpc3BsYXkudGV4aQppbmRleCAzYjQ4Y2I5MzQwNS4uNzdhNTM5 NDhiNWUgMTAwNjQ0Ci0tLSBhL2RvYy9saXNwcmVmL2Rpc3BsYXkudGV4aQorKysgYi9kb2Mv bGlzcHJlZi9kaXNwbGF5LnRleGkKQEAgLTUyOTksNiArNTI5OSwzOCBAQCBEaXNwbGF5IFBy b3BlcnR5CiBJZiBAY29kZXtuaWx9LCB0aGlzIGRlZmF1bHRzIHRvIHRoZSBjdXJyZW50IGJ1 ZmZlci4KIEBlbmQgZGVmdW4KIAorQGRlZnVuIHJlbW92ZS1kaXNwbGF5LXRleHQtcHJvcGVy dHkgc3RhcnQgZW5kIHByb3AgJm9wdGlvbmFsIG9iamVjdAorUmVtb3ZlIEBjb2Rle2Rpc3Bs YXl9IHByb3BlcnR5IEB2YXJ7cHJvcH0gZnJvbSB0aGUgdGV4dCBmcm9tIEB2YXJ7c3RhcnR9 Cit0byBAdmFye2VuZH0uCisKK0lmIGFueSB0ZXh0IGluIHRoZSByZWdpb24gaGFzIGFueSBv dGhlciBAY29kZXtkaXNwbGF5fSBwcm9wZXJ0aWVzLCB0aG9zZQorcHJvcGVydGllcyBhcmUg cmV0YWluZWQuICBGb3IgaW5zdGFuY2U6CisKK0BsaXNwCisoYWRkLWRpc3BsYXktdGV4dC1w cm9wZXJ0eSAxIDggJ3JhaXNlIDAuNSkKKyhhZGQtZGlzcGxheS10ZXh0LXByb3BlcnR5IDQg OCAnaGVpZ2h0IDIuMCkKKyhyZW1vdmUtZGlzcGxheS10ZXh0LXByb3BlcnR5IDIgNiAncmFp c2UpCitAZW5kIGxpc3AKKworQWZ0ZXIgZG9pbmcgdGhpcywgdGhlIHRleHQgd2lsbCBoYXZl IHRoZSBmb2xsb3dpbmcgQGNvZGV7ZGlzcGxheX0KK3Byb3BlcnRpZXM6CisKK0BpdGVtaXpl IEBidWxsZXQKK0BpdGVtCitUaGUgcmVnaW9uIGZyb20gMSB0byAyLCBvbmx5IEBjb2Rle3Jh aXNlfQorCitAaXRlbQorVGhlIHJlZ2lvbiBmcm9tIDIgdG8gNCwgbm8gcHJvcGVydGllcwor CitAaXRlbQorVGhlIHJlZ2lvbiBmcm9tIDQgdG8gNiwgb25seSBAY29kZXtoZWlnaHR9CisK K0BpdGVtCitUaGUgcmVnaW9uIGZyb20gNiB0byA4LCBib3RoIEBjb2Rle3JhaXNlfSBhbmQg QGNvZGV7aGVpZ2h0fQorCitAZW5kIGl0ZW1pemUKK0BlbmQgZGVmdW4KKwogQGNpbmRleCBk aXNwbGF5IHByb3BlcnR5LCB1bnNhZmUgZXZhbHVhdGlvbgogQGNpbmRleCBzZWN1cml0eSwg YW5kIGRpc3BsYXkgc3BlY2lmaWNhdGlvbnMKICAgU29tZSBvZiB0aGUgZGlzcGxheSBzcGVj aWZpY2F0aW9ucyBhbGxvdyBpbmNsdXNpb24gb2YgTGlzcCBmb3JtcywKZGlmZiAtLWdpdCBh L2V0Yy9ORVdTIGIvZXRjL05FV1MKaW5kZXggZTA3ODhiNDIxYTEuLjM2OWJiYzJiMzQ3IDEw MDY0NAotLS0gYS9ldGMvTkVXUworKysgYi9ldGMvTkVXUwpAQCAtMjM0NSw2ICsyMzQ1LDEy IEBAIFRoaXMgZnVuY3Rpb24gYXBwZW5kcyBhIGxpc3Qgb2YgdmFsdWVzIHRvIGEgdGV4dCBw cm9wZXJ0eSBmb3IgdGhlCiBzcGVjaWZpZWQgcmVnaW9uIG9mIHRleHQsIHByZXNlcnZpbmcg YW55IHZhbHVlcyBhbHJlYWR5IHNldCBmb3IgdGhhdAogcHJvcGVydHkuCiAKKysrKworKiog TmV3IGZ1bmN0aW9uICdyZW1vdmUtZGlzcGxheS10ZXh0LXByb3BlcnR5Jy4KK1RoaXMgZnVu Y3Rpb24gcmVtb3ZlcyBhIGRpc3BsYXkgcHJvcGVydHkgZnJvbSB0aGUgc3BlY2lmaWVkIHJl Z2lvbiBvZgordGV4dCwgcHJlc2VydmluZyBhbnkgb3RoZXIgZGlzcGxheSBwcm9wZXJ0aWVz IGFscmVhZHkgc2V0IGZvciB0aGF0CityZWdpb24uCisKICsrKwogKiogTmV3IG1hY3JvICdj b25kKicuCiBUaGUgbmV3IG1hY3JvICdjb25kKicgaXMgYW4gYWx0ZXJuYXRpdmUgdG8gJ2Nv bmQnIGFuZCAncGNhc2UnLgpkaWZmIC0tZ2l0IGEvbGlzcC9lbWFjcy1saXNwL3N1YnIteC5l bCBiL2xpc3AvZW1hY3MtbGlzcC9zdWJyLXguZWwKaW5kZXggNzc3MzgyNjVmMjUuLmYyZDQ2 NTFiN2YyIDEwMDY0NAotLS0gYS9saXNwL2VtYWNzLWxpc3Avc3Vici14LmVsCisrKyBiL2xp c3AvZW1hY3MtbGlzcC9zdWJyLXguZWwKQEAgLTQzMCwyOSArNDMwLDI1IEBAIGFwcGVuZC10 ZXh0LXByb3BlcnR5CiAgICAgICAgICAgICAgICAgICAgICAgICAgb2JqZWN0KQogICAgICAg KHNldHEgc3RhcnQgbmV4dCkpKSkKIAotOzs7IyMjYXV0b2xvYWQKLShkZWZ1biBhZGQtZGlz cGxheS10ZXh0LXByb3BlcnR5IChzdGFydCBlbmQgcHJvcCB2YWx1ZQotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICZvcHRpb25hbCBvYmplY3QpCi0gICJBZGQg ZGlzcGxheSBwcm9wZXJ0eSBQUk9QIHdpdGggVkFMVUUgdG8gdGhlIHRleHQgZnJvbSBTVEFS VCB0byBFTkQuCi1JZiBhbnkgdGV4dCBpbiB0aGUgcmVnaW9uIGhhcyBhIG5vbi1uaWwgYGRp c3BsYXknIHByb3BlcnR5LCB0aG9zZQotcHJvcGVydGllcyBhcmUgcmV0YWluZWQuCi0KLUlm IE9CSkVDVCBpcyBub24tbmlsLCBpdCBzaG91bGQgYmUgYSBzdHJpbmcgb3IgYSBidWZmZXIu ICBJZiBuaWwsCi10aGlzIGRlZmF1bHRzIHRvIHRoZSBjdXJyZW50IGJ1ZmZlci4iCisoZGVm dW4gYWRkLXJlbW92ZS0tZGlzcGxheS10ZXh0LXByb3BlcnR5IChzdGFydCBlbmQgcHJvcCB2 YWx1ZQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Jm9wdGlvbmFsIG9iamVjdCByZW1vdmUpCiAgIChsZXQgKChzdWItc3RhcnQgc3RhcnQpCiAg ICAgICAgIChzdWItZW5kIDApCisgICAgICAgIChsaW1pdCAoaWYgKHN0cmluZ3Agb2JqZWN0 KQorICAgICAgICAgICAgICAgICAgIChtaW4gKGxlbmd0aCBvYmplY3QpIGVuZCkKKyAgICAg ICAgICAgICAgICAgKG1pbiBlbmQgKHBvaW50LW1heCkpKSkKICAgICAgICAgZGlzcCkKICAg ICAod2hpbGUgKDwgc3ViLWVuZCBlbmQpCiAgICAgICAoc2V0cSBzdWItZW5kIChuZXh0LXNp bmdsZS1wcm9wZXJ0eS1jaGFuZ2Ugc3ViLXN0YXJ0ICdkaXNwbGF5IG9iamVjdAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChpZiAoc3RyaW5n cCBvYmplY3QpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIChtaW4gKGxlbmd0aCBvYmplY3QpIGVuZCkKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChtaW4gZW5kIChwb2ludC1tYXgp KSkpKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGxpbWl0KSkKICAgICAgIChpZiAobm90IChzZXRxIGRpc3AgKGdldC10ZXh0LXByb3BlcnR5 IHN1Yi1zdGFydCAnZGlzcGxheSBvYmplY3QpKSkKICAgICAgICAgICA7OyBObyBvbGQgcHJv cGVydGllcyBpbiB0aGlzIHJhbmdlLgotICAgICAgICAgIChwdXQtdGV4dC1wcm9wZXJ0eSBz dWItc3RhcnQgc3ViLWVuZCAnZGlzcGxheSAobGlzdCBwcm9wIHZhbHVlKQotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBvYmplY3QpCisgICAgICAgICAgKHVubGVzcyByZW1vdmUK KyAgICAgICAgICAgIChwdXQtdGV4dC1wcm9wZXJ0eSBzdWItc3RhcnQgc3ViLWVuZCAnZGlz cGxheSAobGlzdCBwcm9wIHZhbHVlKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IG9iamVjdCkpCiAgICAgICAgIDs7IFdlIGhhdmUgb2xkIHByb3BlcnRpZXMuCi0gICAgICAg IChsZXQgKCh2ZWN0b3IgbmlsKSkKKyAgICAgICAgKGxldCAoKHZlY3RvciBuaWwpCisgICAg ICAgICAgICAgIChjaGFuZ2VkIG5pbCkpCiAgICAgICAgICAgOzsgTWFrZSBkaXNwIGludG8g YSBsaXN0LgogICAgICAgICAgIChzZXRxIGRpc3AKICAgICAgICAgICAgICAgICAoY29uZApA QCAtNDY1LDE0ICs0NjEsNDEgQEAgYWRkLWRpc3BsYXktdGV4dC1wcm9wZXJ0eQogICAgICAg ICAgICAgICAgICAgZGlzcCkpKQogICAgICAgICAgIDs7IFJlbW92ZSBhbnkgb2xkIGluc3Rh bmNlcy4KICAgICAgICAgICAod2hlbi1sZXQqICgob2xkIChhc3NvYyBwcm9wIGRpc3ApKSkK LSAgICAgICAgICAgIChzZXRxIGRpc3AgKGRlbGV0ZSBvbGQgZGlzcCkpKQotICAgICAgICAg IChzZXRxIGRpc3AgKGNvbnMgKGxpc3QgcHJvcCB2YWx1ZSkgZGlzcCkpCi0gICAgICAgICAg KHdoZW4gdmVjdG9yCi0gICAgICAgICAgICAoc2V0cSBkaXNwIChzZXEtaW50byBkaXNwICd2 ZWN0b3IpKSkKLSAgICAgICAgICA7OyBGaW5hbGx5IHVwZGF0ZSB0aGUgcmFuZ2UuCi0gICAg ICAgICAgKHB1dC10ZXh0LXByb3BlcnR5IHN1Yi1zdGFydCBzdWItZW5kICdkaXNwbGF5IGRp c3Agb2JqZWN0KSkpCisgICAgICAgICAgICAoc2V0cSBkaXNwIChkZWxldGUgb2xkIGRpc3Ap CisgICAgICAgICAgICAgICAgICBjaGFuZ2VkIHQpKQorICAgICAgICAgICh1bmxlc3MgcmVt b3ZlCisgICAgICAgICAgICAoc2V0cSBkaXNwIChjb25zIChsaXN0IHByb3AgdmFsdWUpIGRp c3ApCisgICAgICAgICAgICAgICAgICBjaGFuZ2VkIHQpKQorICAgICAgICAgICh3aGVuIGNo YW5nZWQKKyAgICAgICAgICAgIChpZiAobm90IGRpc3ApCisgICAgICAgICAgICAgICAgKHJl bW92ZS10ZXh0LXByb3BlcnRpZXMgc3ViLXN0YXJ0IHN1Yi1lbmQgJyhkaXNwbGF5IG5pbCkg b2JqZWN0KQorICAgICAgICAgICAgICAod2hlbiB2ZWN0b3IKKyAgICAgICAgICAgICAgICAo c2V0cSBkaXNwIChzZXEtaW50byBkaXNwICd2ZWN0b3IpKSkKKyAgICAgICAgICAgICAgOzsg RmluYWxseSB1cGRhdGUgdGhlIHJhbmdlLgorICAgICAgICAgICAgICAocHV0LXRleHQtcHJv cGVydHkgc3ViLXN0YXJ0IHN1Yi1lbmQgJ2Rpc3BsYXkgZGlzcCBvYmplY3QpKSkpKQogICAg ICAgKHNldHEgc3ViLXN0YXJ0IHN1Yi1lbmQpKSkpCiAKKzs7OyMjI2F1dG9sb2FkCisoZGVm dW4gYWRkLWRpc3BsYXktdGV4dC1wcm9wZXJ0eSAoc3RhcnQgZW5kIHByb3AgdmFsdWUKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmb3B0aW9uYWwgb2JqZWN0 KQorICAiQWRkIGRpc3BsYXkgcHJvcGVydHkgUFJPUCB3aXRoIFZBTFVFIHRvIHRoZSB0ZXh0 IGZyb20gU1RBUlQgdG8gRU5ELgorSWYgYW55IHRleHQgaW4gdGhlIHJlZ2lvbiBoYXMgYSBu b24tbmlsIGBkaXNwbGF5JyBwcm9wZXJ0eSwgdGhvc2UKK3Byb3BlcnRpZXMgYXJlIHJldGFp bmVkLgorCitJZiBPQkpFQ1QgaXMgbm9uLW5pbCwgaXQgc2hvdWxkIGJlIGEgc3RyaW5nIG9y IGEgYnVmZmVyLiAgSWYgbmlsLAordGhpcyBkZWZhdWx0cyB0byB0aGUgY3VycmVudCBidWZm ZXIuIgorICAoYWRkLXJlbW92ZS0tZGlzcGxheS10ZXh0LXByb3BlcnR5IHN0YXJ0IGVuZCBw cm9wIHZhbHVlIG9iamVjdCkpCisKKzs7OyMjI2F1dG9sb2FkCisoZGVmdW4gcmVtb3ZlLWRp c3BsYXktdGV4dC1wcm9wZXJ0eSAoc3RhcnQgZW5kIHByb3AgJm9wdGlvbmFsIG9iamVjdCkK KyAgIlJlbW92ZSBkaXNwbGF5IHByb3BlcnR5IFBST1AgZnJvbSB0aGUgdGV4dCBmcm9tIFNU QVJUIHRvIEVORC4KK0lmIGFueSB0ZXh0IGluIHRoZSByZWdpb24gaGFzIG90aGVyIGBkaXNw bGF5JyBzcGVjcywgdGhvc2Ugc3BlY3MgYXJlCityZXRhaW5lZC4KKworSWYgT0JKRUNUIGlz IG5vbi1uaWwsIGl0IHNob3VsZCBiZSBhIHN0cmluZyBvciBhIGJ1ZmZlci4gIElmIG5pbCwK K3RoaXMgZGVmYXVsdHMgdG8gdGhlIGN1cnJlbnQgYnVmZmVyLiIKKyAgKGFkZC1yZW1vdmUt LWRpc3BsYXktdGV4dC1wcm9wZXJ0eSBzdGFydCBlbmQgcHJvcCBuaWwgb2JqZWN0ICdyZW1v dmUpKQorCiA7OzsjIyNhdXRvbG9hZAogKGRlZnVuIHJlYWQtcHJvY2Vzcy1uYW1lIChwcm9t cHQpCiAgICJRdWVyeSB0aGUgdXNlciBmb3IgYSBwcm9jZXNzIGFuZCByZXR1cm4gdGhlIHBy b2Nlc3Mgb2JqZWN0LiIKZGlmZiAtLWdpdCBhL2xpc3AvdmlzdWFsLXdyYXAuZWwgYi9saXNw L3Zpc3VhbC13cmFwLmVsCmluZGV4IGVmNjE5YzlmMTc3Li45ZTdmNDMwY2U3MyAxMDA2NDQK LS0tIGEvbGlzcC92aXN1YWwtd3JhcC5lbAorKysgYi9saXNwL3Zpc3VhbC13cmFwLmVsCkBA IC0zMyw2ICszMyw4IEBACiAKIDs7OyBDb2RlOgogCisocmVxdWlyZSAndGV4dC1wcm9wZXJ0 eS1zZWFyY2gpCisKIChkZWZjdXN0b20gdmlzdWFsLXdyYXAtZXh0cmEtaW5kZW50IDAKICAg Ik51bWJlciBvZiBleHRyYSBzcGFjZXMgdG8gaW5kZW50IGluIGB2aXN1YWwtd3JhcC1wcmVm aXgtbW9kZScuCiAKQEAgLTIzMSw2ICsyMzMsMzMgQEAgdmlzdWFsLXdyYXAtZmlsbC1jb250 ZXh0LXByZWZpeAogICAgICAgICAocHJvcGVydGl6ZSBwcmVmaXggJ2ZhY2UgZmFjZSkKICAg ICAgIHByZWZpeCkpKQogCisoZGVmdW4gdmlzdWFsLXdyYXAtLWRlbHEtdGV4dC1wcm9wZXJ0 eSAoc3RhcnQgZW5kIHByb3AgdmFsdWUpCisgICJSZW1vdmUgYSBWQUxVRSBmcm9tIHRoZSB0 ZXh0IHByb3BlcnR5IFBST1AgZnJvbSBTVEFSVCB0byBFTkQuCitUaGlzIHJlbW92ZXMgdGhl IHZhbHVlIGZyb20gYSB0ZXh0IHByb3BlcnR5IGNvbnRhaW5pbmcgYSBsaXN0LCBhcyB3aXRo CitgZGVscScgKHdoaWNoIHNlZSkuIgorICAoc2F2ZS1leGN1cnNpb24KKyAgICAoc2F2ZS1y ZXN0cmljdGlvbgorICAgICAgKG5hcnJvdy10by1yZWdpb24gc3RhcnQgZW5kKQorICAgICAg KGdvdG8tY2hhciAocG9pbnQtbWluKSkKKyAgICAgIChsZXQgKG1hdGNoKQorICAgICAgICAo d2hpbGUgKHNldHEgbWF0Y2ggKHRleHQtcHJvcGVydHktc2VhcmNoLWZvcndhcmQgcHJvcCB2 YWx1ZSAjJ21lbXEpKQorICAgICAgICAgIChpZi1sZXQqICgobmV3LXZhbHVlIChyZW1xIHZh bHVlIChwcm9wLW1hdGNoLXZhbHVlIG1hdGNoKSkpKQorICAgICAgICAgICAgICAocHV0LXRl eHQtcHJvcGVydHkgKHByb3AtbWF0Y2gtYmVnaW5uaW5nIG1hdGNoKQorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgKHByb3AtbWF0Y2gtZW5kIG1hdGNoKQorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgcHJvcCBuZXctdmFsdWUpCisgICAgICAgICAgICAo cmVtb3ZlLXRleHQtcHJvcGVydGllcyAocHJvcC1tYXRjaC1iZWdpbm5pbmcgbWF0Y2gpCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAocHJvcC1tYXRjaC1lbmQgbWF0 Y2gpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAobGlzdCBwcm9wIG5p bCkpKSkpKSkpCisKKyhkZWZ1biB2aXN1YWwtd3JhcC0tcmVtb3ZlLXByb3BlcnRpZXMgKHN0 YXJ0IGVuZCkKKyAgIlJlbW92ZSB2aXN1YWwgd3JhcHBpbmcgdGV4dCBwcm9wZXJ0aWVzIGZy b20gU1RBUlQgdG8gRU5ELiIKKyAgOzsgUmVtb3ZlIGBtaW4td2lkdGgnIGZyb20gYW55IHBy ZWZpeGVzIHdlIGRldGVjdGVkLgorICAocmVtb3ZlLWRpc3BsYXktdGV4dC1wcm9wZXJ0eSBz dGFydCBlbmQgJ21pbi13aWR0aCkKKyAgOzsgUmVtb3ZlIGB3cmFwLXByZWZpeCcgcmVsYXRl ZCBwcm9wZXJ0aWVzIGZyb20gYW55IGxpbmVzIHdpdGgKKyAgOzsgcHJlZml4ZXMgd2UgZGV0 ZWN0ZWQuCisgIChyZW1vdmUtdGV4dC1wcm9wZXJ0aWVzIHN0YXJ0IGVuZCAnKHdyYXAtcHJl Zml4IG5pbCkpCisgICh2aXN1YWwtd3JhcC0tZGVscS10ZXh0LXByb3BlcnR5IHN0YXJ0IGVu ZCAncmVhci1ub25zdGlja3kgJ3dyYXAtcHJlZml4KSkKKwogKGRlZnVuIHZpc3VhbC13cmFw LXByZWZpeC1mdW5jdGlvbiAoYmVnIGVuZCkKICAgIkluZGVudCB0aGUgcmVnaW9uIGJldHdl ZW4gQkVHIGFuZCBFTkQgd2l0aCB2aXN1YWwgZmlsbGluZy4iCiAgIDs7IEFueSBjaGFuZ2Ug YXQgdGhlIGJlZ2lubmluZyBvZiBhIGxpbmUgbWlnaHQgY2hhbmdlIGl0cyB3cmFwCkBAIC0y NDMsNiArMjcyLDcgQEAgdmlzdWFsLXdyYXAtcHJlZml4LWZ1bmN0aW9uCiAgIChnb3RvLWNo YXIgYmVnKQogICAoZm9yd2FyZC1saW5lIDApCiAgIChzZXRxIGJlZyAocG9pbnQpKQorICAo dmlzdWFsLXdyYXAtLXJlbW92ZS1wcm9wZXJ0aWVzIGJlZyBlbmQpCiAgICh3aGlsZSAoPCAo cG9pbnQpIGVuZCkKICAgICA7OyBDaGVjayBpZiB0aGUgZGlzcGxheSBwcm9wZXJ0eSBhdCB0 aGUgZW5kIG9mIHRoaXMgbGluZSBpcyAic2FmZSIuCiAgICAgKGlmICh2aXN1YWwtd3JhcC0t ZGlzcGxheS1wcm9wZXJ0eS1zYWZlLXAKQEAgLTI4OCw3ICszMTgsNyBAQCB2aXN1YWwtd3Jh cC1wcmVmaXgtbW9kZQogICAgICh3aXRoLXNpbGVudC1tb2RpZmljYXRpb25zCiAgICAgICAo c2F2ZS1yZXN0cmljdGlvbgogICAgICAgICAod2lkZW4pCi0gICAgICAgIChyZW1vdmUtdGV4 dC1wcm9wZXJ0aWVzIChwb2ludC1taW4pIChwb2ludC1tYXgpICcod3JhcC1wcmVmaXggbmls KSkpKSkpCisgICAgICAgICh2aXN1YWwtd3JhcC0tcmVtb3ZlLXByb3BlcnRpZXMgKHBvaW50 LW1pbikgKHBvaW50LW1heCkpKSkpKQogCiA7OzsjIyNhdXRvbG9hZAogKGRlZmluZS1nbG9i YWxpemVkLW1pbm9yLW1vZGUgZ2xvYmFsLXZpc3VhbC13cmFwLXByZWZpeC1tb2RlCmRpZmYg LS1naXQgYS90ZXN0L2xpc3AvdmlzdWFsLXdyYXAtdGVzdHMuZWwgYi90ZXN0L2xpc3Avdmlz dWFsLXdyYXAtdGVzdHMuZWwKaW5kZXggZDNmYWExMjg2MzcuLmI5M2UzZTY3ZDg0IDEwMDY0 NAotLS0gYS90ZXN0L2xpc3AvdmlzdWFsLXdyYXAtdGVzdHMuZWwKKysrIGIvdGVzdC9saXNw L3Zpc3VhbC13cmFwLXRlc3RzLmVsCkBAIC0xNDksNCArMTQ5LDE5IEBAIHZpc3VhbC13cmFw LXRlc3RzL3dyYXAtcHJlZml4LXN0aWNraW5lc3MKICAgICAgICAgICAgICAgIDIgMjUgKCB3 cmFwLXByZWZpeCAoc3BhY2UgOmFsaWduLXRvICgyIC4gd2lkdGgpKQogICAgICAgICAgICAg ICAgICAgICAgIHJlYXItbm9uc3RpY2t5ICh3cmFwLXByZWZpeCkpKSkpKSkKIAorKGVydC1k ZWZ0ZXN0IHZpc3VhbC13cmFwLXRlc3RzL2NsZWFudXAgKCkKKyAgIlRlc3QgdGhhdCBkZWFj dGl2YXRpbmcgYHZpc3VhbC13cmFwLXByZWZpeC1tb2RlJyBjbGVhbnMgdXAgdGV4dCBwcm9w ZXJ0aWVzLiIKKyAgKHdpdGgtdGVtcC1idWZmZXIKKyAgICAoaW5zZXJ0ICIqIGhlbGxvXG4q IGhpIikKKyAgICAodmlzdWFsLXdyYXAtcHJlZml4LWZ1bmN0aW9uIChwb2ludC1taW4pIChw b2ludC1tYXgpKQorICAgIDs7IE1ha2Ugc3VyZSB3ZSd2ZSBhZGRlZCB0aGUgdmlzdWFsLXdy YXBwaW5nIHByb3BlcnRpZXMuCisgICAgKHNob3VsZCAoZXF1YWwgKHRleHQtcHJvcGVydGll cy1hdCAocG9pbnQtbWluKSkKKyAgICAgICAgICAgICAgICAgICAnKCByZWFyLW5vbnN0aWNr eSAod3JhcC1wcmVmaXgpCisgICAgICAgICAgICAgICAgICAgICAgd3JhcC1wcmVmaXggKHNw YWNlIDphbGlnbi10byAoMiAuIHdpZHRoKSkKKyAgICAgICAgICAgICAgICAgICAgICBkaXNw bGF5IChtaW4td2lkdGggKCgyIC4gd2lkdGgpKSkpKSkKKyAgICAodmlzdWFsLXdyYXAtcHJl Zml4LW1vZGUgLTEpCisgICAgKHNob3VsZCAoZXF1YWwtaW5jbHVkaW5nLXByb3BlcnRpZXMK KyAgICAgICAgICAgICAoYnVmZmVyLXN0cmluZykKKyAgICAgICAgICAgICAiKiBoZWxsb1xu KiBoaSIpKSkpCisKIDs7IHZpc3VhbC13cmFwLXRlc3RzLmVsIGVuZHMgaGVyZQotLSAKMi4y NS4xCgo= --------------7Hn7sDNiBWAdxfV0q0MjSWC7--
bug-gnu-emacs@HIDDEN:bug#76018; Package emacs.
Full text available.
Received: (at 76018) by debbugs.gnu.org; 27 May 2025 20:24:00 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue May 27 16:24:00 2025
Received: from localhost ([127.0.0.1]:44871 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1uK0q8-00013F-AI
for submit <at> debbugs.gnu.org; Tue, 27 May 2025 16:24:00 -0400
Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:22737)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <monnier@HIDDEN>)
id 1uK0q4-00012k-Qk
for 76018 <at> debbugs.gnu.org; Tue, 27 May 2025 16:23:58 -0400
Received: from pmg1.iro.umontreal.ca (localhost.localdomain [127.0.0.1])
by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id 6261F1004AF;
Tue, 27 May 2025 16:23:50 -0400 (EDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca;
s=mail; t=1748377429;
bh=7TsEre9lpFI4z/2sa/E88/4SGSRMFiIwrlCQr+OSxqE=;
h=From:To:Cc:Subject:In-Reply-To:References:Date:From;
b=jPzXQaVxBICexW+SrDcG0pCi7ev03gLGdce5MoRDbaLzLl8xg/LyJJpBjlPRcPDuG
zYh53LfEEtx6KPGZLoVSIQe1JktGrP0MDHDX2GIKCDeixJBPsDCOXiFj9tsN0t3b2v
13KuV3EqSHdhIUL2astcxkICxspbjDyLmUznXS2npEVMHXuMZeNyFFb5sWrfOoBIR5
xyxNX5+jwZe/cjGozSri6lFZFzHGSCf4j7B8Rj9ODTHOVVoMFHl+tYIoZtUh4IZbR8
JvyS6QBnOeHHbzAm4ZwtnL4I3OzSgTtuQJfZO73p9j0VxbP2GDaLSPGbHudpuHEl+R
tVTiAbGuF/Ocg==
Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1])
by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id 64E181000BC;
Tue, 27 May 2025 16:23:49 -0400 (EDT)
Received: from lechazo (lechon.iro.umontreal.ca [132.204.27.242])
by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 4F59412034B;
Tue, 27 May 2025 16:23:49 -0400 (EDT)
From: Stefan Monnier <monnier@HIDDEN>
To: Jim Porter <jporterbugs@HIDDEN>
Subject: Re: bug#76018: 31.0.50; wrap-prefix properties from
visual-wrap-prefix-mode proliferate
In-Reply-To: <76bc329d-e588-4357-13ec-2d6e5510a97c@HIDDEN>
Message-ID: <jwvbjrdolu0.fsf-monnier+emacs@HIDDEN>
References: <87a5b42q33.fsf@HIDDEN>
<9b10777c-6b8c-2b2e-c906-b2d797dece00@HIDDEN>
<19a7b709-5b05-dd29-92e5-ac6163ef1873@HIDDEN>
<86h616xp94.fsf@HIDDEN> <jwvzfeynqhd.fsf-monnier+emacs@HIDDEN>
<76bc329d-e588-4357-13ec-2d6e5510a97c@HIDDEN>
Date: Tue, 27 May 2025 16:23:48 -0400
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-SPAM-INFO: Spam detection results: 0
ALL_TRUSTED -1 Passed through trusted hosts only via SMTP
AWL 0.085 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DKIM_SIGNED 0.1 Message has a DKIM or DK signature,
not necessarily valid
DKIM_VALID -0.1 Message has at least one valid DKIM or DK signature
DKIM_VALID_AU -0.1 Message has a valid DKIM or DK signature from author's
domain
DKIM_VALID_EF -0.1 Message has a valid DKIM or DK signature from envelope-from
domain
X-SPAM-LEVEL:
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 76018
Cc: Po Lu <luangruo@HIDDEN>, 76018 <at> debbugs.gnu.org,
Eli Zaretskii <eliz@HIDDEN>, kevin.legouguec@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
>> AKA `font-lock-append-text-property`.
>> We also have `add-face-text-property` for text-properties containing faces.
> Yeah, this is a generalization of those, though it doesn't convert scalars
> to lists. In this case, I needed something like those, but for the
> stickiness text properties.
FWIW, I'd welcome a more coherent set of primitives.
> In that commit, the 'remove-text-properties' call actually got moved from
> 'visual-wrap-prefix-function' to 'visual-wrap--content-prefix', where it
> does the same thing as before, or at least attempts to. See here:
Ah, I see.
>> ;; If we want to repeat the first-line prefix on subsequent lines,
>> ;; return its string value. However, we remove any `wrap-prefix'
>> ;; property that might have been added earlier. Otherwise, we end
>> ;; up with a string containing a `wrap-prefix' string containing a
>> ;; `wrap-prefix' string...
>> (remove-text-properties 0 (length prefix) '(wrap-prefix) prefix)
>
> I haven't checked to be sure that the original code handles this
> differently, but since it originally only removed the 'wrap-prefix' from the
> *prefix* (see the '(length pfx)' bit in the first code snippet), I don't
> think it should do anything different from the current implementation...
Oh, indeed that `remove-text-properties` was applied to the string, not
to the buffer. Duh!
> For the removal function, are you imagining that we just delete all the
> relevant properties from a specified region of text?
Traditionally jit-lock functions start by removing the property they
manage over the whole region that they're about to process.
E.g. in `adaptive-wrap.el` I think the patch below is missing.
For `visual-wrap.el` we additionally need to remove the `display`
properties we set up, which can be a fair bit more difficult (unless we
decide to just remove all `display` properties).
> I'm a little worried that we'd clobber other modes' properties if we're not
> careful, but maybe it's better to err on the side of deletion so we don't
> have stray properties. If only we could convert all the properties to use
> overlays (I tried)...
So far, we generally don't try to interact properly with other packages
using the same property. It's usually good enough.
In the present case, our minor mode tends to place a `wrap-prefix`
property over pretty much the hole buffer anyway, so there's not much
room for another package to use that property without conflict.
Stefan
diff --git a/adaptive-wrap.el b/adaptive-wrap.el
index e5b906f892..140e50293e 100644
--- a/adaptive-wrap.el
+++ b/adaptive-wrap.el
@@ -1,6 +1,6 @@
;;; adaptive-wrap.el --- Smart line-wrapping with wrap-prefix -*- lexical-binding: t; -*-
-;; Copyright (C) 2011-2021 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2025 Free Software Foundation, Inc.
;; Author: Stephen Berman <stephen.berman@HIDDEN>
;; Stefan Monnier <monnier@HIDDEN>
@@ -136,6 +136,7 @@ How much to adjust it is decided by `adaptive-wrap-extra-indent'."
(goto-char beg)
(forward-line 0)
(setq beg (point))
+ (remove-text-properties beg end '(wrap-prefix))
(while (< (point) end)
(let ((lbp (point)))
(put-text-property
bug-gnu-emacs@HIDDEN:bug#76018; Package emacs.
Full text available.Received: (at 76018) by debbugs.gnu.org; 27 May 2025 17:03:33 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue May 27 13:03:33 2025 Received: from localhost ([127.0.0.1]:43291 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1uJxi9-0001NF-1J for submit <at> debbugs.gnu.org; Tue, 27 May 2025 13:03:33 -0400 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]:47135) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <jporterbugs@HIDDEN>) id 1uJxi6-0001Mn-Hr for 76018 <at> debbugs.gnu.org; Tue, 27 May 2025 13:03:31 -0400 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-2347d505445so13310045ad.2 for <76018 <at> debbugs.gnu.org>; Tue, 27 May 2025 10:03:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748365404; x=1748970204; 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=k+HSAnMPTP2zHF48v0c8h12FbaLmf+/D8DVTnjmQIL0=; b=Y73eqw9+BgICRLoeljAvojKECOeEYFtSY1TIQl2cBY4pco9Nm9E87cnr/4LQz8CTlN GWrbVuXZ8/7ZRWWtu37sCWEClMsFF4UxbldVVA79yyK73uLOr7Sn7q3rvqZagFdiAgSt Y3E/867PotKMxF/B0QGWIzgapkEPxkEGU9F/h7XBITVzO+njhh0JrCgZSczRie6N1Vdo VFMCHIHSWEBXYcdPA0duksfZM/yL+1msc/Am2MQA/6RJnc68d2pbhg+pRopaTChleoRb jT0f8DZ4nEw+35dHohwcHOeD+NfMpbh/SDiUst0tU0+ULyUB5PRcxM7XlSf40Doga9mx zxNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748365404; x=1748970204; 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=k+HSAnMPTP2zHF48v0c8h12FbaLmf+/D8DVTnjmQIL0=; b=YdsvGf/ezdGZY8HvFFqHnMvFRUGwziUIFk8TcQO5+4uuH62Oc+zPIn2oAay/ND5L6Q Bhq9zzchPLzRV6GaeO9jxMU5QTv6KKl7KXIKXTIr2COyA63oibVfDEF41yTpeEfezvav zciNBkvCHTNHBQ25KWdI1VWZO26ggUQGTNNTmL8p6U/2xkt0RPE3ZEt26k/wsbFcTm7T 7nGlIKdeWyEXbJuFI3jSMbXMWzJTs472acznloMtI02H155d5rYRM4OGwPXFAQEoXpLE 5YXYnUGn1NXWhTN2ofM7pH7yqTykB2p6fZjEU31TqSpeBw1G2XyEQ6IZsO1PiGmDgBwq 6zEA== X-Gm-Message-State: AOJu0YzFXEswQCaMG2nnIsH1UyZxIgBkXBHx3furJWPS0uU0dDdmZT2V sL1LsUVFITMEeeJGtIuq2bDuSTKU3Hp/NiQAT8CMxJlMom3kisp2kjTK X-Gm-Gg: ASbGncspB2afVGDzF3aHQ9CwOnUdssOiJVaccPEDjLU5Av+ixGNuzyXWWI1zfMCgsNS OCB30sECPkQgCZL8YUf/mJg/NRizPSrFNOxTSsBLMO4xkHdzcz4abyb5uxJhDydabtYGiPXPfhB XLBmX933ClK7H40Xi9fPhMZXyND5xjeXQu8LdsyKMjPhmaVVCOBZdZoMq7d4bEbWFHhXN9vDNps +Q8GOwfkT8pZlqSVMpy4n4X1FYoLpJRIJt4QB6Wqher6GBzMSAGBORuQ5wbRXT4a7vcnHiOzZbB EcweLJXd0L4HHHv5LAa8WqUlbRXYPBhjxYAWIjmU76lURDKRjMKFmy5b7/YBzBNj21cs/zsqnIQ by8d+zaBSK2LolibroGvtnK5IkMZB4Bc= X-Google-Smtp-Source: AGHT+IFxUyRskcVjGjmBD77LTqGmGd0meMSMqhpEWiM9Q4oQA4ikA2Ok/aEzibSUxgHR6uN1T2DSpg== X-Received: by 2002:a17:902:f68f:b0:223:4d7e:e52c with SMTP id d9443c01a7336-23414f55b40mr216502055ad.5.1748365403671; Tue, 27 May 2025 10:03:23 -0700 (PDT) Received: from [192.168.1.2] (syn-076-168-144-128.res.spectrum.com. [76.168.144.128]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-2344990db96sm43646215ad.60.2025.05.27.10.03.22 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 27 May 2025 10:03:23 -0700 (PDT) Message-ID: <76bc329d-e588-4357-13ec-2d6e5510a97c@HIDDEN> Date: Tue, 27 May 2025 10:03:22 -0700 MIME-Version: 1.0 Subject: Re: bug#76018: 31.0.50; wrap-prefix properties from visual-wrap-prefix-mode proliferate Content-Language: en-US To: Stefan Monnier <monnier@HIDDEN>, Eli Zaretskii <eliz@HIDDEN> References: <87a5b42q33.fsf@HIDDEN> <9b10777c-6b8c-2b2e-c906-b2d797dece00@HIDDEN> <19a7b709-5b05-dd29-92e5-ac6163ef1873@HIDDEN> <86h616xp94.fsf@HIDDEN> <jwvzfeynqhd.fsf-monnier+emacs@HIDDEN> From: Jim Porter <jporterbugs@HIDDEN> In-Reply-To: <jwvzfeynqhd.fsf-monnier+emacs@HIDDEN> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 76018 Cc: Po Lu <luangruo@HIDDEN>, 76018 <at> debbugs.gnu.org, kevin.legouguec@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) On 5/27/2025 6:51 AM, Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors wrote: > AKA `font-lock-append-text-property`. > We also have `add-face-text-property` for text-properties containing faces. Yeah, this is a generalization of those, though it doesn't convert scalars to lists. In this case, I needed something like those, but for the stickiness text properties. > Why is this needed? Normally, when you type at the end of the line, the > new text gets jit-locked, so it should get its `wrap-prefix` removed > before we consider whether to (re)add a `wrap-prefix`. > > Oh, I think I see: the problem seems to be that Jim's commit > f70a6ea0ea86ef461e40d20664a75a92d02679ea removed the > > ;; Remove any `wrap-prefix' property that might have been > ;; added earlier. Otherwise, we end up with a string > ;; containing a `wrap-prefix' string containing a > ;; `wrap-prefix' string ... > (remove-text-properties > 0 (length pfx) '(wrap-prefix) pfx) > > which didn't fix just the part in the comment but also the "bleeding > property" problem. In that commit, the 'remove-text-properties' call actually got moved from 'visual-wrap-prefix-function' to 'visual-wrap--content-prefix', where it does the same thing as before, or at least attempts to. See here: > ;; If we want to repeat the first-line prefix on subsequent lines, > ;; return its string value. However, we remove any `wrap-prefix' > ;; property that might have been added earlier. Otherwise, we end > ;; up with a string containing a `wrap-prefix' string containing a > ;; `wrap-prefix' string... > (remove-text-properties 0 (length prefix) '(wrap-prefix) prefix) I haven't checked to be sure that the original code handles this differently, but since it originally only removed the 'wrap-prefix' from the *prefix* (see the '(length pfx)' bit in the first code snippet), I don't think it should do anything different from the current implementation... > BTW, why does `visual-wrap--apply-to-line` take a POSITION argument > which is always (point)? AFAICT we can drop this argument along with > the corresponding `save-excursion+goto-point`. Good point (no pun intended). >> +(defun visual-wrap--apply-to-line (position &optional remove) > > That is probably not a good idea: we should always start by removing the > old property. > >> @@ -290,7 +321,7 @@ visual-wrap-prefix-mode >> (with-silent-modifications >> (save-restriction >> (widen) >> - (remove-text-properties (point-min) (point-max) '(wrap-prefix nil)))))) >> + (visual-wrap-prefix-function (point-min) (point-max) t))))) > > Better move the removal code to its own function which both this code > and `visual-wrap-prefix-function` can call (both times, unconditionally). For the removal function, are you imagining that we just delete all the relevant properties from a specified region of text? Currently, I've attempted to just run the "apply-to-line' code in reverse, but maybe that would result in problems depending on when/if JIT lock runs. I'm a little worried that we'd clobber other modes' properties if we're not careful, but maybe it's better to err on the side of deletion so we don't have stray properties. If only we could convert all the properties to use overlays (I tried)...
bug-gnu-emacs@HIDDEN:bug#76018; Package emacs.
Full text available.
Received: (at 76018) by debbugs.gnu.org; 27 May 2025 13:51:52 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue May 27 09:51:51 2025
Received: from localhost ([127.0.0.1]:40401 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1uJuid-0000js-8l
for submit <at> debbugs.gnu.org; Tue, 27 May 2025 09:51:51 -0400
Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:3607)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <monnier@HIDDEN>)
id 1uJuiY-0000jO-35
for 76018 <at> debbugs.gnu.org; Tue, 27 May 2025 09:51:48 -0400
Received: from pmg3.iro.umontreal.ca (localhost [127.0.0.1])
by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id 6868A440FE6;
Tue, 27 May 2025 09:51:39 -0400 (EDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca;
s=mail; t=1748353898;
bh=zM0Ucm4AleGI4FG8uL2mIfMgvgrKMUfCKtc8CNXCSlo=;
h=From:To:Cc:Subject:In-Reply-To:References:Date:From;
b=bAol6jnDnGkEcSad65boNRgZPjV7vUgzvcF7Hcr4K0Pju1u48pxFMK7OLgv1FzVmM
rVRWNltPw+eAPIYIV4HV9Wp1CycCnA4gkWP7SirUETnuoVHlhglrJBmkLz+hQ3naXn
QwlKB8iDlXh4m1X0X+Da+ARK3dQfhyTylKko8O0fjbh54XH9J1EmR7UV1c+Y2u+S/W
o6BWcFRy0xPFmJQ+eFiCOuKEQIQV9huntzn37I4FRAyo0a0A56RfQD7t+Jmem3zPPq
qF+kQ4EBL6D2PABdesWh4KgDL7GwSHinF+NcYBleGa9DUCEV3ygdxIJuqrKDu7XyGU
vZzvybJQgBcUw==
Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1])
by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id 14EE0440992;
Tue, 27 May 2025 09:51:38 -0400 (EDT)
Received: from pastel (unknown [104.247.225.139])
by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id CBBE51202FC;
Tue, 27 May 2025 09:51:37 -0400 (EDT)
From: Stefan Monnier <monnier@HIDDEN>
To: Eli Zaretskii <eliz@HIDDEN>
Subject: Re: bug#76018: 31.0.50; wrap-prefix properties from
visual-wrap-prefix-mode proliferate
In-Reply-To: <86h616xp94.fsf@HIDDEN>
Message-ID: <jwvzfeynqhd.fsf-monnier+emacs@HIDDEN>
References: <87a5b42q33.fsf@HIDDEN>
<9b10777c-6b8c-2b2e-c906-b2d797dece00@HIDDEN>
<19a7b709-5b05-dd29-92e5-ac6163ef1873@HIDDEN>
<86h616xp94.fsf@HIDDEN>
Date: Tue, 27 May 2025 09:51:36 -0400
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-SPAM-INFO: Spam detection results: 0
ALL_TRUSTED -1 Passed through trusted hosts only via SMTP
AWL -0.350 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DKIM_SIGNED 0.1 Message has a DKIM or DK signature,
not necessarily valid
DKIM_VALID -0.1 Message has at least one valid DKIM or DK signature
DKIM_VALID_AU -0.1 Message has a valid DKIM or DK signature from author's
domain
DKIM_VALID_EF -0.1 Message has a valid DKIM or DK signature from envelope-from
domain
X-SPAM-LEVEL:
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 76018
Cc: 76018 <at> debbugs.gnu.org, Jim Porter <jporterbugs@HIDDEN>,
Po Lu <luangruo@HIDDEN>, kevin.legouguec@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
> OK, let's see if Stefan (CC'ed) has comments.
First, I'll note that `visual-wrap.el` is forked from GNU ELPA's
`adaptive-wrap.el`. Why was it renamed?
Why has there been no effort to keep the two in sync or to mark the other
one as dead?
> This makes visual-wrap-mode incompatible with any other feature that
> uses wrap-prefix, because all of those properties will be removed when
> you turn off the mode, right? If so, this subtlety should be at least
> documented.
AFAIK this has always been the case.
> +** New function 'append-text-property'.
AKA `font-lock-append-text-property`.
We also have `add-face-text-property` for text-properties containing faces.
> @@ -165,7 +167,12 @@ visual-wrap--apply-to-line
> position (pos-eol) 'wrap-prefix
> (if (numberp next-line-prefix)
> `(space :align-to (,next-line-prefix . width))
> - next-line-prefix)))))
> + next-line-prefix))
> + ;; Make sure that when typing at the end of a line with
> + ;; `wrap-prefix' set, we don't continue that property over
> + ;; subsequent lines. See bug#76018.
> + (append-text-property position (pos-eol)
> + 'rear-nonsticky '(wrap-prefix)))))
Why is this needed? Normally, when you type at the end of the line, the
new text gets jit-locked, so it should get its `wrap-prefix` removed
before we consider whether to (re)add a `wrap-prefix`.
Oh, I think I see: the problem seems to be that Jim's commit
f70a6ea0ea86ef461e40d20664a75a92d02679ea removed the
;; Remove any `wrap-prefix' property that might have been
;; added earlier. Otherwise, we end up with a string
;; containing a `wrap-prefix' string containing a
;; `wrap-prefix' string ...
(remove-text-properties
0 (length pfx) '(wrap-prefix) pfx)
which didn't fix just the part in the comment but also the "bleeding
property" problem.
That commit's message doesn't describe its change in much detail (it
spends more time talking about the cosmetic refactoring than about the
actual code changes), so it's hard to know for sure if it was an
accident or if there was a reason for that removal.
BTW, why does `visual-wrap--apply-to-line` take a POSITION argument
which is always (point)? AFAICT we can drop this argument along with
the corresponding `save-excursion+goto-point`.
> +(defun visual-wrap--apply-to-line (position &optional remove)
That is probably not a good idea: we should always start by removing the
old property.
> @@ -290,7 +321,7 @@ visual-wrap-prefix-mode
> (with-silent-modifications
> (save-restriction
> (widen)
> - (remove-text-properties (point-min) (point-max) '(wrap-prefix nil))))))
> + (visual-wrap-prefix-function (point-min) (point-max) t)))))
Better move the removal code to its own function which both this code
and `visual-wrap-prefix-function` can call (both times, unconditionally).
Stefan
bug-gnu-emacs@HIDDEN:bug#76018; Package emacs.
Full text available.
Received: (at 76018) by debbugs.gnu.org; 27 May 2025 11:33:15 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue May 27 07:33:15 2025
Received: from localhost ([127.0.0.1]:39404 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1uJsYU-0007Wv-Qn
for submit <at> debbugs.gnu.org; Tue, 27 May 2025 07:33:15 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:51704)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <eliz@HIDDEN>) id 1uJsYQ-0007WO-EG
for 76018 <at> debbugs.gnu.org; Tue, 27 May 2025 07:33:11 -0400
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <eliz@HIDDEN>)
id 1uJsYI-0001WJ-Vw; Tue, 27 May 2025 07:33:02 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date:
mime-version; bh=YSR2FTK2E/kzNTHUqKYGRRN3PZVID0c7yo+jIXmNNuI=; b=b4EFhh5CLUf5
oRuM8ZilyLZPLCOvClYG+haXzVog7tPnUpu+sQ4tj/3u+V8zHWqVUBKFQ8gbv2mdMDUl5ImqGDyXy
v63YY8kx9xeqmau5Wwa6931zJe62b6//ev8rEC1+VaI98XGk9qiGy6Paequ7a4JnPjKAu63J/Ft5u
fpzKr9fM8HkueD9tS4JIZ7VDX5r7DneIn2OOQ9m/N9L16XMDFGqEG3IbuJ3xICOlj2g/UxwJ/ngUX
cat/IkfUag2aQ3gdL24WXmNyg4jrlc92m/r01NJs5DPS1yu8bruWlFuLX3lG1p7PM6L7EERzaWBAA
bUNbhQLdiTXhnIUBZTJJ6A==;
Date: Tue, 27 May 2025 14:32:55 +0300
Message-Id: <86h616xp94.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
To: Jim Porter <jporterbugs@HIDDEN>,
Stefan Monnier <monnier@HIDDEN>
In-Reply-To: <19a7b709-5b05-dd29-92e5-ac6163ef1873@HIDDEN> (message from
Jim Porter on Mon, 26 May 2025 18:30:34 -0700)
Subject: Re: bug#76018: 31.0.50; wrap-prefix properties from
visual-wrap-prefix-mode proliferate
References: <87a5b42q33.fsf@HIDDEN>
<9b10777c-6b8c-2b2e-c906-b2d797dece00@HIDDEN>
<19a7b709-5b05-dd29-92e5-ac6163ef1873@HIDDEN>
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 76018
Cc: 76018 <at> debbugs.gnu.org, kevin.legouguec@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
> Date: Mon, 26 May 2025 18:30:34 -0700
> From: Jim Porter <jporterbugs@HIDDEN>
>
> On 5/26/2025 5:11 PM, Jim Porter wrote:
> > Eli, what do you think? I've also moved an internal Eshell utility
> > function ('eshell--append-text-property') to subr-x.el, since it would
> > be useful for the visual-wrap code. I've updated the manual and NEWS to
> > mention this function as well so that others can use it if they like.
>
> After some further thought, I noticed that 'visual-wrap-prefix-mode'
> doesn't clean up after itself properly. Attached is a fix, taking
> advantage of a new function called 'remove-display-text-properties',
> which does what you might expect.
OK, let's see if Stefan (CC'ed) has comments.
> --- a/lisp/visual-wrap.el
> +++ b/lisp/visual-wrap.el
> @@ -33,6 +33,8 @@
>
> ;;; Code:
>
> +(require 'text-property-search)
Why did you need this 'require'?
> +@lisp
> +(add-display-text-property 1 8 'raise 0.5)
> +(add-display-text-property 4 8 'height 2.0)
> +(remove-display-text-property 2 6 'raise)
> +@end lisp
The lines inside @lisp..@end lisp should be in @group..@end group, to
prevent them from being split between pages in the printed version of
the manual.
> + (if (not remove)
> + ;; Apply `wrap-prefix' properties.
> + (progn
> + (put-text-property
> + position (pos-eol) 'wrap-prefix
> + (if (numberp next-line-prefix)
> + `(space :align-to (,next-line-prefix . width))
> + next-line-prefix))
> + ;; Make sure that when typing at the end of a line with
> + ;; `wrap-prefix' set, we don't continue that property over
> + ;; subsequent lines. See bug#76018.
> + (append-text-property position (pos-eol)
> + 'rear-nonsticky '(wrap-prefix)))
> + ;; Remove `wrap-prefix' properties.
> + (remove-text-properties position (pos-eol) '(wrap-prefix nil))
> + (visual-wrap--remq-text-property position (pos-eol)
> + 'rear-nonsticky 'wrap-prefix)))))
This makes visual-wrap-mode incompatible with any other feature that
uses wrap-prefix, because all of those properties will be removed when
you turn off the mode, right? If so, this subtlety should be at least
documented.
Thanks.
bug-gnu-emacs@HIDDEN:bug#76018; Package emacs.
Full text available.
Received: (at 76018) by debbugs.gnu.org; 27 May 2025 06:55:27 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue May 27 02:55:27 2025
Received: from localhost ([127.0.0.1]:37145 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1uJoDd-0007zb-LC
for submit <at> debbugs.gnu.org; Tue, 27 May 2025 02:55:27 -0400
Received: from relay4-d.mail.gandi.net ([2001:4b98:dc4:8::224]:43547)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <juri@HIDDEN>) id 1uJoDU-0007w5-9x
for 76018 <at> debbugs.gnu.org; Tue, 27 May 2025 02:55:16 -0400
Received: by mail.gandi.net (Postfix) with ESMTPSA id ABF67443B9;
Tue, 27 May 2025 06:55:08 +0000 (UTC)
From: Juri Linkov <juri@HIDDEN>
To: Jim Porter <jporterbugs@HIDDEN>
Subject: Re: bug#76018: 31.0.50; wrap-prefix properties from
visual-wrap-prefix-mode proliferate
In-Reply-To: <19a7b709-5b05-dd29-92e5-ac6163ef1873@HIDDEN>
Organization: LINKOV.NET
References: <87a5b42q33.fsf@HIDDEN>
<9b10777c-6b8c-2b2e-c906-b2d797dece00@HIDDEN>
<19a7b709-5b05-dd29-92e5-ac6163ef1873@HIDDEN>
Date: Tue, 27 May 2025 09:49:34 +0300
Message-ID: <87o6ve8s5d.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/31.0.50 (x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain
X-GND-State: clean
X-GND-Score: -100
X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtddtgdduleejudculddtuddrgeefvddrtddtmdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfitefpfffkpdcuggftfghnshhusghstghrihgsvgenuceurghilhhouhhtmecufedtudenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvvefujghofhffkfgfgggtsehttdertddtredtnecuhfhrohhmpefluhhrihcunfhinhhkohhvuceojhhurhhisehlihhnkhhovhdrnhgvtheqnecuggftrfgrthhtvghrnhepffegteefveelhfeljeefueehieduiedtfffhuddtkeeffffghfevheetgeeukeehnecukfhppeeluddruddvledruddtfedrvdejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepledurdduvdelrddutdefrddvjedphhgvlhhopehmrghilhdrghgrnhguihdrnhgvthdpmhgrihhlfhhrohhmpehjuhhriheslhhinhhkohhvrdhnvghtpdhnsggprhgtphhtthhopeegpdhrtghpthhtohepvghlihiisehgnhhurdhorhhgpdhrtghpthhtohepjeeitddukeesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehkvghvihhnrdhlvghgohhughhuvggtsehgmhgrihhlrdgtohhmpdhrtghpthhtohepjhhpohhrthgvrhgsuhhgshesghhmrghilhdrtghomh
X-GND-Sasl: juri@HIDDEN
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 76018
Cc: 76018 <at> debbugs.gnu.org, eliz@HIDDEN,
=?iso-8859-1?Q?K=E9vin?= Le Gouguec <kevin.legouguec@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
> +@defun append-text-property start end prop values &optional object
> +This function appends a list of @var{values} to the @var{prop} property
> +for the text between @var{start} and @var{end} in the string or buffer
> +@var{object}. If @var{object} is @code{nil}, it defaults to the current
> +buffer.
> +@end defun
Shouldn't this explain a difference from 'add-text-properties'?
bug-gnu-emacs@HIDDEN:bug#76018; Package emacs.
Full text available.
Received: (at 76018) by debbugs.gnu.org; 27 May 2025 01:30:47 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon May 26 21:30:47 2025
Received: from localhost ([127.0.0.1]:34499 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1uJj9R-0006He-Q5
for submit <at> debbugs.gnu.org; Mon, 26 May 2025 21:30:47 -0400
Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]:47231)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.84_2) (envelope-from <jporterbugs@HIDDEN>)
id 1uJj9N-0006HG-ND
for 76018 <at> debbugs.gnu.org; Mon, 26 May 2025 21:30:43 -0400
Received: by mail-pf1-x432.google.com with SMTP id
d2e1a72fcca58-742c035f2afso1619781b3a.2
for <76018 <at> debbugs.gnu.org>; Mon, 26 May 2025 18:30:41 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1748309435; x=1748914235; darn=debbugs.gnu.org;
h=in-reply-to:references:to:from:content-language:subject
:mime-version:date:message-id:from:to:cc:subject:date:message-id
:reply-to; bh=+N5AgwmZyAepyu5lQENWk6vuRwQTYPiDAg8x1tjjYZo=;
b=YTL2QnKO6Yz/V/6D+JLg0UTaKfkxGhyYQtmYrXwCk33Cw3qd6xhUVaECPX2U7jssKe
9xITlEyr5IPbv0VJ9OWvduHMCZnu48eBEIXnljIhhKuZuYpx7Lgh/S1Vn8tCISRfPACJ
kOr+5ayOWyRhcQDQyYhUO/MQsBHW2MBkOydUaEWMSH3A8gI/r2o4cjeqwBzzEbvMfBz0
wPW0d1+JVrjSPdAtXzgh/coh+jRFCSVK9NqEJxpvyPiWNObata1n5qFXYbL5i7OjFze8
FMFsVh8WC8PV3BVPNB2QW7Fk7KZoU+XU3PhbXQ2ekT5/wBlm7aIOna0U45O7og0zjZ1F
nHEQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1748309435; x=1748914235;
h=in-reply-to:references:to:from:content-language:subject
:mime-version:date:message-id:x-gm-message-state:from:to:cc:subject
:date:message-id:reply-to;
bh=+N5AgwmZyAepyu5lQENWk6vuRwQTYPiDAg8x1tjjYZo=;
b=V0N73KMRtjGelWyc18A+nONB2Cvq+hCy1Ns6czYsM+na8KSgcp/srtFhNnUjDiJhed
PA7QlV6LSlgfthGOq14ysfZKajmB28g5IZX3ohrp8Ve4DVDUshsLeq+z0bY4ly78sYD3
nzK5zxZKJE28fhVwVw5eFFxX514l0+YkP4KLLPs8ZoEbY4ywKzTcxh0QhIBSIriOILsZ
D1BTfGx9/5LjNgdNnsSsa6BzuwMHUr5lQxFhxavdYLKpI4dYiRqDWTO6SQeiJv8wNnMV
4+QycGA89c2uSRmrL3s2c807fmRxcIl4//sPtbkE/aTFSymVq0KM4IVQmzk+BjUOVh8H
xQ1Q==
X-Forwarded-Encrypted: i=1;
AJvYcCVZnksYrMGlfZ5LhgPscpYVTridzrXMl+rTEcd7fs07omRj24pFpipWVjhp5zb5GH6n2RDmgQ==@debbugs.gnu.org
X-Gm-Message-State: AOJu0YxgTqCZQtmsQbNtIJu3WhafxdNmo1aTQcu+GvBLZoBXRR2fqjXH
aMjaUe/enme9UY9loudaTwFOD96KjwF76sOrf27yDan1VcOK86i4HEOG
X-Gm-Gg: ASbGncuCWAsRU8hBYzGan4F+oAZx5XqiBhDyRFdz3sUs+ZvFF4jkOVQfT7iEXrZ/0QN
2a8qC4bKAOp9XTXM9xAB+CYyXiGt7lcbVo5sVEIGxdXrcwHsJiIYXRLM0EtK3AJcIcMFEUmj0wz
J7eccjL6W26TFOwr83tT5kjpo+sUbdxns2NmwnrqEveyqgfvKkyY40ZOnwdG6ENSAIkiEDxcGxk
IYLZGjg0RhWChxgTieYImybDaBqNqVwQxmMdX48vPaTWxKwq13apheTLkpvJ1WFvBHrkNJA7PDm
b2XmJokZUiQH8Ipkaaw8s8WJhpDLiVuWWCPQYolNlBwdJ+CdyqV7CA0LCndhhtxCQBDw1wIvb5r
R+S4fxXcEPIF6kMtfJkP9LSlnj0C4tMmksZM0Ox6pnQ==
X-Google-Smtp-Source: AGHT+IEeITRFGvKtjDc8dm6Sfzqgp2K4G8z9gS8vENuwa/LxbHYgW5w5V+m20nCcwo7WMAx1x6RD5Q==
X-Received: by 2002:a05:6a00:3997:b0:736:a540:c9ad with SMTP id
d2e1a72fcca58-745fe058cd5mr16703773b3a.20.1748309435261;
Mon, 26 May 2025 18:30:35 -0700 (PDT)
Received: from [192.168.1.2] (syn-076-168-144-128.res.spectrum.com.
[76.168.144.128]) by smtp.googlemail.com with ESMTPSA id
d2e1a72fcca58-742a970e1a3sm17519204b3a.71.2025.05.26.18.30.34
(version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
Mon, 26 May 2025 18:30:34 -0700 (PDT)
Content-Type: multipart/mixed; boundary="------------zxm1lJbVUMBSJcKKElMPNqUo"
Message-ID: <19a7b709-5b05-dd29-92e5-ac6163ef1873@HIDDEN>
Date: Mon, 26 May 2025 18:30:34 -0700
MIME-Version: 1.0
Subject: Re: bug#76018: 31.0.50; wrap-prefix properties from
visual-wrap-prefix-mode proliferate
Content-Language: en-US
From: Jim Porter <jporterbugs@HIDDEN>
To: =?UTF-8?Q?K=c3=a9vin_Le_Gouguec?= <kevin.legouguec@HIDDEN>,
76018 <at> debbugs.gnu.org, eliz@HIDDEN
References: <87a5b42q33.fsf@HIDDEN>
<9b10777c-6b8c-2b2e-c906-b2d797dece00@HIDDEN>
In-Reply-To: <9b10777c-6b8c-2b2e-c906-b2d797dece00@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 76018
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
This is a multi-part message in MIME format.
--------------zxm1lJbVUMBSJcKKElMPNqUo
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
On 5/26/2025 5:11 PM, Jim Porter wrote:
> Eli, what do you think? I've also moved an internal Eshell utility
> function ('eshell--append-text-property') to subr-x.el, since it would
> be useful for the visual-wrap code. I've updated the manual and NEWS to
> mention this function as well so that others can use it if they like.
After some further thought, I noticed that 'visual-wrap-prefix-mode'
doesn't clean up after itself properly. Attached is a fix, taking
advantage of a new function called 'remove-display-text-properties',
which does what you might expect.
--------------zxm1lJbVUMBSJcKKElMPNqUo
Content-Type: text/plain; charset=UTF-8;
name="0001-Make-wrap-prefix-nonsticky-when-using-visual-wrap-pr.patch"
Content-Disposition: attachment;
filename*0="0001-Make-wrap-prefix-nonsticky-when-using-visual-wrap-pr.pa";
filename*1="tch"
Content-Transfer-Encoding: base64
RnJvbSAwMzMxNWZiMzdjODhjNTg5NzJhZjkwZmZmZTc5YmZiYzNmMzMzYzU2IE1vbiBTZXAg
MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j
b20+CkRhdGU6IE1vbiwgMjYgTWF5IDIwMjUgMTY6NTc6MjUgLTA3MDAKU3ViamVjdDogW1BB
VENIIDEvMl0gTWFrZSAnd3JhcC1wcmVmaXgnIG5vbnN0aWNreSB3aGVuIHVzaW5nCiAndmlz
dWFsLXdyYXAtcHJlZml4LW1vZGUnCgoqIGxpc3AvZXNoZWxsL2VtLXByb21wdC5lbCAoZXNo
ZWxsLS1hcHBlbmQtdGV4dC1wcm9wZXJ0eSk6IE1vdmUgZnJvbQpoZXJlLi4uCiogbGlzcC9l
bWFjcy1saXNwL3N1YnIteC5lbCAoYXBwZW5kLXRleHQtcHJvcGVydHkpOiAuLi4gdG8gaGVy
ZS4gIFVwZGF0ZQpjYWxsZXJzLgoKKiBsaXNwL3Zpc3VhbC13cmFwLmVsICh2aXN1YWwtd3Jh
cC0tYXBwbHktdG8tbGluZSk6IFVzZQonYXBwZW5kLXRleHQtcHJvcGVydHknLgoKKiB0ZXN0
L2xpc3AvdmlzdWFsLXdyYXAtdGVzdHMuZWwgKHZpc3VhbC13cmFwLXRlc3RzL3NpbXBsZSkK
KHZpc3VhbC13cmFwLXRlc3RzL3NhZmUtZGlzcGxheSkKKHZpc3VhbC13cmFwLXRlc3RzL3Vu
c2FmZS1kaXNwbGF5L3dpdGhpbi1saW5lKTogVXBkYXRlIHRlc3RzLgoodmlzdWFsLXdyYXAt
dGVzdHMvd3JhcC1wcmVmaXgtc3RpY2tpbmVzcyk6IE5ldyB0ZXN0LgoKKiBkb2MvbGlzcHJl
Zi90ZXh0LnRleGkgKENoYW5naW5nIFByb3BlcnRpZXMpOiBEb2N1bWVudAonYXBwZW5kLXRl
eHQtcHJvcGVydHknLgoKKiBldGMvTkVXUzogQW5ub3VuY2UgJ2FwcGVuZC10ZXh0LXByb3Bl
cnR5JyAoYnVnIzc2MDE4KS4KLS0tCiBkb2MvbGlzcHJlZi90ZXh0LnRleGkgICAgICAgICAg
fCAgNyArKysrKwogZXRjL05FV1MgICAgICAgICAgICAgICAgICAgICAgIHwgIDYgKysrKysK
IGxpc3AvZW1hY3MtbGlzcC9zdWJyLXguZWwgICAgICB8IDE0ICsrKysrKysrKysKIGxpc3Av
ZXNoZWxsL2VtLXByb21wdC5lbCAgICAgICB8IDE3ICsrLS0tLS0tLS0tLQogbGlzcC92aXN1
YWwtd3JhcC5lbCAgICAgICAgICAgIHwgIDkgKysrKysrLQogdGVzdC9saXNwL3Zpc3VhbC13
cmFwLXRlc3RzLmVsIHwgNDggKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLQog
NiBmaWxlcyBjaGFuZ2VkLCA3NyBpbnNlcnRpb25zKCspLCAyNCBkZWxldGlvbnMoLSkKCmRp
ZmYgLS1naXQgYS9kb2MvbGlzcHJlZi90ZXh0LnRleGkgYi9kb2MvbGlzcHJlZi90ZXh0LnRl
eGkKaW5kZXggNzViMmIxYzNkNjAuLjQ3MWJhMjllYmEyIDEwMDY0NAotLS0gYS9kb2MvbGlz
cHJlZi90ZXh0LnRleGkKKysrIGIvZG9jL2xpc3ByZWYvdGV4dC50ZXhpCkBAIC0zMTM3LDYg
KzMxMzcsMTMgQEAgQ2hhbmdpbmcgUHJvcGVydGllcwogQGVuZCBleGFtcGxlCiBAZW5kIGRl
ZnVuCiAKK0BkZWZ1biBhcHBlbmQtdGV4dC1wcm9wZXJ0eSBzdGFydCBlbmQgcHJvcCB2YWx1
ZXMgJm9wdGlvbmFsIG9iamVjdAorVGhpcyBmdW5jdGlvbiBhcHBlbmRzIGEgbGlzdCBvZiBA
dmFye3ZhbHVlc30gdG8gdGhlIEB2YXJ7cHJvcH0gcHJvcGVydHkKK2ZvciB0aGUgdGV4dCBi
ZXR3ZWVuIEB2YXJ7c3RhcnR9IGFuZCBAdmFye2VuZH0gaW4gdGhlIHN0cmluZyBvciBidWZm
ZXIKK0B2YXJ7b2JqZWN0fS4gIElmIEB2YXJ7b2JqZWN0fSBpcyBAY29kZXtuaWx9LCBpdCBk
ZWZhdWx0cyB0byB0aGUgY3VycmVudAorYnVmZmVyLgorQGVuZCBkZWZ1bgorCiBAZGVmdW4g
cmVtb3ZlLXRleHQtcHJvcGVydGllcyBzdGFydCBlbmQgcHJvcHMgJm9wdGlvbmFsIG9iamVj
dAogVGhpcyBmdW5jdGlvbiBkZWxldGVzIHNwZWNpZmllZCB0ZXh0IHByb3BlcnRpZXMgZnJv
bSB0aGUgdGV4dCBiZXR3ZWVuCiBAdmFye3N0YXJ0fSBhbmQgQHZhcntlbmR9IGluIHRoZSBz
dHJpbmcgb3IgYnVmZmVyIEB2YXJ7b2JqZWN0fS4gIElmCmRpZmYgLS1naXQgYS9ldGMvTkVX
UyBiL2V0Yy9ORVdTCmluZGV4IDMzYjA0MjcyMGI1Li5lMDc4OGI0MjFhMSAxMDA2NDQKLS0t
IGEvZXRjL05FV1MKKysrIGIvZXRjL05FV1MKQEAgLTIzMzksNiArMjMzOSwxMiBAQCBUaGlz
ICdkaXNwbGF5JyBwcm9wZXJ0eSB3YXMgcHJldmlvdXNseSBzdXBwb3J0ZWQgb25seSBhcyB0
ZXh0IHByb3BlcnR5LgogTm93IG92ZXJsYXlzIGNhbiBhbHNvIGhhdmUgdGhpcyBwcm9wZXJ0
eSwgd2l0aCB0aGUgc2FtZSBlZmZlY3QgZm9yIHRoZQogdGV4dCAiY292ZXJlZCIgYnkgdGhl
IG92ZXJsYXkuCiAKKysrKworKiogTmV3IGZ1bmN0aW9uICdhcHBlbmQtdGV4dC1wcm9wZXJ0
eScuCitUaGlzIGZ1bmN0aW9uIGFwcGVuZHMgYSBsaXN0IG9mIHZhbHVlcyB0byBhIHRleHQg
cHJvcGVydHkgZm9yIHRoZQorc3BlY2lmaWVkIHJlZ2lvbiBvZiB0ZXh0LCBwcmVzZXJ2aW5n
IGFueSB2YWx1ZXMgYWxyZWFkeSBzZXQgZm9yIHRoYXQKK3Byb3BlcnR5LgorCiArKysKICoq
IE5ldyBtYWNybyAnY29uZConLgogVGhlIG5ldyBtYWNybyAnY29uZConIGlzIGFuIGFsdGVy
bmF0aXZlIHRvICdjb25kJyBhbmQgJ3BjYXNlJy4KZGlmZiAtLWdpdCBhL2xpc3AvZW1hY3Mt
bGlzcC9zdWJyLXguZWwgYi9saXNwL2VtYWNzLWxpc3Avc3Vici14LmVsCmluZGV4IGVhYTgx
MTllYWQ3Li43NzczODI2NWYyNSAxMDA2NDQKLS0tIGEvbGlzcC9lbWFjcy1saXNwL3N1YnIt
eC5lbAorKysgYi9saXNwL2VtYWNzLWxpc3Avc3Vici14LmVsCkBAIC00MTYsNiArNDE2LDIw
IEBAIHN0cmluZy1nbHlwaC1zcGxpdAogICAgICAgICAoc2V0cSBzdGFydCAoMSsgc3RhcnQp
KSkpCiAgICAgKG5yZXZlcnNlIHJlc3VsdCkpKQogCis7OzsjIyNhdXRvbG9hZAorKGRlZnVu
IGFwcGVuZC10ZXh0LXByb3BlcnR5IChzdGFydCBlbmQgcHJvcCB2YWx1ZXMgJm9wdGlvbmFs
IG9iamVjdCkKKyAgIkFwcGVuZCBhIGxpc3Qgb2YgdmFsdWVzIHRvIGEgdGV4dCBwcm9wZXJ0
eSBmcm9tIFNUQVJUIHRvIEVORC4KK1BST1AgaXMgdGhlIHRleHQgcHJvcGVydHkgdG8gYXBw
ZW5kIHRvLCBhbmQgVkFMVUVTIGlzIHRoZSBsaXN0IG9mCitwcm9wZXJ0eSB2YWx1ZXMgdG8g
YXBwZW5kLiAgT0JKRUNUIGlzIHRoZSBvYmplY3QgdG8gcHJvcGVydGl6ZSwgYXMgd2l0aAor
YHB1dC10ZXh0LXByb3BlcnR5JyAod2hpY2ggc2VlKS4iCisgIChsZXQgKG5leHQpCisgICAg
KHdoaWxlICg8IHN0YXJ0IGVuZCkKKyAgICAgIChzZXRxIG5leHQgKG5leHQtc2luZ2xlLXBy
b3BlcnR5LWNoYW5nZSBzdGFydCBwcm9wIG9iamVjdCBlbmQpKQorICAgICAgKHB1dC10ZXh0
LXByb3BlcnR5IHN0YXJ0IG5leHQgcHJvcAorICAgICAgICAgICAgICAgICAgICAgICAgIChh
cHBlbmQgKGdldC10ZXh0LXByb3BlcnR5IHN0YXJ0IHByb3Agb2JqZWN0KSB2YWx1ZXMpCisg
ICAgICAgICAgICAgICAgICAgICAgICAgb2JqZWN0KQorICAgICAgKHNldHEgc3RhcnQgbmV4
dCkpKSkKKwogOzs7IyMjYXV0b2xvYWQKIChkZWZ1biBhZGQtZGlzcGxheS10ZXh0LXByb3Bl
cnR5IChzdGFydCBlbmQgcHJvcCB2YWx1ZQogICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICZvcHRpb25hbCBvYmplY3QpCmRpZmYgLS1naXQgYS9saXNwL2VzaGVs
bC9lbS1wcm9tcHQuZWwgYi9saXNwL2VzaGVsbC9lbS1wcm9tcHQuZWwKaW5kZXggMTUyMDA0
NWQwNjMuLjY1NzY4ZGU4MmJiIDEwMDY0NAotLS0gYS9saXNwL2VzaGVsbC9lbS1wcm9tcHQu
ZWwKKysrIGIvbGlzcC9lc2hlbGwvZW0tcHJvbXB0LmVsCkBAIC0xMTksMTkgKzExOSw2IEBA
IGVzaGVsbC1wcm9tcHQtaW5pdGlhbGl6ZQogICAgIChhZGQtaG9vayAnZXNoZWxsLXBvc3Qt
Y29tbWFuZC1ob29rICdlc2hlbGwtZW1pdC1wcm9tcHQgbmlsIHQpCiAgICAgKGVzaGVsbC1w
cm9tcHQtbW9kZSkpKQogCi0oZGVmdW4gZXNoZWxsLS1hcHBlbmQtdGV4dC1wcm9wZXJ0eSAo
c3RhcnQgZW5kIHByb3AgdmFsdWUgJm9wdGlvbmFsIG9iamVjdCkKLSAgIkFwcGVuZCB0byBh
IHRleHQgcHJvcGVydHkgZnJvbSBTVEFSVCB0byBFTkQuCi1QUk9QIGlzIHRoZSB0ZXh0IHBy
b3BlcnR5IHRvIGFwcGVuZCB0bywgYW5kIFZBTFVFIGlzIHRoZSBsaXN0IG9mCi1wcm9wZXJ0
eSB2YWx1ZXMgdG8gYXBwZW5kLiAgT0JKRUNUIGlzIHRoZSBvYmplY3QgdG8gcHJvcGVydGl6
ZSwgYXMgd2l0aAotYHB1dC10ZXh0LXByb3BlcnR5JyAod2hpY2ggc2VlKS4iCi0gIChsZXQg
KG5leHQpCi0gICAgKHdoaWxlICg8IHN0YXJ0IGVuZCkKLSAgICAgIChzZXRxIG5leHQgKG5l
eHQtc2luZ2xlLXByb3BlcnR5LWNoYW5nZSBzdGFydCBwcm9wIG9iamVjdCBlbmQpKQotICAg
ICAgKHB1dC10ZXh0LXByb3BlcnR5IHN0YXJ0IG5leHQgcHJvcAotICAgICAgICAgICAgICAg
ICAgICAgICAgIChhcHBlbmQgKGdldC10ZXh0LXByb3BlcnR5IHN0YXJ0IHByb3Agb2JqZWN0
KSB2YWx1ZSkKLSAgICAgICAgICAgICAgICAgICAgICAgICBvYmplY3QpCi0gICAgICAoc2V0
cSBzdGFydCBuZXh0KSkpKQotCiAoZGVmdW4gZXNoZWxsLWVtaXQtcHJvbXB0ICgpCiAgICJF
bWl0IGEgcHJvbXB0IGlmIGVzaGVsbCBpcyBiZWluZyB1c2VkIGludGVyYWN0aXZlbHkuIgog
ICAod2hlbiAoYm91bmRwICdhbnNpLWNvbG9yLWNvbnRleHQtcmVnaW9uKQpAQCAtMTQ3LDgg
KzEzNCw4IEBAIGVzaGVsbC1lbWl0LXByb21wdAogICAgICAgICAoYWRkLXRleHQtcHJvcGVy
dGllcwogICAgICAgICAgMCBsZW4gJyhyZWFkLW9ubHkgdCBmb250LWxvY2stZmFjZSBlc2hl
bGwtcHJvbXB0KSBwcm9tcHQpCiAgICAgICAgIChzZXRxIHN0aWNreS1wcm9wcyBgKHJlYWQt
b25seSBmb250LWxvY2stZmFjZSAuICxzdGlja3ktcHJvcHMpKSkKLSAgICAgIChlc2hlbGwt
LWFwcGVuZC10ZXh0LXByb3BlcnR5IDAgbGVuICdmcm9udC1zdGlja3kgc3RpY2t5LXByb3Bz
IHByb21wdCkKLSAgICAgIChlc2hlbGwtLWFwcGVuZC10ZXh0LXByb3BlcnR5IDAgbGVuICdy
ZWFyLW5vbnN0aWNreSBzdGlja3ktcHJvcHMgcHJvbXB0KQorICAgICAgKGFwcGVuZC10ZXh0
LXByb3BlcnR5IDAgbGVuICdmcm9udC1zdGlja3kgc3RpY2t5LXByb3BzIHByb21wdCkKKyAg
ICAgIChhcHBlbmQtdGV4dC1wcm9wZXJ0eSAwIGxlbiAncmVhci1ub25zdGlja3kgc3RpY2t5
LXByb3BzIHByb21wdCkKICAgICAgIChlc2hlbGwtaW50ZXJhY3RpdmUtZmlsdGVyIG5pbCBw
cm9tcHQpKSkKICAgKHJ1bi1ob29rcyAnZXNoZWxsLWFmdGVyLXByb21wdC1ob29rKSkKIApk
aWZmIC0tZ2l0IGEvbGlzcC92aXN1YWwtd3JhcC5lbCBiL2xpc3AvdmlzdWFsLXdyYXAuZWwK
aW5kZXggYjkyMWUxZjA1NDkuLmNlMzk3ZTY5MTRmIDEwMDY0NAotLS0gYS9saXNwL3Zpc3Vh
bC13cmFwLmVsCisrKyBiL2xpc3AvdmlzdWFsLXdyYXAuZWwKQEAgLTMzLDYgKzMzLDggQEAK
IAogOzs7IENvZGU6CiAKKyhyZXF1aXJlICd0ZXh0LXByb3BlcnR5LXNlYXJjaCkKKwogKGRl
ZmN1c3RvbSB2aXN1YWwtd3JhcC1leHRyYS1pbmRlbnQgMAogICAiTnVtYmVyIG9mIGV4dHJh
IHNwYWNlcyB0byBpbmRlbnQgaW4gYHZpc3VhbC13cmFwLXByZWZpeC1tb2RlJy4KIApAQCAt
MTY1LDcgKzE2NywxMiBAQCB2aXN1YWwtd3JhcC0tYXBwbHktdG8tbGluZQogICAgICAgIHBv
c2l0aW9uIChwb3MtZW9sKSAnd3JhcC1wcmVmaXgKICAgICAgICAoaWYgKG51bWJlcnAgbmV4
dC1saW5lLXByZWZpeCkKICAgICAgICAgICAgYChzcGFjZSA6YWxpZ24tdG8gKCxuZXh0LWxp
bmUtcHJlZml4IC4gd2lkdGgpKQotICAgICAgICAgbmV4dC1saW5lLXByZWZpeCkpKSkpCisg
ICAgICAgICBuZXh0LWxpbmUtcHJlZml4KSkKKyAgICAgIDs7IE1ha2Ugc3VyZSB0aGF0IHdo
ZW4gdHlwaW5nIGF0IHRoZSBlbmQgb2YgYSBsaW5lIHdpdGgKKyAgICAgIDs7IGB3cmFwLXBy
ZWZpeCcgc2V0LCB3ZSBkb24ndCBjb250aW51ZSB0aGF0IHByb3BlcnR5IG92ZXIKKyAgICAg
IDs7IHN1YnNlcXVlbnQgbGluZXMuICBTZWUgYnVnIzc2MDE4LgorICAgICAgKGFwcGVuZC10
ZXh0LXByb3BlcnR5IHBvc2l0aW9uIChwb3MtZW9sKQorICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICdyZWFyLW5vbnN0aWNreSAnKHdyYXAtcHJlZml4KSkpKSkKIAogKGRlZnVuIHZp
c3VhbC13cmFwLS1jb250ZW50LXByZWZpeCAocHJlZml4IHBvc2l0aW9uKQogICAiR2V0IHRo
ZSBuZXh0LWxpbmUgcHJlZml4IGZvciB0aGUgc3BlY2lmaWVkIGZpcnN0LWxpbmUgUFJFRklY
LgpkaWZmIC0tZ2l0IGEvdGVzdC9saXNwL3Zpc3VhbC13cmFwLXRlc3RzLmVsIGIvdGVzdC9s
aXNwL3Zpc3VhbC13cmFwLXRlc3RzLmVsCmluZGV4IDA0OTc3YWZlMjA3Li5kM2ZhYTEyODYz
NyAxMDA2NDQKLS0tIGEvdGVzdC9saXNwL3Zpc3VhbC13cmFwLXRlc3RzLmVsCisrKyBiL3Rl
c3QvbGlzcC92aXN1YWwtd3JhcC10ZXN0cy5lbApAQCAtMzcsMTEgKzM3LDE1IEBAIHZpc3Vh
bC13cmFwLXRlc3RzL3NpbXBsZQogICAgICAgICAgICAgIChidWZmZXItc3RyaW5nKQogICAg
ICAgICAgICAgICMoImdyZWV0aW5nc1xuKiBoZWxsb1xuKiBoaSIKICAgICAgICAgICAgICAg
IDEwIDEyICggd3JhcC1wcmVmaXggKHNwYWNlIDphbGlnbi10byAoMiAuIHdpZHRoKSkKLSAg
ICAgICAgICAgICAgICAgICAgICAgZGlzcGxheSAobWluLXdpZHRoICgoMiAuIHdpZHRoKSkp
KQotICAgICAgICAgICAgICAgMTIgMTcgKCB3cmFwLXByZWZpeCAoc3BhY2UgOmFsaWduLXRv
ICgyIC4gd2lkdGgpKSkKKyAgICAgICAgICAgICAgICAgICAgICAgZGlzcGxheSAobWluLXdp
ZHRoICgoMiAuIHdpZHRoKSkpCisgICAgICAgICAgICAgICAgICAgICAgIHJlYXItbm9uc3Rp
Y2t5ICh3cmFwLXByZWZpeCkpCisgICAgICAgICAgICAgICAxMiAxNyAoIHdyYXAtcHJlZml4
IChzcGFjZSA6YWxpZ24tdG8gKDIgLiB3aWR0aCkpCisgICAgICAgICAgICAgICAgICAgICAg
IHJlYXItbm9uc3RpY2t5ICh3cmFwLXByZWZpeCkpCiAgICAgICAgICAgICAgICAxOCAyMCAo
IHdyYXAtcHJlZml4IChzcGFjZSA6YWxpZ24tdG8gKDIgLiB3aWR0aCkpCi0gICAgICAgICAg
ICAgICAgICAgICAgIGRpc3BsYXkgKG1pbi13aWR0aCAoKDIgLiB3aWR0aCkpKSkKLSAgICAg
ICAgICAgICAgIDIwIDIyICggd3JhcC1wcmVmaXggKHNwYWNlIDphbGlnbi10byAoMiAuIHdp
ZHRoKSkpKSkpKSkKKyAgICAgICAgICAgICAgICAgICAgICAgZGlzcGxheSAobWluLXdpZHRo
ICgoMiAuIHdpZHRoKSkpCisgICAgICAgICAgICAgICAgICAgICAgIHJlYXItbm9uc3RpY2t5
ICh3cmFwLXByZWZpeCkpCisgICAgICAgICAgICAgICAyMCAyMiAoIHdyYXAtcHJlZml4IChz
cGFjZSA6YWxpZ24tdG8gKDIgLiB3aWR0aCkpCisgICAgICAgICAgICAgICAgICAgICAgIHJl
YXItbm9uc3RpY2t5ICh3cmFwLXByZWZpeCkpKSkpKSkKIAogKGVydC1kZWZ0ZXN0IHZpc3Vh
bC13cmFwLXRlc3RzL3NhZmUtZGlzcGxheSAoKQogICAiVGVzdCBhZGRpbmcgd3JhcHBpbmcg
cHJvcGVydGllcyB0byB0ZXh0IHdpdGggc2FmZSBkaXNwbGF5IHByb3BlcnRpZXMuIgpAQCAt
NTIsOSArNTYsMTEgQEAgdmlzdWFsLXdyYXAtdGVzdHMvc2FmZS1kaXNwbGF5CiAgICAgICAg
ICAgICAgKGJ1ZmZlci1zdHJpbmcpCiAgICAgICAgICAgICAgIygiKiBoZWxsbyIKICAgICAg
ICAgICAgICAgIDAgMiAoIHdyYXAtcHJlZml4IChzcGFjZSA6YWxpZ24tdG8gKDIgLiB3aWR0
aCkpCi0gICAgICAgICAgICAgICAgICAgICBkaXNwbGF5IChtaW4td2lkdGggKCgyIC4gd2lk
dGgpKSkpCisgICAgICAgICAgICAgICAgICAgICBkaXNwbGF5IChtaW4td2lkdGggKCgyIC4g
d2lkdGgpKSkKKyAgICAgICAgICAgICAgICAgICAgIHJlYXItbm9uc3RpY2t5ICh3cmFwLXBy
ZWZpeCkpCiAgICAgICAgICAgICAgICAyIDcgKCB3cmFwLXByZWZpeCAoc3BhY2UgOmFsaWdu
LXRvICgyIC4gd2lkdGgpKQotICAgICAgICAgICAgICAgICAgICAgZGlzcGxheSAocmFpc2Ug
MSkpKSkpKSkKKyAgICAgICAgICAgICAgICAgICAgIGRpc3BsYXkgKHJhaXNlIDEpCisgICAg
ICAgICAgICAgICAgICAgICByZWFyLW5vbnN0aWNreSAod3JhcC1wcmVmaXgpKSkpKSkpCiAK
IChlcnQtZGVmdGVzdCB2aXN1YWwtd3JhcC10ZXN0cy91bnNhZmUtZGlzcGxheS93aXRoaW4t
bGluZSAoKQogICAiVGVzdCBhZGRpbmcgd3JhcHBpbmcgcHJvcGVydGllcyB0byB0ZXh0IHdp
dGggdW5zYWZlIGRpc3BsYXkgcHJvcGVydGllcy4KQEAgLTY3LDkgKzczLDExIEBAIHZpc3Vh
bC13cmFwLXRlc3RzL3Vuc2FmZS1kaXNwbGF5L3dpdGhpbi1saW5lCiAgICAgICAgICAgICAg
KGJ1ZmZlci1zdHJpbmcpCiAgICAgICAgICAgICAgIygiKiBbaW1nXSIKICAgICAgICAgICAg
ICAgIDAgMiAoIHdyYXAtcHJlZml4IChzcGFjZSA6YWxpZ24tdG8gKDIgLiB3aWR0aCkpCi0g
ICAgICAgICAgICAgICAgICAgICBkaXNwbGF5IChtaW4td2lkdGggKCgyIC4gd2lkdGgpKSkp
CisgICAgICAgICAgICAgICAgICAgICBkaXNwbGF5IChtaW4td2lkdGggKCgyIC4gd2lkdGgp
KSkKKyAgICAgICAgICAgICAgICAgICAgIHJlYXItbm9uc3RpY2t5ICh3cmFwLXByZWZpeCkp
CiAgICAgICAgICAgICAgICAyIDcgKCB3cmFwLXByZWZpeCAoc3BhY2UgOmFsaWduLXRvICgy
IC4gd2lkdGgpKQotICAgICAgICAgICAgICAgICAgICAgZGlzcGxheSAoaW1hZ2UgOnR5cGUg
Ym1wKSkpKSkpKQorICAgICAgICAgICAgICAgICAgICAgZGlzcGxheSAoaW1hZ2UgOnR5cGUg
Ym1wKQorICAgICAgICAgICAgICAgICAgICAgcmVhci1ub25zdGlja3kgKHdyYXAtcHJlZml4
KSkpKSkpKQogCiAoZXJ0LWRlZnRlc3QgdmlzdWFsLXdyYXAtdGVzdHMvdW5zYWZlLWRpc3Bs
YXkvc3Bhbm5pbmctbGluZXMgKCkKICAgIlRlc3QgYWRkaW5nIHdyYXBwaW5nIHByb3BlcnRp
ZXMgdG8gdGV4dCB3aXRoIHVuc2FmZSBkaXNwbGF5IHByb3BlcnRpZXMuCkBAIC0xMTcsNCAr
MTI1LDI4IEBAIHZpc3VhbC13cmFwLXRlc3RzL3Vuc2FmZS1kaXNwbGF5L211bHRpcGxlLTIK
ICAgICAgICAgICAgICAgMCA0IChkaXNwbGF5ICgoaW1hZ2UgOnR5cGUgYm1wKSkpCiAgICAg
ICAgICAgICAgIDQgOCAoZGlzcGxheSAoKGltYWdlIDp0eXBlIGJtcCkgKGhlaWdodCAxLjUp
KSkpKSkpKQogCisoZXJ0LWRlZnRlc3QgdmlzdWFsLXdyYXAtdGVzdHMvd3JhcC1wcmVmaXgt
c3RpY2tpbmVzcyAoKQorICAiVGVzdCB0aGF0IGB3cmFwLXByZWZpeCcgZG9lc24ndCBwZXJz
aXN0IGFjcm9zcyBtdWx0aXBsZSBsaW5lcyB3aGVuIHR5cGluZy4KK1NlZSBidWcjNzYwMTgu
IgorICAod2l0aC10ZW1wLWJ1ZmZlcgorICAgIChpbnNlcnQgIiogdGhpcyB6b28gY29udGFp
bnMgZ29hdHMiKQorICAgICh2aXN1YWwtd3JhcC1wcmVmaXgtZnVuY3Rpb24gKHBvaW50LW1p
bikgKHBvaW50LW1heCkpCisgICAgKHNob3VsZCAoZXF1YWwtaW5jbHVkaW5nLXByb3BlcnRp
ZXMKKyAgICAgICAgICAgICAoYnVmZmVyLXN0cmluZykKKyAgICAgICAgICAgICAjKCIqIHRo
aXMgem9vIGNvbnRhaW5zIGdvYXRzIgorICAgICAgICAgICAgICAgMCAgMiAoIHdyYXAtcHJl
Zml4IChzcGFjZSA6YWxpZ24tdG8gKDIgLiB3aWR0aCkpCisgICAgICAgICAgICAgICAgICAg
ICAgZGlzcGxheSAobWluLXdpZHRoICgoMiAuIHdpZHRoKSkpCisgICAgICAgICAgICAgICAg
ICAgICAgcmVhci1ub25zdGlja3kgKHdyYXAtcHJlZml4KSkKKyAgICAgICAgICAgICAgIDIg
MjUgKCB3cmFwLXByZWZpeCAoc3BhY2UgOmFsaWduLXRvICgyIC4gd2lkdGgpKQorICAgICAg
ICAgICAgICAgICAgICAgIHJlYXItbm9uc3RpY2t5ICh3cmFwLXByZWZpeCkpKSkpCisgICAg
KGluc2VydC1hbmQtaW5oZXJpdCAiXG5cbml0IGFsc28gY29udGFpbnMgcGFuZGFzIikKKyAg
ICAoc2hvdWxkIChlcXVhbC1pbmNsdWRpbmctcHJvcGVydGllcworICAgICAgICAgICAgIChi
dWZmZXItc3RyaW5nKQorICAgICAgICAgICAgICMoIiogdGhpcyB6b28gY29udGFpbnMgZ29h
dHNcblxuaXQgYWxzbyBjb250YWlucyBwYW5kYXMiCisgICAgICAgICAgICAgICAwICAyICgg
d3JhcC1wcmVmaXggKHNwYWNlIDphbGlnbi10byAoMiAuIHdpZHRoKSkKKyAgICAgICAgICAg
ICAgICAgICAgICBkaXNwbGF5IChtaW4td2lkdGggKCgyIC4gd2lkdGgpKSkKKyAgICAgICAg
ICAgICAgICAgICAgICByZWFyLW5vbnN0aWNreSAod3JhcC1wcmVmaXgpKQorICAgICAgICAg
ICAgICAgMiAyNSAoIHdyYXAtcHJlZml4IChzcGFjZSA6YWxpZ24tdG8gKDIgLiB3aWR0aCkp
CisgICAgICAgICAgICAgICAgICAgICAgcmVhci1ub25zdGlja3kgKHdyYXAtcHJlZml4KSkp
KSkpKQorCiA7OyB2aXN1YWwtd3JhcC10ZXN0cy5lbCBlbmRzIGhlcmUKLS0gCjIuMjUuMQoK
--------------zxm1lJbVUMBSJcKKElMPNqUo
Content-Type: text/plain; charset=UTF-8;
name="0002-Properly-clean-up-after-deactivating-visual-wrap-pre.patch"
Content-Disposition: attachment;
filename*0="0002-Properly-clean-up-after-deactivating-visual-wrap-pre.pa";
filename*1="tch"
Content-Transfer-Encoding: base64
RnJvbSBiMzk4ZmQ3ZWUzZDg0YTRlYjc4ZWYyMDMzNmFhMjJlMmJmNDI4NjdkIE1vbiBTZXAg
MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j
b20+CkRhdGU6IE1vbiwgMjYgTWF5IDIwMjUgMTg6MjY6MTkgLTA3MDAKU3ViamVjdDogW1BB
VENIIDIvMl0gUHJvcGVybHkgY2xlYW4gdXAgYWZ0ZXIgZGVhY3RpdmF0aW5nCiAndmlzdWFs
LXdyYXAtcHJlZml4LW1vZGUnCgoqIGxpc3AvZW1hY3MtbGlzcC9zdWJyLXguZWwgKGFkZC1y
ZW1vdmUtLWRpc3BsYXktdGV4dC1wcm9wZXJ0eSk6IE5ldwpmdW5jdGlvbiwgZXh0cmFjdGVk
IGZyb20uLi4KKGFkZC1kaXNwbGF5LXRleHQtcHJvcGVydHkpOiAuLi4gaGVyZS4KKHJlbW92
ZS1kaXNwbGF5LXRleHQtcHJvcGVydHkpOiBOZXcgZnVuY3Rpb24uCgoqIGxpc3AvdmlzdWFs
LXdyYXAuZWwgKHZpc3VhbC13cmFwLS1yZW1xLXRleHQtcHJvcGVydHkpOiBOZXcgZnVuY3Rp
b24uCih2aXN1YWwtd3JhcC0tYXBwbHktdG8tbGluZSwgdmlzdWFsLXdyYXAtcHJlZml4LWZ1
bmN0aW9uKTogQWRkIFJFTU9WRQphcmd1bWVudC4KKHZpc3VhbC13cmFwLXByZWZpeC1tb2Rl
KTogQ2FsbCAndmlzdWFsLXdyYXAtcHJlZml4LWZ1bmN0aW9uJyB0byBjbGVhbgp1cC4KCiog
dGVzdC9saXNwL3Zpc3VhbC13cmFwLXRlc3RzLmVsICh2aXN1YWwtd3JhcC10ZXN0cy9jbGVh
bnVwKTogTmV3IHRlc3QuCgoqIGRvYy9saXNwcmVmL2Rpc3BsYXkudGV4aSAoRGlzcGxheSBQ
cm9wZXJ0eSk6IERvY3VtZW50CidyZW1vdmUtZGlzcGxheS10ZXh0LXByb3BlcnR5Jy4KCiog
ZXRjL05FV1M6IEFubm91bmNlICdyZW1vdmUtZGlzcGxheS10ZXh0LXByb3BlcnR5Jy4KLS0t
CiBkb2MvbGlzcHJlZi9kaXNwbGF5LnRleGkgICAgICAgfCAzMiArKysrKysrKysrKysrKwog
ZXRjL05FV1MgICAgICAgICAgICAgICAgICAgICAgIHwgIDYgKysrCiBsaXNwL2VtYWNzLWxp
c3Avc3Vici14LmVsICAgICAgfCA1NyArKysrKysrKysrKysrKysrLS0tLS0tLS0KIGxpc3Av
dmlzdWFsLXdyYXAuZWwgICAgICAgICAgICB8IDgxICsrKysrKysrKysrKysrKysrKysrKysr
LS0tLS0tLS0tLS0KIHRlc3QvbGlzcC92aXN1YWwtd3JhcC10ZXN0cy5lbCB8IDE1ICsrKysr
KysKIDUgZmlsZXMgY2hhbmdlZCwgMTQ3IGluc2VydGlvbnMoKyksIDQ0IGRlbGV0aW9ucygt
KQoKZGlmZiAtLWdpdCBhL2RvYy9saXNwcmVmL2Rpc3BsYXkudGV4aSBiL2RvYy9saXNwcmVm
L2Rpc3BsYXkudGV4aQppbmRleCAzYjQ4Y2I5MzQwNS4uNzdhNTM5NDhiNWUgMTAwNjQ0Ci0t
LSBhL2RvYy9saXNwcmVmL2Rpc3BsYXkudGV4aQorKysgYi9kb2MvbGlzcHJlZi9kaXNwbGF5
LnRleGkKQEAgLTUyOTksNiArNTI5OSwzOCBAQCBEaXNwbGF5IFByb3BlcnR5CiBJZiBAY29k
ZXtuaWx9LCB0aGlzIGRlZmF1bHRzIHRvIHRoZSBjdXJyZW50IGJ1ZmZlci4KIEBlbmQgZGVm
dW4KIAorQGRlZnVuIHJlbW92ZS1kaXNwbGF5LXRleHQtcHJvcGVydHkgc3RhcnQgZW5kIHBy
b3AgJm9wdGlvbmFsIG9iamVjdAorUmVtb3ZlIEBjb2Rle2Rpc3BsYXl9IHByb3BlcnR5IEB2
YXJ7cHJvcH0gZnJvbSB0aGUgdGV4dCBmcm9tIEB2YXJ7c3RhcnR9Cit0byBAdmFye2VuZH0u
CisKK0lmIGFueSB0ZXh0IGluIHRoZSByZWdpb24gaGFzIGFueSBvdGhlciBAY29kZXtkaXNw
bGF5fSBwcm9wZXJ0aWVzLCB0aG9zZQorcHJvcGVydGllcyBhcmUgcmV0YWluZWQuICBGb3Ig
aW5zdGFuY2U6CisKK0BsaXNwCisoYWRkLWRpc3BsYXktdGV4dC1wcm9wZXJ0eSAxIDggJ3Jh
aXNlIDAuNSkKKyhhZGQtZGlzcGxheS10ZXh0LXByb3BlcnR5IDQgOCAnaGVpZ2h0IDIuMCkK
KyhyZW1vdmUtZGlzcGxheS10ZXh0LXByb3BlcnR5IDIgNiAncmFpc2UpCitAZW5kIGxpc3AK
KworQWZ0ZXIgZG9pbmcgdGhpcywgdGhlIHRleHQgd2lsbCBoYXZlIHRoZSBmb2xsb3dpbmcg
QGNvZGV7ZGlzcGxheX0KK3Byb3BlcnRpZXM6CisKK0BpdGVtaXplIEBidWxsZXQKK0BpdGVt
CitUaGUgcmVnaW9uIGZyb20gMSB0byAyLCBvbmx5IEBjb2Rle3JhaXNlfQorCitAaXRlbQor
VGhlIHJlZ2lvbiBmcm9tIDIgdG8gNCwgbm8gcHJvcGVydGllcworCitAaXRlbQorVGhlIHJl
Z2lvbiBmcm9tIDQgdG8gNiwgb25seSBAY29kZXtoZWlnaHR9CisKK0BpdGVtCitUaGUgcmVn
aW9uIGZyb20gNiB0byA4LCBib3RoIEBjb2Rle3JhaXNlfSBhbmQgQGNvZGV7aGVpZ2h0fQor
CitAZW5kIGl0ZW1pemUKK0BlbmQgZGVmdW4KKwogQGNpbmRleCBkaXNwbGF5IHByb3BlcnR5
LCB1bnNhZmUgZXZhbHVhdGlvbgogQGNpbmRleCBzZWN1cml0eSwgYW5kIGRpc3BsYXkgc3Bl
Y2lmaWNhdGlvbnMKICAgU29tZSBvZiB0aGUgZGlzcGxheSBzcGVjaWZpY2F0aW9ucyBhbGxv
dyBpbmNsdXNpb24gb2YgTGlzcCBmb3JtcywKZGlmZiAtLWdpdCBhL2V0Yy9ORVdTIGIvZXRj
L05FV1MKaW5kZXggZTA3ODhiNDIxYTEuLjM2OWJiYzJiMzQ3IDEwMDY0NAotLS0gYS9ldGMv
TkVXUworKysgYi9ldGMvTkVXUwpAQCAtMjM0NSw2ICsyMzQ1LDEyIEBAIFRoaXMgZnVuY3Rp
b24gYXBwZW5kcyBhIGxpc3Qgb2YgdmFsdWVzIHRvIGEgdGV4dCBwcm9wZXJ0eSBmb3IgdGhl
CiBzcGVjaWZpZWQgcmVnaW9uIG9mIHRleHQsIHByZXNlcnZpbmcgYW55IHZhbHVlcyBhbHJl
YWR5IHNldCBmb3IgdGhhdAogcHJvcGVydHkuCiAKKysrKworKiogTmV3IGZ1bmN0aW9uICdy
ZW1vdmUtZGlzcGxheS10ZXh0LXByb3BlcnR5Jy4KK1RoaXMgZnVuY3Rpb24gcmVtb3ZlcyBh
IGRpc3BsYXkgcHJvcGVydHkgZnJvbSB0aGUgc3BlY2lmaWVkIHJlZ2lvbiBvZgordGV4dCwg
cHJlc2VydmluZyBhbnkgb3RoZXIgZGlzcGxheSBwcm9wZXJ0aWVzIGFscmVhZHkgc2V0IGZv
ciB0aGF0CityZWdpb24uCisKICsrKwogKiogTmV3IG1hY3JvICdjb25kKicuCiBUaGUgbmV3
IG1hY3JvICdjb25kKicgaXMgYW4gYWx0ZXJuYXRpdmUgdG8gJ2NvbmQnIGFuZCAncGNhc2Un
LgpkaWZmIC0tZ2l0IGEvbGlzcC9lbWFjcy1saXNwL3N1YnIteC5lbCBiL2xpc3AvZW1hY3Mt
bGlzcC9zdWJyLXguZWwKaW5kZXggNzc3MzgyNjVmMjUuLjc3YzdhNWJiYTdjIDEwMDY0NAot
LS0gYS9saXNwL2VtYWNzLWxpc3Avc3Vici14LmVsCisrKyBiL2xpc3AvZW1hY3MtbGlzcC9z
dWJyLXguZWwKQEAgLTQzMCwyNyArNDMwLDIyIEBAIGFwcGVuZC10ZXh0LXByb3BlcnR5CiAg
ICAgICAgICAgICAgICAgICAgICAgICAgb2JqZWN0KQogICAgICAgKHNldHEgc3RhcnQgbmV4
dCkpKSkKIAotOzs7IyMjYXV0b2xvYWQKLShkZWZ1biBhZGQtZGlzcGxheS10ZXh0LXByb3Bl
cnR5IChzdGFydCBlbmQgcHJvcCB2YWx1ZQotICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICZvcHRpb25hbCBvYmplY3QpCi0gICJBZGQgZGlzcGxheSBwcm9wZXJ0
eSBQUk9QIHdpdGggVkFMVUUgdG8gdGhlIHRleHQgZnJvbSBTVEFSVCB0byBFTkQuCi1JZiBh
bnkgdGV4dCBpbiB0aGUgcmVnaW9uIGhhcyBhIG5vbi1uaWwgYGRpc3BsYXknIHByb3BlcnR5
LCB0aG9zZQotcHJvcGVydGllcyBhcmUgcmV0YWluZWQuCi0KLUlmIE9CSkVDVCBpcyBub24t
bmlsLCBpdCBzaG91bGQgYmUgYSBzdHJpbmcgb3IgYSBidWZmZXIuICBJZiBuaWwsCi10aGlz
IGRlZmF1bHRzIHRvIHRoZSBjdXJyZW50IGJ1ZmZlci4iCisoZGVmdW4gYWRkLXJlbW92ZS0t
ZGlzcGxheS10ZXh0LXByb3BlcnR5IChzdGFydCBlbmQgcHJvcCB2YWx1ZQorICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJm9wdGlvbmFsIG9iamVj
dCByZW1vdmUpCiAgIChsZXQgKChzdWItc3RhcnQgc3RhcnQpCiAgICAgICAgIChzdWItZW5k
IDApCisgICAgICAgIChsaW1pdCAoaWYgKHN0cmluZ3Agb2JqZWN0KQorICAgICAgICAgICAg
ICAgICAgIChtaW4gKGxlbmd0aCBvYmplY3QpIGVuZCkKKyAgICAgICAgICAgICAgICAgKG1p
biBlbmQgKHBvaW50LW1heCkpKSkKICAgICAgICAgZGlzcCkKICAgICAod2hpbGUgKDwgc3Vi
LWVuZCBlbmQpCiAgICAgICAoc2V0cSBzdWItZW5kIChuZXh0LXNpbmdsZS1wcm9wZXJ0eS1j
aGFuZ2Ugc3ViLXN0YXJ0ICdkaXNwbGF5IG9iamVjdAotICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgIChpZiAoc3RyaW5ncCBvYmplY3QpCi0gICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChtaW4g
KGxlbmd0aCBvYmplY3QpIGVuZCkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgIChtaW4gZW5kIChwb2ludC1tYXgpKSkpKQorICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxpbWl0KSkKICAgICAg
IChpZiAobm90IChzZXRxIGRpc3AgKGdldC10ZXh0LXByb3BlcnR5IHN1Yi1zdGFydCAnZGlz
cGxheSBvYmplY3QpKSkKICAgICAgICAgICA7OyBObyBvbGQgcHJvcGVydGllcyBpbiB0aGlz
IHJhbmdlLgotICAgICAgICAgIChwdXQtdGV4dC1wcm9wZXJ0eSBzdWItc3RhcnQgc3ViLWVu
ZCAnZGlzcGxheSAobGlzdCBwcm9wIHZhbHVlKQotICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICBvYmplY3QpCisgICAgICAgICAgKHVubGVzcyByZW1vdmUKKyAgICAgICAgICAgIChw
dXQtdGV4dC1wcm9wZXJ0eSBzdWItc3RhcnQgc3ViLWVuZCAnZGlzcGxheSAobGlzdCBwcm9w
IHZhbHVlKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9iamVjdCkpCiAgICAg
ICAgIDs7IFdlIGhhdmUgb2xkIHByb3BlcnRpZXMuCiAgICAgICAgIChsZXQgKCh2ZWN0b3Ig
bmlsKSkKICAgICAgICAgICA7OyBNYWtlIGRpc3AgaW50byBhIGxpc3QuCkBAIC00NjYsMTMg
KzQ2MSwzNyBAQCBhZGQtZGlzcGxheS10ZXh0LXByb3BlcnR5CiAgICAgICAgICAgOzsgUmVt
b3ZlIGFueSBvbGQgaW5zdGFuY2VzLgogICAgICAgICAgICh3aGVuLWxldCogKChvbGQgKGFz
c29jIHByb3AgZGlzcCkpKQogICAgICAgICAgICAgKHNldHEgZGlzcCAoZGVsZXRlIG9sZCBk
aXNwKSkpCi0gICAgICAgICAgKHNldHEgZGlzcCAoY29ucyAobGlzdCBwcm9wIHZhbHVlKSBk
aXNwKSkKLSAgICAgICAgICAod2hlbiB2ZWN0b3IKLSAgICAgICAgICAgIChzZXRxIGRpc3Ag
KHNlcS1pbnRvIGRpc3AgJ3ZlY3RvcikpKQotICAgICAgICAgIDs7IEZpbmFsbHkgdXBkYXRl
IHRoZSByYW5nZS4KLSAgICAgICAgICAocHV0LXRleHQtcHJvcGVydHkgc3ViLXN0YXJ0IHN1
Yi1lbmQgJ2Rpc3BsYXkgZGlzcCBvYmplY3QpKSkKKyAgICAgICAgICAodW5sZXNzIHJlbW92
ZQorICAgICAgICAgICAgKHNldHEgZGlzcCAoY29ucyAobGlzdCBwcm9wIHZhbHVlKSBkaXNw
KSkpCisgICAgICAgICAgKGlmIChub3QgZGlzcCkKKyAgICAgICAgICAgICAgKHJlbW92ZS10
ZXh0LXByb3BlcnRpZXMgc3ViLXN0YXJ0IHN1Yi1lbmQgJyhkaXNwbGF5IG5pbCkgb2JqZWN0
KQorICAgICAgICAgICAgKHdoZW4gdmVjdG9yCisgICAgICAgICAgICAgIChzZXRxIGRpc3Ag
KHNlcS1pbnRvIGRpc3AgJ3ZlY3RvcikpKQorICAgICAgICAgICAgOzsgRmluYWxseSB1cGRh
dGUgdGhlIHJhbmdlLgorICAgICAgICAgICAgKHB1dC10ZXh0LXByb3BlcnR5IHN1Yi1zdGFy
dCBzdWItZW5kICdkaXNwbGF5IGRpc3Agb2JqZWN0KSkpKQogICAgICAgKHNldHEgc3ViLXN0
YXJ0IHN1Yi1lbmQpKSkpCiAKKzs7OyMjI2F1dG9sb2FkCisoZGVmdW4gYWRkLWRpc3BsYXkt
dGV4dC1wcm9wZXJ0eSAoc3RhcnQgZW5kIHByb3AgdmFsdWUKKyAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAmb3B0aW9uYWwgb2JqZWN0KQorICAiQWRkIGRpc3Bs
YXkgcHJvcGVydHkgUFJPUCB3aXRoIFZBTFVFIHRvIHRoZSB0ZXh0IGZyb20gU1RBUlQgdG8g
RU5ELgorSWYgYW55IHRleHQgaW4gdGhlIHJlZ2lvbiBoYXMgYSBub24tbmlsIGBkaXNwbGF5
JyBwcm9wZXJ0eSwgdGhvc2UKK3Byb3BlcnRpZXMgYXJlIHJldGFpbmVkLgorCitJZiBPQkpF
Q1QgaXMgbm9uLW5pbCwgaXQgc2hvdWxkIGJlIGEgc3RyaW5nIG9yIGEgYnVmZmVyLiAgSWYg
bmlsLAordGhpcyBkZWZhdWx0cyB0byB0aGUgY3VycmVudCBidWZmZXIuIgorICAoYWRkLXJl
bW92ZS0tZGlzcGxheS10ZXh0LXByb3BlcnR5IHN0YXJ0IGVuZCBwcm9wIHZhbHVlIG9iamVj
dCkpCisKKzs7OyMjI2F1dG9sb2FkCisoZGVmdW4gcmVtb3ZlLWRpc3BsYXktdGV4dC1wcm9w
ZXJ0eSAoc3RhcnQgZW5kIHByb3AgJm9wdGlvbmFsIG9iamVjdCkKKyAgIlJlbW92ZSBkaXNw
bGF5IHByb3BlcnR5IFBST1AgZnJvbSB0aGUgdGV4dCBmcm9tIFNUQVJUIHRvIEVORC4KK0lm
IGFueSB0ZXh0IGluIHRoZSByZWdpb24gaGFzIG90aGVyIGBkaXNwbGF5JyBzcGVjcywgdGhv
c2Ugc3BlY3MgYXJlCityZXRhaW5lZC4KKworSWYgT0JKRUNUIGlzIG5vbi1uaWwsIGl0IHNo
b3VsZCBiZSBhIHN0cmluZyBvciBhIGJ1ZmZlci4gIElmIG5pbCwKK3RoaXMgZGVmYXVsdHMg
dG8gdGhlIGN1cnJlbnQgYnVmZmVyLiIKKyAgKGFkZC1yZW1vdmUtLWRpc3BsYXktdGV4dC1w
cm9wZXJ0eSBzdGFydCBlbmQgcHJvcCBuaWwgb2JqZWN0ICdyZW1vdmUpKQorCiA7OzsjIyNh
dXRvbG9hZAogKGRlZnVuIHJlYWQtcHJvY2Vzcy1uYW1lIChwcm9tcHQpCiAgICJRdWVyeSB0
aGUgdXNlciBmb3IgYSBwcm9jZXNzIGFuZCByZXR1cm4gdGhlIHByb2Nlc3Mgb2JqZWN0LiIK
ZGlmZiAtLWdpdCBhL2xpc3AvdmlzdWFsLXdyYXAuZWwgYi9saXNwL3Zpc3VhbC13cmFwLmVs
CmluZGV4IGNlMzk3ZTY5MTRmLi5iMzNlMWFjZGU4MiAxMDA2NDQKLS0tIGEvbGlzcC92aXN1
YWwtd3JhcC5lbAorKysgYi9saXNwL3Zpc3VhbC13cmFwLmVsCkBAIC0xNDUsMzQgKzE0NSw2
NCBAQCB2aXN1YWwtd3JhcC0tYWRqdXN0LXByZWZpeAogICAgICAgICh0CiAgICAgICAgICIi
KSkpKSkKIAotKGRlZnVuIHZpc3VhbC13cmFwLS1hcHBseS10by1saW5lIChwb3NpdGlvbikK
LSAgIkFwcGx5IHZpc3VhbC13cmFwcGluZyBwcm9wZXJ0aWVzIHRvIHRoZSBsb2dpY2FsIGxp
bmUgc3RhcnRpbmcgYXQgUE9TSVRJT04uIgorKGRlZnVuIHZpc3VhbC13cmFwLS1yZW1xLXRl
eHQtcHJvcGVydHkgKHN0YXJ0IGVuZCBwcm9wIHZhbHVlKQorICAiUmVtb3ZlIGEgVkFMVUUg
ZnJvbSB0aGUgdGV4dCBwcm9wZXJ0eSBQUk9QIGZyb20gU1RBUlQgdG8gRU5ELgorVGhpcyBy
ZW1vdmVzIHRoZSB2YWx1ZSBmcm9tIGEgdGV4dCBwcm9wZXJ0eSBjb250YWluaW5nIGEgbGlz
dCwgYXMgd2l0aAorYHJlbXEnICh3aGljaCBzZWUpLiIKKyAgKHNhdmUtZXhjdXJzaW9uCisg
ICAgKHNhdmUtcmVzdHJpY3Rpb24KKyAgICAgIChuYXJyb3ctdG8tcmVnaW9uIHN0YXJ0IGVu
ZCkKKyAgICAgIChnb3RvLWNoYXIgKHBvaW50LW1pbikpCisgICAgICAobGV0IChtYXRjaCkK
KyAgICAgICAgKHdoaWxlIChzZXRxIG1hdGNoICh0ZXh0LXByb3BlcnR5LXNlYXJjaC1mb3J3
YXJkIHByb3AgdmFsdWUgIydtZW1xKSkKKyAgICAgICAgICAoaWYtbGV0KiAoKG5ldy12YWx1
ZSAocmVtcSB2YWx1ZSAocHJvcC1tYXRjaC12YWx1ZSBtYXRjaCkpKSkKKyAgICAgICAgICAg
ICAgKHB1dC10ZXh0LXByb3BlcnR5IChwcm9wLW1hdGNoLWJlZ2lubmluZyBtYXRjaCkKKyAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChwcm9wLW1hdGNoLWVuZCBtYXRjaCkK
KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHByb3AgbmV3LXZhbHVlKQorICAg
ICAgICAgICAgKHJlbW92ZS10ZXh0LXByb3BlcnRpZXMgKHByb3AtbWF0Y2gtYmVnaW5uaW5n
IG1hdGNoKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHByb3AtbWF0
Y2gtZW5kIG1hdGNoKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGxp
c3QgcHJvcCBuaWwpKSkpKSkpKQorCisoZGVmdW4gdmlzdWFsLXdyYXAtLWFwcGx5LXRvLWxp
bmUgKHBvc2l0aW9uICZvcHRpb25hbCByZW1vdmUpCisgICJBcHBseSB2aXN1YWwtd3JhcHBp
bmcgcHJvcGVydGllcyB0byB0aGUgbG9naWNhbCBsaW5lIHN0YXJ0aW5nIGF0IFBPU0lUSU9O
LgorSWYgUkVNT1ZFIGlzIG5vbi1uaWwsIHJlbW92ZSB0aGUgdmlzdWFsLXdyYXBwaW5nIHBy
b3BlcnRpZXMuIgogICAoc2F2ZS1leGN1cnNpb24KICAgICAoZ290by1jaGFyIHBvc2l0aW9u
KQogICAgICh3aGVuLWxldCogKChmaXJzdC1saW5lLXByZWZpeCAoZmlsbC1tYXRjaC1hZGFw
dGl2ZS1wcmVmaXgpKQogICAgICAgICAgICAgICAgIChuZXh0LWxpbmUtcHJlZml4ICh2aXN1
YWwtd3JhcC0tY29udGVudC1wcmVmaXgKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgZmlyc3QtbGluZS1wcmVmaXggcG9zaXRpb24pKSkKICAgICAgICh3aGVuIChudW1i
ZXJwIG5leHQtbGluZS1wcmVmaXgpCi0gICAgICAgIDs7IFNldCBhIG1pbmltdW0gd2lkdGgg
Zm9yIHRoZSBwcmVmaXggc28gaXQgbGluZXMgdXAgY29ycmVjdGx5Ci0gICAgICAgIDs7IHdp
dGggc3Vic2VxdWVudCBsaW5lcy4gIE1ha2Ugc3VyZSBub3QgdG8gZG8gdGhpcyBwYXN0IHRo
ZSBlbmQKLSAgICAgICAgOzsgb2YgdGhlIGxpbmUgdGhvdWdoISAgKGBmaWxsLW1hdGNoLWFk
YXB0aXZlLXByZWZpeCcgY291bGQKLSAgICAgICAgOzsgcG90ZW50aWFsbHkgcmV0dXJuIGEg
cHJlZml4IGxvbmdlciB0aGFuIHRoZSBjdXJyZW50IGxpbmUgaW4KLSAgICAgICAgOzsgdGhl
IGJ1ZmZlci4pCi0gICAgICAgIChhZGQtZGlzcGxheS10ZXh0LXByb3BlcnR5Ci0gICAgICAg
ICBwb3NpdGlvbiAobWluICgrIHBvc2l0aW9uIChsZW5ndGggZmlyc3QtbGluZS1wcmVmaXgp
KQotICAgICAgICAgICAgICAgICAgICAgICAocG9zLWVvbCkpCi0gICAgICAgICAnbWluLXdp
ZHRoIGAoKCxuZXh0LWxpbmUtcHJlZml4IC4gd2lkdGgpKSkpCisgICAgICAgIChsZXQgKChk
aXNwbGF5LWVuZCAobWluICgrIHBvc2l0aW9uIChsZW5ndGggZmlyc3QtbGluZS1wcmVmaXgp
KQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAocG9zLWVvbCkpKSkKKyAgICAg
ICAgICAoaWYgKG5vdCByZW1vdmUpCisgICAgICAgICAgICAgIDs7IFNldCBhIG1pbmltdW0g
d2lkdGggZm9yIHRoZSBwcmVmaXggc28gaXQgbGluZXMgdXAKKyAgICAgICAgICAgICAgOzsg
Y29ycmVjdGx5IHdpdGggc3Vic2VxdWVudCBsaW5lcy4gIE1ha2Ugc3VyZSBub3QgdG8gZG8K
KyAgICAgICAgICAgICAgOzsgdGhpcyBwYXN0IHRoZSBlbmQgb2YgdGhlIGxpbmUgdGhvdWdo
IQorICAgICAgICAgICAgICA7OyAoYGZpbGwtbWF0Y2gtYWRhcHRpdmUtcHJlZml4JyBjb3Vs
ZCBwb3RlbnRpYWxseSByZXR1cm4KKyAgICAgICAgICAgICAgOzsgYSBwcmVmaXggbG9uZ2Vy
IHRoYW4gdGhlIGN1cnJlbnQgbGluZSBpbiB0aGUgYnVmZmVyLikKKyAgICAgICAgICAgICAg
KGFkZC1kaXNwbGF5LXRleHQtcHJvcGVydHkKKyAgICAgICAgICAgICAgIHBvc2l0aW9uIGRp
c3BsYXktZW5kCisgICAgICAgICAgICAgICAnbWluLXdpZHRoIGAoKCxuZXh0LWxpbmUtcHJl
Zml4IC4gd2lkdGgpKSkKKyAgICAgICAgICAgIDs7IENsZWFyIHRoZSBgbWluLXdpZHRoJyBk
aXNwbGF5IHByb3BlcnR5LgorICAgICAgICAgICAgKHJlbW92ZS1kaXNwbGF5LXRleHQtcHJv
cGVydHkgcG9zaXRpb24gZGlzcGxheS1lbmQgJ21pbi13aWR0aCkpKSkKICAgICAgIChzZXRx
IG5leHQtbGluZS1wcmVmaXggKHZpc3VhbC13cmFwLS1hZGp1c3QtcHJlZml4IG5leHQtbGlu
ZS1wcmVmaXgpKQotICAgICAgKHB1dC10ZXh0LXByb3BlcnR5Ci0gICAgICAgcG9zaXRpb24g
KHBvcy1lb2wpICd3cmFwLXByZWZpeAotICAgICAgIChpZiAobnVtYmVycCBuZXh0LWxpbmUt
cHJlZml4KQotICAgICAgICAgICBgKHNwYWNlIDphbGlnbi10byAoLG5leHQtbGluZS1wcmVm
aXggLiB3aWR0aCkpCi0gICAgICAgICBuZXh0LWxpbmUtcHJlZml4KSkKLSAgICAgIDs7IE1h
a2Ugc3VyZSB0aGF0IHdoZW4gdHlwaW5nIGF0IHRoZSBlbmQgb2YgYSBsaW5lIHdpdGgKLSAg
ICAgIDs7IGB3cmFwLXByZWZpeCcgc2V0LCB3ZSBkb24ndCBjb250aW51ZSB0aGF0IHByb3Bl
cnR5IG92ZXIKLSAgICAgIDs7IHN1YnNlcXVlbnQgbGluZXMuICBTZWUgYnVnIzc2MDE4Lgot
ICAgICAgKGFwcGVuZC10ZXh0LXByb3BlcnR5IHBvc2l0aW9uIChwb3MtZW9sKQotICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICdyZWFyLW5vbnN0aWNreSAnKHdyYXAtcHJlZml4KSkp
KSkKKyAgICAgIChpZiAobm90IHJlbW92ZSkKKyAgICAgICAgICA7OyBBcHBseSBgd3JhcC1w
cmVmaXgnIHByb3BlcnRpZXMuCisgICAgICAgICAgKHByb2duCisgICAgICAgICAgICAocHV0
LXRleHQtcHJvcGVydHkKKyAgICAgICAgICAgICBwb3NpdGlvbiAocG9zLWVvbCkgJ3dyYXAt
cHJlZml4CisgICAgICAgICAgICAgKGlmIChudW1iZXJwIG5leHQtbGluZS1wcmVmaXgpCisg
ICAgICAgICAgICAgICAgIGAoc3BhY2UgOmFsaWduLXRvICgsbmV4dC1saW5lLXByZWZpeCAu
IHdpZHRoKSkKKyAgICAgICAgICAgICAgIG5leHQtbGluZS1wcmVmaXgpKQorICAgICAgICAg
ICAgOzsgTWFrZSBzdXJlIHRoYXQgd2hlbiB0eXBpbmcgYXQgdGhlIGVuZCBvZiBhIGxpbmUg
d2l0aAorICAgICAgICAgICAgOzsgYHdyYXAtcHJlZml4JyBzZXQsIHdlIGRvbid0IGNvbnRp
bnVlIHRoYXQgcHJvcGVydHkgb3ZlcgorICAgICAgICAgICAgOzsgc3Vic2VxdWVudCBsaW5l
cy4gIFNlZSBidWcjNzYwMTguCisgICAgICAgICAgICAoYXBwZW5kLXRleHQtcHJvcGVydHkg
cG9zaXRpb24gKHBvcy1lb2wpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
J3JlYXItbm9uc3RpY2t5ICcod3JhcC1wcmVmaXgpKSkKKyAgICAgICAgOzsgUmVtb3ZlIGB3
cmFwLXByZWZpeCcgcHJvcGVydGllcy4KKyAgICAgICAgKHJlbW92ZS10ZXh0LXByb3BlcnRp
ZXMgcG9zaXRpb24gKHBvcy1lb2wpICcod3JhcC1wcmVmaXggbmlsKSkKKyAgICAgICAgKHZp
c3VhbC13cmFwLS1yZW1xLXRleHQtcHJvcGVydHkgcG9zaXRpb24gKHBvcy1lb2wpCisgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdyZWFyLW5vbnN0aWNreSAn
d3JhcC1wcmVmaXgpKSkpKQogCiAoZGVmdW4gdmlzdWFsLXdyYXAtLWNvbnRlbnQtcHJlZml4
IChwcmVmaXggcG9zaXRpb24pCiAgICJHZXQgdGhlIG5leHQtbGluZSBwcmVmaXggZm9yIHRo
ZSBzcGVjaWZpZWQgZmlyc3QtbGluZSBQUkVGSVguCkBAIC0yMzMsOCArMjYzLDkgQEAgdmlz
dWFsLXdyYXAtZmlsbC1jb250ZXh0LXByZWZpeAogICAgICAgICAocHJvcGVydGl6ZSBwcmVm
aXggJ2ZhY2UgZmFjZSkKICAgICAgIHByZWZpeCkpKQogCi0oZGVmdW4gdmlzdWFsLXdyYXAt
cHJlZml4LWZ1bmN0aW9uIChiZWcgZW5kKQotICAiSW5kZW50IHRoZSByZWdpb24gYmV0d2Vl
biBCRUcgYW5kIEVORCB3aXRoIHZpc3VhbCBmaWxsaW5nLiIKKyhkZWZ1biB2aXN1YWwtd3Jh
cC1wcmVmaXgtZnVuY3Rpb24gKGJlZyBlbmQgJm9wdGlvbmFsIHJlbW92ZSkKKyAgIkluZGVu
dCB0aGUgcmVnaW9uIGJldHdlZW4gQkVHIGFuZCBFTkQgd2l0aCB2aXN1YWwgZmlsbGluZy4K
K0lmIFJFTU9WRSBpcyBub24tbmlsLCByZW1vdmUgdGhlIHZpc3VhbCBmaWxsaW5nIGJldHdl
ZW4gQkVHIGFuZCBFTkQuIgogICA7OyBBbnkgY2hhbmdlIGF0IHRoZSBiZWdpbm5pbmcgb2Yg
YSBsaW5lIG1pZ2h0IGNoYW5nZSBpdHMgd3JhcAogICA7OyBwcmVmaXgsIHdoaWNoIGFmZmVj
dHMgdGhlIHdob2xlIGxpbmUuICBTbyB3ZSBuZWVkIHRvICJyb3VuZC11cCIKICAgOzsgYGVu
ZCcgdG8gdGhlIG5lYXJlc3QgZW5kIG9mIGxpbmUuICBXZSBkbyB0aGUgc2FtZSB3aXRoIGBi
ZWcnCkBAIC0yNTIsNyArMjgzLDcgQEAgdmlzdWFsLXdyYXAtcHJlZml4LWZ1bmN0aW9uCiAg
ICAgICAgIDs7IElmIHNvLCB3ZSBjYW4gYXBwbHkgb3VyIHZpc3VhbCB3cmFwcGluZyBwcm9w
ZXJ0aWVzIHRvIHRoaXMKICAgICAgICAgOzsgbGluZSBhbmQgY29udGludWUgdG8gdGhlIG5l
eHQgbGluZS4KICAgICAgICAgKHByb2duCi0gICAgICAgICAgKHZpc3VhbC13cmFwLS1hcHBs
eS10by1saW5lIChwb2ludCkpCisgICAgICAgICAgKHZpc3VhbC13cmFwLS1hcHBseS10by1s
aW5lIChwb2ludCkgcmVtb3ZlKQogICAgICAgICAgIChmb3J3YXJkLWxpbmUpKQogICAgICAg
OzsgT3RoZXJ3aXNlLCBza2lwIGFoZWFkIHVudGlsIHRoZSBlbmQgb2YgYW55IHVuc2FmZSBk
aXNwbGF5CiAgICAgICA7OyBwcm9wZXJ0aWVzLiAgTk9URTogV2UgZG8gdGhpcyBvdXQgb2Yg
YW4gYWJ1bmRhbmNlIG9mIGNhdXRpb24gdG8KQEAgLTI5MCw3ICszMjEsNyBAQCB2aXN1YWwt
d3JhcC1wcmVmaXgtbW9kZQogICAgICh3aXRoLXNpbGVudC1tb2RpZmljYXRpb25zCiAgICAg
ICAoc2F2ZS1yZXN0cmljdGlvbgogICAgICAgICAod2lkZW4pCi0gICAgICAgIChyZW1vdmUt
dGV4dC1wcm9wZXJ0aWVzIChwb2ludC1taW4pIChwb2ludC1tYXgpICcod3JhcC1wcmVmaXgg
bmlsKSkpKSkpCisgICAgICAgICh2aXN1YWwtd3JhcC1wcmVmaXgtZnVuY3Rpb24gKHBvaW50
LW1pbikgKHBvaW50LW1heCkgdCkpKSkpCiAKIDs7OyMjI2F1dG9sb2FkCiAoZGVmaW5lLWds
b2JhbGl6ZWQtbWlub3ItbW9kZSBnbG9iYWwtdmlzdWFsLXdyYXAtcHJlZml4LW1vZGUKZGlm
ZiAtLWdpdCBhL3Rlc3QvbGlzcC92aXN1YWwtd3JhcC10ZXN0cy5lbCBiL3Rlc3QvbGlzcC92
aXN1YWwtd3JhcC10ZXN0cy5lbAppbmRleCBkM2ZhYTEyODYzNy4uYjkzZTNlNjdkODQgMTAw
NjQ0Ci0tLSBhL3Rlc3QvbGlzcC92aXN1YWwtd3JhcC10ZXN0cy5lbAorKysgYi90ZXN0L2xp
c3AvdmlzdWFsLXdyYXAtdGVzdHMuZWwKQEAgLTE0OSw0ICsxNDksMTkgQEAgdmlzdWFsLXdy
YXAtdGVzdHMvd3JhcC1wcmVmaXgtc3RpY2tpbmVzcwogICAgICAgICAgICAgICAgMiAyNSAo
IHdyYXAtcHJlZml4IChzcGFjZSA6YWxpZ24tdG8gKDIgLiB3aWR0aCkpCiAgICAgICAgICAg
ICAgICAgICAgICAgcmVhci1ub25zdGlja3kgKHdyYXAtcHJlZml4KSkpKSkpKQogCisoZXJ0
LWRlZnRlc3QgdmlzdWFsLXdyYXAtdGVzdHMvY2xlYW51cCAoKQorICAiVGVzdCB0aGF0IGRl
YWN0aXZhdGluZyBgdmlzdWFsLXdyYXAtcHJlZml4LW1vZGUnIGNsZWFucyB1cCB0ZXh0IHBy
b3BlcnRpZXMuIgorICAod2l0aC10ZW1wLWJ1ZmZlcgorICAgIChpbnNlcnQgIiogaGVsbG9c
biogaGkiKQorICAgICh2aXN1YWwtd3JhcC1wcmVmaXgtZnVuY3Rpb24gKHBvaW50LW1pbikg
KHBvaW50LW1heCkpCisgICAgOzsgTWFrZSBzdXJlIHdlJ3ZlIGFkZGVkIHRoZSB2aXN1YWwt
d3JhcHBpbmcgcHJvcGVydGllcy4KKyAgICAoc2hvdWxkIChlcXVhbCAodGV4dC1wcm9wZXJ0
aWVzLWF0IChwb2ludC1taW4pKQorICAgICAgICAgICAgICAgICAgICcoIHJlYXItbm9uc3Rp
Y2t5ICh3cmFwLXByZWZpeCkKKyAgICAgICAgICAgICAgICAgICAgICB3cmFwLXByZWZpeCAo
c3BhY2UgOmFsaWduLXRvICgyIC4gd2lkdGgpKQorICAgICAgICAgICAgICAgICAgICAgIGRp
c3BsYXkgKG1pbi13aWR0aCAoKDIgLiB3aWR0aCkpKSkpKQorICAgICh2aXN1YWwtd3JhcC1w
cmVmaXgtbW9kZSAtMSkKKyAgICAoc2hvdWxkIChlcXVhbC1pbmNsdWRpbmctcHJvcGVydGll
cworICAgICAgICAgICAgIChidWZmZXItc3RyaW5nKQorICAgICAgICAgICAgICIqIGhlbGxv
XG4qIGhpIikpKSkKKwogOzsgdmlzdWFsLXdyYXAtdGVzdHMuZWwgZW5kcyBoZXJlCi0tIAoy
LjI1LjEKCg==
--------------zxm1lJbVUMBSJcKKElMPNqUo--
bug-gnu-emacs@HIDDEN:bug#76018; Package emacs.
Full text available.
Received: (at 76018) by debbugs.gnu.org; 27 May 2025 00:11:28 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon May 26 20:11:27 2025
Received: from localhost ([127.0.0.1]:33948 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1uJhug-0000aD-TC
for submit <at> debbugs.gnu.org; Mon, 26 May 2025 20:11:27 -0400
Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]:50287)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.84_2) (envelope-from <jporterbugs@HIDDEN>)
id 1uJhue-0000Zh-92
for 76018 <at> debbugs.gnu.org; Mon, 26 May 2025 20:11:25 -0400
Received: by mail-pf1-x432.google.com with SMTP id
d2e1a72fcca58-74267c68c11so1703453b3a.0
for <76018 <at> debbugs.gnu.org>; Mon, 26 May 2025 17:11:24 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1748304677; x=1748909477; darn=debbugs.gnu.org;
h=in-reply-to:from:references:to:content-language:subject
:mime-version:date:message-id:from:to:cc:subject:date:message-id
:reply-to; bh=FFTK/p/hflkLgbcDtP+/hyE29cqxMuBZP9dGlUlEI+4=;
b=P/hguTESZ0ASZzr5YMqXag37VHY73ttPquhxxqlqx3tLRO3t8QSvu+U43plJ6y9/s0
SgrtW3JcVy1s6meecVhPUuf2kye1PJ1rosdtdBwm7eYO8zfurlCClhj54YqfS3S7WfRc
Zv43VcsXkEQ7qhHu/DtG6pGnvRuPJpUMcZay6KK5VIiHCfnwN/hAz4Dp4q6e84hD+wno
LW6RNz6pbEOOqaErVJrWavZruUaN3+jAhYLWZ4HCFblwwaKYIRNI8NJvgZnuHSfblTki
lM6VSaxyucg1+AhZ1NIMrp0cwdOC27wfHCq3giNylY+SccmZpRAjb3+JdpyQY26EZ1cs
3NMw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1748304677; x=1748909477;
h=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=FFTK/p/hflkLgbcDtP+/hyE29cqxMuBZP9dGlUlEI+4=;
b=ldkUSGDUOq8BqLi+jphRym+5VrQXWAuV8ZdumkBNzmIEXxN6xXGhHo6jDtZZ0buES7
5exZvbqvNDinhnekZce1c6wfns0VTBAI2oWOn8IJlD161bQp86JH9GSpm1NP9DCUDOEB
1Hp2QZB98u2TsdzsMfwlABe5M5hLtMbRrPW6v6LLiNdUQRAUQSNXa5RipiwCdDt/5xqm
2k+yEfgCL4h97NnNsGL7Js1019BaBsB72nkCEdXJeh3SMR8ffdsYUZjEiDOGGBiGbTn4
e7Ua4Bqkg61B1utmJ5lAMPJnHxrPXIOz9frVKRaJqVZQAIQ4sLBksbvipRkc7aQhvVHa
Ftaw==
X-Forwarded-Encrypted: i=1;
AJvYcCX89mrNL2dMyOCz4LNliL/g/+Tkd+weIEXITr1udqv72y9+AlUw+jr6AjijqAD4jXsKG9Z+RQ==@debbugs.gnu.org
X-Gm-Message-State: AOJu0YxeCerNy45drQ6ZzVDUayFjf4ox6dJLB/8Z6OHt/UVKEhsgriUo
Ps3ohZtie6WvnsSte+WqFSfhiCruWvSvn/GU5dkIWQp88cAVHf7mSQlq
X-Gm-Gg: ASbGnctHDJ4mYF1BYJufDeqv+vDZIbjUXdDZXWBMnRpgPpMZmsSh7BKK1gaHSERYu85
myQ005nvewAYi+hVo5kbVnxdRADYWeo/8eKBSoXEkN1y+ZHTRIwNOXv6V9cYqeZK3sJeyzZfH+v
hWJAufv2w09WaYnhxwfPCh1nz3aoZ6WJjbT5z4Wd8b2eND/ciUDZUhYW8Wzie8f7nbysKH1htcE
asMlFo8xEmj/pulaHYAcjQEy8vJ9yHDBBnllF0B/nLHOy/7fVdITaAWG/HXJqMIheJffjbUYZq2
JjhT8NiYUWqtc7eBMC/6nvLlHK8qPXv9Z8pPa1HDLLErYpxErq5RD3ELmFHEV0pvzP6w74w2/3E
pU0fLlR0yIjo6FZzVPrYIYa3z+AmE8M8=
X-Google-Smtp-Source: AGHT+IGoZ4z2DD6cD8+mAk38JFHBWtxjGVZrDyPFu6s6rmEypiMGj0qkSUh2B5eLJprCfExZsQntew==
X-Received: by 2002:a05:6a20:439e:b0:1f5:9208:3ac7 with SMTP id
adf61e73a8af0-2188c3b333amr18991210637.41.1748304676961;
Mon, 26 May 2025 17:11:16 -0700 (PDT)
Received: from [192.168.1.2] (syn-076-168-144-128.res.spectrum.com.
[76.168.144.128]) by smtp.googlemail.com with ESMTPSA id
41be03b00d2f7-b2c36cc91c6sm1799569a12.19.2025.05.26.17.11.15
(version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
Mon, 26 May 2025 17:11:16 -0700 (PDT)
Content-Type: multipart/mixed; boundary="------------VK2YKFBsYHgWfBQVTmS0xsUp"
Message-ID: <9b10777c-6b8c-2b2e-c906-b2d797dece00@HIDDEN>
Date: Mon, 26 May 2025 17:11:15 -0700
MIME-Version: 1.0
Subject: Re: bug#76018: 31.0.50; wrap-prefix properties from
visual-wrap-prefix-mode proliferate
Content-Language: en-US
To: =?UTF-8?Q?K=c3=a9vin_Le_Gouguec?= <kevin.legouguec@HIDDEN>,
76018 <at> debbugs.gnu.org, eliz@HIDDEN
References: <87a5b42q33.fsf@HIDDEN>
From: Jim Porter <jporterbugs@HIDDEN>
In-Reply-To: <87a5b42q33.fsf@HIDDEN>
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 76018
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
This is a multi-part message in MIME format.
--------------VK2YKFBsYHgWfBQVTmS0xsUp
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
On 2/2/2025 9:50 AM, Kévin Le Gouguec wrote:
> Heya!
>
> To reproduce from emacs -Q:
>
> C-x b repro
> M-x visual-wrap-prefix-mode
> - first line of [words…]
> RET
> RET
> second line of [words…]
> C-o
>
> Expectation: continuation lines for the "second line of [words…]" should
> not have any indentation.
> Observation: text on that second line has these properties:
>
> There are text properties here:
> fontified t
> wrap-prefix (space :align-to (2 . width))
>
> (NB: "C-o" in the recipe ensures there is a character at point,
> otherwise "C-u C-x =" shows nothing on account of being at EOB)
>
> Denoting "hard spaces" (buffer text) with "·" and "visual spaces"
> (visual-wrap-prefix-mode decoration) with " ", text thus wraps like
> this:
>
> -·first·line·of·
> words·words
>
> second·line·of
> words·words
>
> Not sure what the right fix is; having just learned about text property
> "stickiness", I can at least work around the issue with…
>
> (push '(wrap-prefix . t) text-property-default-nonsticky)
>
> … but I have not dogfooded this much yet.
Attached is a patch with a test for this, relying on the
'rear-nonsticky' text property.
Eli, what do you think? I've also moved an internal Eshell utility
function ('eshell--append-text-property') to subr-x.el, since it would
be useful for the visual-wrap code. I've updated the manual and NEWS to
mention this function as well so that others can use it if they like.
--------------VK2YKFBsYHgWfBQVTmS0xsUp
Content-Type: text/plain; charset=UTF-8;
name="0001-Make-wrap-prefix-nonsticky-when-using-visual-wrap-pr.patch"
Content-Disposition: attachment;
filename*0="0001-Make-wrap-prefix-nonsticky-when-using-visual-wrap-pr.pa";
filename*1="tch"
Content-Transfer-Encoding: base64
RnJvbSBhYWVmNzQ2NWI0OGM3OGY4ODA5OThmNDc0ZTkxMjk3ZmFlYmE4NTExIE1vbiBTZXAg
MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j
b20+CkRhdGU6IE1vbiwgMjYgTWF5IDIwMjUgMTY6NTc6MjUgLTA3MDAKU3ViamVjdDogW1BB
VENIXSBNYWtlICd3cmFwLXByZWZpeCcgbm9uc3RpY2t5IHdoZW4gdXNpbmcKICd2aXN1YWwt
d3JhcC1wcmVmaXgtbW9kZScKCiogbGlzcC9lc2hlbGwvZW0tcHJvbXB0LmVsIChlc2hlbGwt
LWFwcGVuZC10ZXh0LXByb3BlcnR5KTogTW92ZSBmcm9tCmhlcmUuLi4KKiBsaXNwL2VtYWNz
LWxpc3Avc3Vici14LmVsIChhcHBlbmQtdGV4dC1wcm9wZXJ0eSk6IC4uLiB0byBoZXJlLiAg
VXBkYXRlCmNhbGxlcnMuCgoqIGxpc3AvdmlzdWFsLXdyYXAuZWwgKHZpc3VhbC13cmFwLS1h
cHBseS10by1saW5lKTogVXNlCidhcHBlbmQtdGV4dC1wcm9wZXJ0eScuCgoqIHRlc3QvbGlz
cC92aXN1YWwtd3JhcC10ZXN0cy5lbCAodmlzdWFsLXdyYXAtdGVzdHMvc2ltcGxlKQoodmlz
dWFsLXdyYXAtdGVzdHMvc2FmZS1kaXNwbGF5KQoodmlzdWFsLXdyYXAtdGVzdHMvdW5zYWZl
LWRpc3BsYXkvd2l0aGluLWxpbmUpOiBVcGRhdGUgdGVzdHMuCih2aXN1YWwtd3JhcC10ZXN0
cy93cmFwLXByZWZpeC1zdGlja2luZXNzKTogTmV3IHRlc3QuCgoqIGRvYy9saXNwcmVmL3Rl
eHQudGV4aSAoQ2hhbmdpbmcgUHJvcGVydGllcyk6IERvY3VtZW50CidhcHBlbmQtdGV4dC1w
cm9wZXJ0eScuCgoqIGV0Yy9ORVdTOiBBbm5vdW5jZSAnYXBwZW5kLXRleHQtcHJvcGVydHkn
IChidWcjNzYwMTgpLgotLS0KIGRvYy9saXNwcmVmL3RleHQudGV4aSAgICAgICAgICB8ICA3
ICsrKysrCiBldGMvTkVXUyAgICAgICAgICAgICAgICAgICAgICAgfCAgNiArKysrKwogbGlz
cC9lbWFjcy1saXNwL3N1YnIteC5lbCAgICAgIHwgMTQgKysrKysrKysrKwogbGlzcC9lc2hl
bGwvZW0tcHJvbXB0LmVsICAgICAgIHwgMTcgKystLS0tLS0tLS0tCiBsaXNwL3Zpc3VhbC13
cmFwLmVsICAgICAgICAgICAgfCAgNyArKysrLQogdGVzdC9saXNwL3Zpc3VhbC13cmFwLXRl
c3RzLmVsIHwgNDkgKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLQogNiBmaWxl
cyBjaGFuZ2VkLCA3NiBpbnNlcnRpb25zKCspLCAyNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1n
aXQgYS9kb2MvbGlzcHJlZi90ZXh0LnRleGkgYi9kb2MvbGlzcHJlZi90ZXh0LnRleGkKaW5k
ZXggNzViMmIxYzNkNjAuLjQ3MWJhMjllYmEyIDEwMDY0NAotLS0gYS9kb2MvbGlzcHJlZi90
ZXh0LnRleGkKKysrIGIvZG9jL2xpc3ByZWYvdGV4dC50ZXhpCkBAIC0zMTM3LDYgKzMxMzcs
MTMgQEAgQ2hhbmdpbmcgUHJvcGVydGllcwogQGVuZCBleGFtcGxlCiBAZW5kIGRlZnVuCiAK
K0BkZWZ1biBhcHBlbmQtdGV4dC1wcm9wZXJ0eSBzdGFydCBlbmQgcHJvcCB2YWx1ZXMgJm9w
dGlvbmFsIG9iamVjdAorVGhpcyBmdW5jdGlvbiBhcHBlbmRzIGEgbGlzdCBvZiBAdmFye3Zh
bHVlc30gdG8gdGhlIEB2YXJ7cHJvcH0gcHJvcGVydHkKK2ZvciB0aGUgdGV4dCBiZXR3ZWVu
IEB2YXJ7c3RhcnR9IGFuZCBAdmFye2VuZH0gaW4gdGhlIHN0cmluZyBvciBidWZmZXIKK0B2
YXJ7b2JqZWN0fS4gIElmIEB2YXJ7b2JqZWN0fSBpcyBAY29kZXtuaWx9LCBpdCBkZWZhdWx0
cyB0byB0aGUgY3VycmVudAorYnVmZmVyLgorQGVuZCBkZWZ1bgorCiBAZGVmdW4gcmVtb3Zl
LXRleHQtcHJvcGVydGllcyBzdGFydCBlbmQgcHJvcHMgJm9wdGlvbmFsIG9iamVjdAogVGhp
cyBmdW5jdGlvbiBkZWxldGVzIHNwZWNpZmllZCB0ZXh0IHByb3BlcnRpZXMgZnJvbSB0aGUg
dGV4dCBiZXR3ZWVuCiBAdmFye3N0YXJ0fSBhbmQgQHZhcntlbmR9IGluIHRoZSBzdHJpbmcg
b3IgYnVmZmVyIEB2YXJ7b2JqZWN0fS4gIElmCmRpZmYgLS1naXQgYS9ldGMvTkVXUyBiL2V0
Yy9ORVdTCmluZGV4IDMzYjA0MjcyMGI1Li5lMDc4OGI0MjFhMSAxMDA2NDQKLS0tIGEvZXRj
L05FV1MKKysrIGIvZXRjL05FV1MKQEAgLTIzMzksNiArMjMzOSwxMiBAQCBUaGlzICdkaXNw
bGF5JyBwcm9wZXJ0eSB3YXMgcHJldmlvdXNseSBzdXBwb3J0ZWQgb25seSBhcyB0ZXh0IHBy
b3BlcnR5LgogTm93IG92ZXJsYXlzIGNhbiBhbHNvIGhhdmUgdGhpcyBwcm9wZXJ0eSwgd2l0
aCB0aGUgc2FtZSBlZmZlY3QgZm9yIHRoZQogdGV4dCAiY292ZXJlZCIgYnkgdGhlIG92ZXJs
YXkuCiAKKysrKworKiogTmV3IGZ1bmN0aW9uICdhcHBlbmQtdGV4dC1wcm9wZXJ0eScuCitU
aGlzIGZ1bmN0aW9uIGFwcGVuZHMgYSBsaXN0IG9mIHZhbHVlcyB0byBhIHRleHQgcHJvcGVy
dHkgZm9yIHRoZQorc3BlY2lmaWVkIHJlZ2lvbiBvZiB0ZXh0LCBwcmVzZXJ2aW5nIGFueSB2
YWx1ZXMgYWxyZWFkeSBzZXQgZm9yIHRoYXQKK3Byb3BlcnR5LgorCiArKysKICoqIE5ldyBt
YWNybyAnY29uZConLgogVGhlIG5ldyBtYWNybyAnY29uZConIGlzIGFuIGFsdGVybmF0aXZl
IHRvICdjb25kJyBhbmQgJ3BjYXNlJy4KZGlmZiAtLWdpdCBhL2xpc3AvZW1hY3MtbGlzcC9z
dWJyLXguZWwgYi9saXNwL2VtYWNzLWxpc3Avc3Vici14LmVsCmluZGV4IGVhYTgxMTllYWQ3
Li43NzczODI2NWYyNSAxMDA2NDQKLS0tIGEvbGlzcC9lbWFjcy1saXNwL3N1YnIteC5lbAor
KysgYi9saXNwL2VtYWNzLWxpc3Avc3Vici14LmVsCkBAIC00MTYsNiArNDE2LDIwIEBAIHN0
cmluZy1nbHlwaC1zcGxpdAogICAgICAgICAoc2V0cSBzdGFydCAoMSsgc3RhcnQpKSkpCiAg
ICAgKG5yZXZlcnNlIHJlc3VsdCkpKQogCis7OzsjIyNhdXRvbG9hZAorKGRlZnVuIGFwcGVu
ZC10ZXh0LXByb3BlcnR5IChzdGFydCBlbmQgcHJvcCB2YWx1ZXMgJm9wdGlvbmFsIG9iamVj
dCkKKyAgIkFwcGVuZCBhIGxpc3Qgb2YgdmFsdWVzIHRvIGEgdGV4dCBwcm9wZXJ0eSBmcm9t
IFNUQVJUIHRvIEVORC4KK1BST1AgaXMgdGhlIHRleHQgcHJvcGVydHkgdG8gYXBwZW5kIHRv
LCBhbmQgVkFMVUVTIGlzIHRoZSBsaXN0IG9mCitwcm9wZXJ0eSB2YWx1ZXMgdG8gYXBwZW5k
LiAgT0JKRUNUIGlzIHRoZSBvYmplY3QgdG8gcHJvcGVydGl6ZSwgYXMgd2l0aAorYHB1dC10
ZXh0LXByb3BlcnR5JyAod2hpY2ggc2VlKS4iCisgIChsZXQgKG5leHQpCisgICAgKHdoaWxl
ICg8IHN0YXJ0IGVuZCkKKyAgICAgIChzZXRxIG5leHQgKG5leHQtc2luZ2xlLXByb3BlcnR5
LWNoYW5nZSBzdGFydCBwcm9wIG9iamVjdCBlbmQpKQorICAgICAgKHB1dC10ZXh0LXByb3Bl
cnR5IHN0YXJ0IG5leHQgcHJvcAorICAgICAgICAgICAgICAgICAgICAgICAgIChhcHBlbmQg
KGdldC10ZXh0LXByb3BlcnR5IHN0YXJ0IHByb3Agb2JqZWN0KSB2YWx1ZXMpCisgICAgICAg
ICAgICAgICAgICAgICAgICAgb2JqZWN0KQorICAgICAgKHNldHEgc3RhcnQgbmV4dCkpKSkK
KwogOzs7IyMjYXV0b2xvYWQKIChkZWZ1biBhZGQtZGlzcGxheS10ZXh0LXByb3BlcnR5IChz
dGFydCBlbmQgcHJvcCB2YWx1ZQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICZvcHRpb25hbCBvYmplY3QpCmRpZmYgLS1naXQgYS9saXNwL2VzaGVsbC9lbS1w
cm9tcHQuZWwgYi9saXNwL2VzaGVsbC9lbS1wcm9tcHQuZWwKaW5kZXggMTUyMDA0NWQwNjMu
LjY1NzY4ZGU4MmJiIDEwMDY0NAotLS0gYS9saXNwL2VzaGVsbC9lbS1wcm9tcHQuZWwKKysr
IGIvbGlzcC9lc2hlbGwvZW0tcHJvbXB0LmVsCkBAIC0xMTksMTkgKzExOSw2IEBAIGVzaGVs
bC1wcm9tcHQtaW5pdGlhbGl6ZQogICAgIChhZGQtaG9vayAnZXNoZWxsLXBvc3QtY29tbWFu
ZC1ob29rICdlc2hlbGwtZW1pdC1wcm9tcHQgbmlsIHQpCiAgICAgKGVzaGVsbC1wcm9tcHQt
bW9kZSkpKQogCi0oZGVmdW4gZXNoZWxsLS1hcHBlbmQtdGV4dC1wcm9wZXJ0eSAoc3RhcnQg
ZW5kIHByb3AgdmFsdWUgJm9wdGlvbmFsIG9iamVjdCkKLSAgIkFwcGVuZCB0byBhIHRleHQg
cHJvcGVydHkgZnJvbSBTVEFSVCB0byBFTkQuCi1QUk9QIGlzIHRoZSB0ZXh0IHByb3BlcnR5
IHRvIGFwcGVuZCB0bywgYW5kIFZBTFVFIGlzIHRoZSBsaXN0IG9mCi1wcm9wZXJ0eSB2YWx1
ZXMgdG8gYXBwZW5kLiAgT0JKRUNUIGlzIHRoZSBvYmplY3QgdG8gcHJvcGVydGl6ZSwgYXMg
d2l0aAotYHB1dC10ZXh0LXByb3BlcnR5JyAod2hpY2ggc2VlKS4iCi0gIChsZXQgKG5leHQp
Ci0gICAgKHdoaWxlICg8IHN0YXJ0IGVuZCkKLSAgICAgIChzZXRxIG5leHQgKG5leHQtc2lu
Z2xlLXByb3BlcnR5LWNoYW5nZSBzdGFydCBwcm9wIG9iamVjdCBlbmQpKQotICAgICAgKHB1
dC10ZXh0LXByb3BlcnR5IHN0YXJ0IG5leHQgcHJvcAotICAgICAgICAgICAgICAgICAgICAg
ICAgIChhcHBlbmQgKGdldC10ZXh0LXByb3BlcnR5IHN0YXJ0IHByb3Agb2JqZWN0KSB2YWx1
ZSkKLSAgICAgICAgICAgICAgICAgICAgICAgICBvYmplY3QpCi0gICAgICAoc2V0cSBzdGFy
dCBuZXh0KSkpKQotCiAoZGVmdW4gZXNoZWxsLWVtaXQtcHJvbXB0ICgpCiAgICJFbWl0IGEg
cHJvbXB0IGlmIGVzaGVsbCBpcyBiZWluZyB1c2VkIGludGVyYWN0aXZlbHkuIgogICAod2hl
biAoYm91bmRwICdhbnNpLWNvbG9yLWNvbnRleHQtcmVnaW9uKQpAQCAtMTQ3LDggKzEzNCw4
IEBAIGVzaGVsbC1lbWl0LXByb21wdAogICAgICAgICAoYWRkLXRleHQtcHJvcGVydGllcwog
ICAgICAgICAgMCBsZW4gJyhyZWFkLW9ubHkgdCBmb250LWxvY2stZmFjZSBlc2hlbGwtcHJv
bXB0KSBwcm9tcHQpCiAgICAgICAgIChzZXRxIHN0aWNreS1wcm9wcyBgKHJlYWQtb25seSBm
b250LWxvY2stZmFjZSAuICxzdGlja3ktcHJvcHMpKSkKLSAgICAgIChlc2hlbGwtLWFwcGVu
ZC10ZXh0LXByb3BlcnR5IDAgbGVuICdmcm9udC1zdGlja3kgc3RpY2t5LXByb3BzIHByb21w
dCkKLSAgICAgIChlc2hlbGwtLWFwcGVuZC10ZXh0LXByb3BlcnR5IDAgbGVuICdyZWFyLW5v
bnN0aWNreSBzdGlja3ktcHJvcHMgcHJvbXB0KQorICAgICAgKGFwcGVuZC10ZXh0LXByb3Bl
cnR5IDAgbGVuICdmcm9udC1zdGlja3kgc3RpY2t5LXByb3BzIHByb21wdCkKKyAgICAgIChh
cHBlbmQtdGV4dC1wcm9wZXJ0eSAwIGxlbiAncmVhci1ub25zdGlja3kgc3RpY2t5LXByb3Bz
IHByb21wdCkKICAgICAgIChlc2hlbGwtaW50ZXJhY3RpdmUtZmlsdGVyIG5pbCBwcm9tcHQp
KSkKICAgKHJ1bi1ob29rcyAnZXNoZWxsLWFmdGVyLXByb21wdC1ob29rKSkKIApkaWZmIC0t
Z2l0IGEvbGlzcC92aXN1YWwtd3JhcC5lbCBiL2xpc3AvdmlzdWFsLXdyYXAuZWwKaW5kZXgg
YjkyMWUxZjA1NDkuLmVmNjE5YzlmMTc3IDEwMDY0NAotLS0gYS9saXNwL3Zpc3VhbC13cmFw
LmVsCisrKyBiL2xpc3AvdmlzdWFsLXdyYXAuZWwKQEAgLTE2NSw3ICsxNjUsMTIgQEAgdmlz
dWFsLXdyYXAtLWFwcGx5LXRvLWxpbmUKICAgICAgICBwb3NpdGlvbiAocG9zLWVvbCkgJ3dy
YXAtcHJlZml4CiAgICAgICAgKGlmIChudW1iZXJwIG5leHQtbGluZS1wcmVmaXgpCiAgICAg
ICAgICAgIGAoc3BhY2UgOmFsaWduLXRvICgsbmV4dC1saW5lLXByZWZpeCAuIHdpZHRoKSkK
LSAgICAgICAgIG5leHQtbGluZS1wcmVmaXgpKSkpKQorICAgICAgICAgbmV4dC1saW5lLXBy
ZWZpeCkpCisgICAgICA7OyBNYWtlIHN1cmUgdGhhdCB3aGVuIHR5cGluZyBhdCB0aGUgZW5k
IG9mIGEgbGluZSB3aXRoCisgICAgICA7OyBgd3JhcC1wcmVmaXgnIHNldCwgd2UgZG9uJ3Qg
Y29udGludWUgdGhhdCBwcm9wZXJ0eSBvdmVyCisgICAgICA7OyBzdWJzZXF1ZW50IGxpbmVz
LiAgU2VlIGJ1ZyM3NjAxOC4KKyAgICAgIChhcHBlbmQtdGV4dC1wcm9wZXJ0eSBwb3NpdGlv
biAocG9zLWVvbCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAncmVhci1ub25zdGlj
a3kgJyh3cmFwLXByZWZpeCkpKSkpCiAKIChkZWZ1biB2aXN1YWwtd3JhcC0tY29udGVudC1w
cmVmaXggKHByZWZpeCBwb3NpdGlvbikKICAgIkdldCB0aGUgbmV4dC1saW5lIHByZWZpeCBm
b3IgdGhlIHNwZWNpZmllZCBmaXJzdC1saW5lIFBSRUZJWC4KZGlmZiAtLWdpdCBhL3Rlc3Qv
bGlzcC92aXN1YWwtd3JhcC10ZXN0cy5lbCBiL3Rlc3QvbGlzcC92aXN1YWwtd3JhcC10ZXN0
cy5lbAppbmRleCAwNDk3N2FmZTIwNy4uMmEyYTE2ZWI4ZDUgMTAwNjQ0Ci0tLSBhL3Rlc3Qv
bGlzcC92aXN1YWwtd3JhcC10ZXN0cy5lbAorKysgYi90ZXN0L2xpc3AvdmlzdWFsLXdyYXAt
dGVzdHMuZWwKQEAgLTM3LDExICszNywxNSBAQCB2aXN1YWwtd3JhcC10ZXN0cy9zaW1wbGUK
ICAgICAgICAgICAgICAoYnVmZmVyLXN0cmluZykKICAgICAgICAgICAgICAjKCJncmVldGlu
Z3NcbiogaGVsbG9cbiogaGkiCiAgICAgICAgICAgICAgICAxMCAxMiAoIHdyYXAtcHJlZml4
IChzcGFjZSA6YWxpZ24tdG8gKDIgLiB3aWR0aCkpCi0gICAgICAgICAgICAgICAgICAgICAg
IGRpc3BsYXkgKG1pbi13aWR0aCAoKDIgLiB3aWR0aCkpKSkKLSAgICAgICAgICAgICAgIDEy
IDE3ICggd3JhcC1wcmVmaXggKHNwYWNlIDphbGlnbi10byAoMiAuIHdpZHRoKSkpCisgICAg
ICAgICAgICAgICAgICAgICAgIGRpc3BsYXkgKG1pbi13aWR0aCAoKDIgLiB3aWR0aCkpKQor
ICAgICAgICAgICAgICAgICAgICAgICByZWFyLW5vbnN0aWNreSAod3JhcC1wcmVmaXgpKQor
ICAgICAgICAgICAgICAgMTIgMTcgKCB3cmFwLXByZWZpeCAoc3BhY2UgOmFsaWduLXRvICgy
IC4gd2lkdGgpKQorICAgICAgICAgICAgICAgICAgICAgICByZWFyLW5vbnN0aWNreSAod3Jh
cC1wcmVmaXgpKQogICAgICAgICAgICAgICAgMTggMjAgKCB3cmFwLXByZWZpeCAoc3BhY2Ug
OmFsaWduLXRvICgyIC4gd2lkdGgpKQotICAgICAgICAgICAgICAgICAgICAgICBkaXNwbGF5
IChtaW4td2lkdGggKCgyIC4gd2lkdGgpKSkpCi0gICAgICAgICAgICAgICAyMCAyMiAoIHdy
YXAtcHJlZml4IChzcGFjZSA6YWxpZ24tdG8gKDIgLiB3aWR0aCkpKSkpKSkpCisgICAgICAg
ICAgICAgICAgICAgICAgIGRpc3BsYXkgKG1pbi13aWR0aCAoKDIgLiB3aWR0aCkpKQorICAg
ICAgICAgICAgICAgICAgICAgICByZWFyLW5vbnN0aWNreSAod3JhcC1wcmVmaXgpKQorICAg
ICAgICAgICAgICAgMjAgMjIgKCB3cmFwLXByZWZpeCAoc3BhY2UgOmFsaWduLXRvICgyIC4g
d2lkdGgpKQorICAgICAgICAgICAgICAgICAgICAgICByZWFyLW5vbnN0aWNreSAod3JhcC1w
cmVmaXgpKSkpKSkpCiAKIChlcnQtZGVmdGVzdCB2aXN1YWwtd3JhcC10ZXN0cy9zYWZlLWRp
c3BsYXkgKCkKICAgIlRlc3QgYWRkaW5nIHdyYXBwaW5nIHByb3BlcnRpZXMgdG8gdGV4dCB3
aXRoIHNhZmUgZGlzcGxheSBwcm9wZXJ0aWVzLiIKQEAgLTUyLDkgKzU2LDExIEBAIHZpc3Vh
bC13cmFwLXRlc3RzL3NhZmUtZGlzcGxheQogICAgICAgICAgICAgIChidWZmZXItc3RyaW5n
KQogICAgICAgICAgICAgICMoIiogaGVsbG8iCiAgICAgICAgICAgICAgICAwIDIgKCB3cmFw
LXByZWZpeCAoc3BhY2UgOmFsaWduLXRvICgyIC4gd2lkdGgpKQotICAgICAgICAgICAgICAg
ICAgICAgZGlzcGxheSAobWluLXdpZHRoICgoMiAuIHdpZHRoKSkpKQorICAgICAgICAgICAg
ICAgICAgICAgZGlzcGxheSAobWluLXdpZHRoICgoMiAuIHdpZHRoKSkpCisgICAgICAgICAg
ICAgICAgICAgICByZWFyLW5vbnN0aWNreSAod3JhcC1wcmVmaXgpKQogICAgICAgICAgICAg
ICAgMiA3ICggd3JhcC1wcmVmaXggKHNwYWNlIDphbGlnbi10byAoMiAuIHdpZHRoKSkKLSAg
ICAgICAgICAgICAgICAgICAgIGRpc3BsYXkgKHJhaXNlIDEpKSkpKSkpCisgICAgICAgICAg
ICAgICAgICAgICBkaXNwbGF5IChyYWlzZSAxKQorICAgICAgICAgICAgICAgICAgICAgcmVh
ci1ub25zdGlja3kgKHdyYXAtcHJlZml4KSkpKSkpKQogCiAoZXJ0LWRlZnRlc3QgdmlzdWFs
LXdyYXAtdGVzdHMvdW5zYWZlLWRpc3BsYXkvd2l0aGluLWxpbmUgKCkKICAgIlRlc3QgYWRk
aW5nIHdyYXBwaW5nIHByb3BlcnRpZXMgdG8gdGV4dCB3aXRoIHVuc2FmZSBkaXNwbGF5IHBy
b3BlcnRpZXMuCkBAIC02Nyw5ICs3MywxMSBAQCB2aXN1YWwtd3JhcC10ZXN0cy91bnNhZmUt
ZGlzcGxheS93aXRoaW4tbGluZQogICAgICAgICAgICAgIChidWZmZXItc3RyaW5nKQogICAg
ICAgICAgICAgICMoIiogW2ltZ10iCiAgICAgICAgICAgICAgICAwIDIgKCB3cmFwLXByZWZp
eCAoc3BhY2UgOmFsaWduLXRvICgyIC4gd2lkdGgpKQotICAgICAgICAgICAgICAgICAgICAg
ZGlzcGxheSAobWluLXdpZHRoICgoMiAuIHdpZHRoKSkpKQorICAgICAgICAgICAgICAgICAg
ICAgZGlzcGxheSAobWluLXdpZHRoICgoMiAuIHdpZHRoKSkpCisgICAgICAgICAgICAgICAg
ICAgICByZWFyLW5vbnN0aWNreSAod3JhcC1wcmVmaXgpKQogICAgICAgICAgICAgICAgMiA3
ICggd3JhcC1wcmVmaXggKHNwYWNlIDphbGlnbi10byAoMiAuIHdpZHRoKSkKLSAgICAgICAg
ICAgICAgICAgICAgIGRpc3BsYXkgKGltYWdlIDp0eXBlIGJtcCkpKSkpKSkKKyAgICAgICAg
ICAgICAgICAgICAgIGRpc3BsYXkgKGltYWdlIDp0eXBlIGJtcCkKKyAgICAgICAgICAgICAg
ICAgICAgIHJlYXItbm9uc3RpY2t5ICh3cmFwLXByZWZpeCkpKSkpKSkKIAogKGVydC1kZWZ0
ZXN0IHZpc3VhbC13cmFwLXRlc3RzL3Vuc2FmZS1kaXNwbGF5L3NwYW5uaW5nLWxpbmVzICgp
CiAgICJUZXN0IGFkZGluZyB3cmFwcGluZyBwcm9wZXJ0aWVzIHRvIHRleHQgd2l0aCB1bnNh
ZmUgZGlzcGxheSBwcm9wZXJ0aWVzLgpAQCAtMTE3LDQgKzEyNSwyOSBAQCB2aXN1YWwtd3Jh
cC10ZXN0cy91bnNhZmUtZGlzcGxheS9tdWx0aXBsZS0yCiAgICAgICAgICAgICAgIDAgNCAo
ZGlzcGxheSAoKGltYWdlIDp0eXBlIGJtcCkpKQogICAgICAgICAgICAgICA0IDggKGRpc3Bs
YXkgKChpbWFnZSA6dHlwZSBibXApIChoZWlnaHQgMS41KSkpKSkpKSkKIAorKGVydC1kZWZ0
ZXN0IHZpc3VhbC13cmFwLXRlc3RzL3dyYXAtcHJlZml4LXN0aWNraW5lc3MgKCkKKyAgIlRl
c3QgdGhhdCBgd3JhcC1wcmVmaXgnIGRvZXNuJ3QgcGVyc2lzdCBhY3Jvc3MgbXVsdGlwbGUg
bGluZXMgd2hlbiB0eXBpbmcuCitTZWUgYnVnIzc2MDE4LiIKKyAgKHdpdGgtdGVtcC1idWZm
ZXIKKyAgICAoaW5zZXJ0ICIqIHRoaXMgem9vIGNvbnRhaW5zIGdvYXRzIikKKyAgICAodmlz
dWFsLXdyYXAtcHJlZml4LWZ1bmN0aW9uIChwb2ludC1taW4pIChwb2ludC1tYXgpKQorICAg
IChzaG91bGQgKGVxdWFsLWluY2x1ZGluZy1wcm9wZXJ0aWVzCisgICAgICAgICAgICAgKGJ1
ZmZlci1zdHJpbmcpCisgICAgICAgICAgICAgIygiKiB0aGlzIHpvbyBjb250YWlucyBnb2F0
cyIKKyAgICAgICAgICAgICAgIDAgIDIgKCB3cmFwLXByZWZpeCAoc3BhY2UgOmFsaWduLXRv
ICgyIC4gd2lkdGgpKQorICAgICAgICAgICAgICAgICAgICAgIGRpc3BsYXkgKG1pbi13aWR0
aCAoKDIgLiB3aWR0aCkpKQorICAgICAgICAgICAgICAgICAgICAgIHJlYXItbm9uc3RpY2t5
ICh3cmFwLXByZWZpeCkpCisgICAgICAgICAgICAgICAyIDI1ICggd3JhcC1wcmVmaXggKHNw
YWNlIDphbGlnbi10byAoMiAuIHdpZHRoKSkKKyAgICAgICAgICAgICAgICAgICAgICByZWFy
LW5vbnN0aWNreSAod3JhcC1wcmVmaXgpKSkpKQorICAgIChpbnNlcnQtYW5kLWluaGVyaXQg
IlxuXG5pdCBhbHNvIGNvbnRhaW5zIHBhbmRhcyIpCisgICAgKHNob3VsZCAoZXF1YWwtaW5j
bHVkaW5nLXByb3BlcnRpZXMKKyAgICAgICAgICAgICAoYnVmZmVyLXN0cmluZykKKyAgICAg
ICAgICAgICAjKCIqIHRoaXMgem9vIGNvbnRhaW5zIGdvYXRzXG5cbml0IGFsc28gY29udGFp
bnMgcGFuZGFzIgorICAgICAgICAgICAgICAgMCAgMiAoIHdyYXAtcHJlZml4IChzcGFjZSA6
YWxpZ24tdG8gKDIgLiB3aWR0aCkpCisgICAgICAgICAgICAgICAgICAgICAgZGlzcGxheSAo
bWluLXdpZHRoICgoMiAuIHdpZHRoKSkpCisgICAgICAgICAgICAgICAgICAgICAgcmVhci1u
b25zdGlja3kgKHdyYXAtcHJlZml4KSkKKyAgICAgICAgICAgICAgIDIgMjUgKCB3cmFwLXBy
ZWZpeCAoc3BhY2UgOmFsaWduLXRvICgyIC4gd2lkdGgpKQorICAgICAgICAgICAgICAgICAg
ICAgIHJlYXItbm9uc3RpY2t5ICh3cmFwLXByZWZpeCkpKSkpCisgICAgKSkKKwogOzsgdmlz
dWFsLXdyYXAtdGVzdHMuZWwgZW5kcyBoZXJlCi0tIAoyLjI1LjEKCg==
--------------VK2YKFBsYHgWfBQVTmS0xsUp--
bug-gnu-emacs@HIDDEN:bug#76018; Package emacs.
Full text available.
Received: (at 76018) by debbugs.gnu.org; 4 Feb 2025 19:37:29 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Feb 04 14:37:28 2025
Received: from localhost ([127.0.0.1]:46746 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tfOjg-0007jG-HB
for submit <at> debbugs.gnu.org; Tue, 04 Feb 2025 14:37:28 -0500
Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:38444)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.84_2) (envelope-from <kevin.legouguec@HIDDEN>)
id 1tfOje-0007iq-6x
for 76018 <at> debbugs.gnu.org; Tue, 04 Feb 2025 14:37:26 -0500
Received: by mail-wm1-x32d.google.com with SMTP id
5b1f17b1804b1-436203f1203so7882035e9.2
for <76018 <at> debbugs.gnu.org>; Tue, 04 Feb 2025 11:37:26 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1738697840; x=1739302640; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:user-agent:message-id:date
:references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=LISkqXvy6buvRTRviyat+XZ//5i8yYwD9rbqcnGBN8w=;
b=dsO3RTSl3y34JEU4nPM2zi0qdwqD+CugKqr7E1ZiP0txrhhT5po+pWQK5jDvhX28wq
gDz9ZI56ZM3JXTvmtSgcj1GX0eJLNRqtWUralZYo1xcpXG058YynC3+pvDGfTt1BlaTv
e6xGcNSYd1yhlx0KJ0xEJ1J9tvjQ4cEuqotgh4sqEFpSONA8dCprgFusRQ/wooF2owVK
5i0JA+sq09xV3JqfE2jrTDpTt185vcBDDFCO646VJjcuJoMULg65ulA3DjGumj1vKVUC
bIIhxxZVbuiod3uTfp/X6avL6Lfu8eMexCebq+wOcPphNiiujc/dtOTswM/lyH6btmqP
qqtg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1738697840; x=1739302640;
h=content-transfer-encoding:mime-version:user-agent:message-id:date
:references:in-reply-to:subject:cc:to:from:x-gm-message-state:from
:to:cc:subject:date:message-id:reply-to;
bh=LISkqXvy6buvRTRviyat+XZ//5i8yYwD9rbqcnGBN8w=;
b=el+vbfp2w4OYxKu+m5wp0UnwogPh+kB3SVzHqo+ej50U5OUAmWPICW3x/i4FbLjcA0
Yb1wNQjcnVhopLlnnUyb4Fx6PSDr/a+66AH1dtmRFAGnrwS8QPkSVwtzPlzkloTqaXXS
DFdTBrtKEyh9fTAKmAhxedJ7YsAck/azm5Syz+MntG4yZiMPyocsZNI/cEZtwh00UamH
5efHeM7Ki5xf6YKzzWk3dNLVtlLN6b/08JqxREDeFc0+ImsRssoyQdXZuHd+NmbR0Jjq
2Gnv7ukU9kO9NM7AWq7vaNw53mTRALH75dTOJRBhLJuJdz9LV9QydYfo8eqcvUN/0jXm
yLrg==
X-Gm-Message-State: AOJu0YwYSUpmoFjLUr7BEB0xhcT9LTrZjwkuvwKtjAbGh/beBrax/9fz
jg7uwzszd6R44lwE5xR3NoONvmROl/VduBRzjap1sXNrjhVgbMalZOG1Sg==
X-Gm-Gg: ASbGncue9Y8CdGa1r/vtER1tp2ie7E1QKb1s7doSYTdWnydXnqkcNzgXlYzAKevThwh
igWH+QHBNR9yWkWukkyFqAXEI81Zsl63hRa560EPhvBGA6vrKWMhgExDjrVg2MVIEortPHeQTOb
SgnKc+OfvgrDfihd//ZjE3P8LWlH3t1cgIGNTO7WUIR8JKgKG6Rj1yceaD1eNfVmxGvQ5GTytEl
tytmEIiYUyRC9PBiPutky/0+8wbqnJLBVsxNDNB1MY3P0OhhZ8FOGkaW5Hoc4sovyam8JHo/Jb7
Fdooj5cRpBAHhHyAYSw=
X-Google-Smtp-Source: AGHT+IGqXqC/WpE8n8BTw4bfOkNfxb4WktRyHnUOnKspgkDyRqpZZ+Qy+x0Rw/1J6SBXwkMSqCwSOQ==
X-Received: by 2002:a05:600c:1d1b:b0:42c:b55f:f4f with SMTP id
5b1f17b1804b1-438e1837a5bmr82561465e9.6.1738697839374;
Tue, 04 Feb 2025 11:37:19 -0800 (PST)
Received: from amdahl30 ([2a01:e0a:253:fe0:2ef0:5dff:fed2:7b49])
by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-438e236f9bfsm205879325e9.0.2025.02.04.11.37.17
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 04 Feb 2025 11:37:18 -0800 (PST)
From: =?utf-8?Q?K=C3=A9vin_Le_Gouguec?= <kevin.legouguec@HIDDEN>
To: Jim Porter <jporterbugs@HIDDEN>
Subject: Re: bug#76018: 31.0.50; wrap-prefix properties from
visual-wrap-prefix-mode proliferate
In-Reply-To: <86r04ei4cz.fsf@HIDDEN> (=?utf-8?Q?=22K=C3=A9vin?=
Le Gouguec"'s message of "Tue, 04 Feb 2025 07:57:48 +0100")
References: <87a5b42q33.fsf@HIDDEN>
<2f92f6fe-6669-ea0f-ce0e-9b264a1167f3@HIDDEN>
<86r04ei4cz.fsf@HIDDEN>
Date: Tue, 04 Feb 2025 20:37:17 +0100
Message-ID: <87bjvha4cy.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 76018
Cc: 76018 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
K=C3=A9vin Le Gouguec <kevin.legouguec@HIDDEN> writes:
> Jim Porter <jporterbugs@HIDDEN> writes:
>
>> On 2/2/2025 9:50 AM, K=C3=A9vin Le Gouguec wrote:
>>> Expectation: continuation lines for the "second line of [words=E2=80=A6=
]" should
>>> not have any indentation.
>>> Observation: text on that second line has these properties:
>>> There are text properties here:
>>> fontified t
>>> wrap-prefix (space :align-to (2 . width))
>>
>> Do you know if this is a recent regression, or if it's been this way sin=
ce visual-wrap-prefix-mode was merged into Emacs? I've made a bunch of chan=
ges to the mode relatively recently, but the wrap-prefix part is mostly the=
same as before, aside from some different methods to calculate the width.
>
> Barring methodological errors, a smoketest using adaptive-wrap (0.8)
> suggests that it did not have this bug; the text properties on the
> second line are:
>
> There are text properties here:
> fontified t
> wrap-prefix ""
>
> That's all I have for now; can try to bisect later!
After checking that 2024-01-27 "Import ELPA package adaptive-wrap as
visual-wrap" (6667d6c19c3) is "good" too, I got a bisection going -
testing each step after 'make bootstrap'. Results:
$ git bisect start HEAD 6667d6c19c3934871ed54d89dc153efc72f947de -- lis=
p/visual-wrap.el
Bisecting: 7 revisions left to test after this (roughly 3 steps)
[b86bc02096c65517b9a29c20635ece100864fc62] Introduce a global variant o=
f visual-wrap-prefix-mode
$ git bisect good
Bisecting: 3 revisions left to test after this (roughly 2 steps)
[55aad592e177dc2c503ebe9ad2a46e227683315e] Improve computation of inden=
t depth in SHR and 'visual-wrap-prefix-mode'
$ git bisect bad
Bisecting: 1 revision left to test after this (roughly 1 step)
[135da3556bb34bb20a01e02b30bc949c1a45b6cd] Be more careful about aligni=
ng prefix lines in 'visual-wrap-prefix-mode'
$ git bisect bad
Bisecting: 0 revisions left to test after this (roughly 0 steps)
[f70a6ea0ea86ef461e40d20664a75a92d02679ea] Add support for variable-pit=
ch fonts in 'visual-wrap-prefix-mode'
$ git bisect bad
f70a6ea0ea86ef461e40d20664a75a92d02679ea is the first bad commit
commit f70a6ea0ea86ef461e40d20664a75a92d02679ea (HEAD)
Author: Jim Porter <jporterbugs@HIDDEN>
Date: Sat Jul 27 20:48:38 2024 -0700
Add support for variable-pitch fonts in 'visual-wrap-prefix-mode'
* lisp/emacs-lisp/subr-x.el (string-pixel-width): Allow passing BUF=
FER
to use the face remappings from that buffer when calculating the wi=
dth.
* lisp/visual-wrap.el (visual-wrap--prefix): Rename to...
(visual-wrap--adjust-prefix): ... this, and support PREFIX as a num=
ber.
(visual-wrap-fill-context-prefix): Make obsolete in favor of...
(visual-wrap--content-prefix): ... this.
(visual-wrap-prefix-function): Extract inside of loop into...
(visual-wrap--apply-to-line): ... this.
* doc/lispref/display.texi (Size of Displayed Text): Update
documentation for 'string-pixel-width'.
* etc/NEWS: Announce this change.
doc/lispref/display.texi | 6 +++--
etc/NEWS | 12 +++++++++
lisp/emacs-lisp/subr-x.el | 11 +++++++--
lisp/visual-wrap.el | 113 ++++++++++++++++++++++++++++++++++++++=
+++++++++++++++++++---------------------------
4 files changed, 102 insertions(+), 40 deletions(-)
Have not delved into the diff yet.
bug-gnu-emacs@HIDDEN:bug#76018; Package emacs.
Full text available.
Received: (at 76018) by debbugs.gnu.org; 4 Feb 2025 06:58:00 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Feb 04 01:58:00 2025
Received: from localhost ([127.0.0.1]:42337 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tfCsh-0002Zc-Tt
for submit <at> debbugs.gnu.org; Tue, 04 Feb 2025 01:58:00 -0500
Received: from mail-lf1-x129.google.com ([2a00:1450:4864:20::129]:40326)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.84_2) (envelope-from <kevin.legouguec@HIDDEN>)
id 1tfCsf-0002ZM-Ds
for 76018 <at> debbugs.gnu.org; Tue, 04 Feb 2025 01:57:57 -0500
Received: by mail-lf1-x129.google.com with SMTP id
2adb3069b0e04-543f33ff283so589368e87.1
for <76018 <at> debbugs.gnu.org>; Mon, 03 Feb 2025 22:57:57 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1738652271; x=1739257071; darn=debbugs.gnu.org;
h=content-transfer-encoding:mime-version:user-agent:message-id
:in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject
:date:message-id:reply-to;
bh=szbnlBax9DJBxXCRNih/UwaYbqQcaRMk9lqU94EsnHw=;
b=mO2hiM9W30To4SqDU7aZ5F9ms9Byj3V3GX556uRJIC0h+Tcc7mD/XtJZLeFS7xtFP/
xTdUVmafVQLHiTEvSrNhuUtl2WX2MbEUKp0GSTjGXcR860yzbS6B2pWDB/VKOd8d6wFV
YhM+MhZ9f4bllHTrk0TJ7CY06vH1ZAOEzDG2qBDj8rpEc09A0E97l0nHzRhsxE76nG3U
NSuc2HZs9vVOMvd0OswzPopGG1sFwuozSnnDaJUGJ8oVKxQpxWPNbGskr8dDiDntX7XW
HG0jX15IPxFID7wBOzicMt+M0g3Jc5oxJ8miOI9qo+PGBczwli6cwGqNzWNjdui5qorB
/yng==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1738652271; x=1739257071;
h=content-transfer-encoding:mime-version:user-agent:message-id
:in-reply-to:date:references:subject:cc:to:from:x-gm-message-state
:from:to:cc:subject:date:message-id:reply-to;
bh=szbnlBax9DJBxXCRNih/UwaYbqQcaRMk9lqU94EsnHw=;
b=uKorm9xpCsv38K9g7ZfWNe79WjvxeJEGSOcXuOeXl9WEEXsn8YCpZkKElnAW0pNgsR
MrU/puiDhrlvtwsjWDiK8AD8+Iqfu1RJxsmwcIPjLml3vbm5nJHTQM8M/WodwEz9XAjw
QdPf9FC1qOBY0dQK217Pfx3cq3m0vAmGKHcr/Gg/KgEEA8W/hOpqZnBWX6RBu9vze1M4
DzBVnKTfkEM7/SVoCw3re8vsGl9FkC+0JdsInv6vHHvwoUu8bueHNqhGQICiPMaA5C8m
+nDv/Ho3sjld2TaxQUw9SGgVElgVmvCiqoWsNkKiBHovUFlKDySg+qjmT1jmjFakbeFW
soUQ==
X-Gm-Message-State: AOJu0YwnHGnW7jVBe14ixOnjG7Q0xKWVThvWBm18RnG11QEI7d1mTYK/
m0UhITNH82jZZ82Qixa/ah3uqTjz5qJuJP7oyOVH4hhlLTbAvHDuXD1Qbg==
X-Gm-Gg: ASbGncuLDMoV+h/wmvXtb3FNRVSlRFzsLVAsbx7sYNtUSAwFPtU21lkK/TlmQiMo0Te
VlP3P6bVtAXCUe0ZrX8Ln2IPQDN4iDuTGjwDk0X4jvveD4o6z0346SNgDRRhZO9p5FMIe8JrsR+
9cjVuyKco/WsR5LjaymXBfa0D/CaNgB6ZJWruUCeiiL5C7zoKgXlNg05ijjH02ucC8aZ3NtWHno
8uKFQQoh0dhKnWaXOqsWgHvO0VZL4cjKMyuYlYft+OYiGz6V4JPh3jD+2ekYVd5O2WrehlXMHYo
kFaeewL/N+LANdD3U/YAkhtf3rvDU+fGCthqo7F28J4VrPTn
X-Google-Smtp-Source: AGHT+IGpoJJJEsEiZW5pq8Iqn42hfLkG4OGw6PwqxIqS+zqo/hCb4S63yst0hW9eJHtoG76JSGoSxQ==
X-Received: by 2002:a05:6512:3406:b0:540:1c9f:ff0c with SMTP id
2adb3069b0e04-543ffa51c84mr237394e87.13.1738652270356;
Mon, 03 Feb 2025 22:57:50 -0800 (PST)
Received: from kevinlegouguec.net (kevinlegouguec.net. [151.80.149.237])
by smtp.gmail.com with ESMTPSA id
2adb3069b0e04-543ebeb0ad9sm1492751e87.115.2025.02.03.22.57.48
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 03 Feb 2025 22:57:49 -0800 (PST)
From: =?utf-8?Q?K=C3=A9vin_Le_Gouguec?= <kevin.legouguec@HIDDEN>
To: Jim Porter <jporterbugs@HIDDEN>
Subject: Re: bug#76018: 31.0.50; wrap-prefix properties from
visual-wrap-prefix-mode proliferate
References: <87a5b42q33.fsf@HIDDEN>
<2f92f6fe-6669-ea0f-ce0e-9b264a1167f3@HIDDEN>
Date: Tue, 04 Feb 2025 07:57:48 +0100
In-Reply-To: <2f92f6fe-6669-ea0f-ce0e-9b264a1167f3@HIDDEN> (Jim Porter's
message of "Mon, 3 Feb 2025 14:41:58 -0800")
Message-ID: <86r04ei4cz.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 76018
Cc: 76018 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Jim Porter <jporterbugs@HIDDEN> writes:
> On 2/2/2025 9:50 AM, K=C3=A9vin Le Gouguec wrote:
>> Expectation: continuation lines for the "second line of [words=E2=80=A6]=
" should
>> not have any indentation.
>> Observation: text on that second line has these properties:
>> There are text properties here:
>> fontified t
>> wrap-prefix (space :align-to (2 . width))
>
> Do you know if this is a recent regression, or if it's been this way sinc=
e visual-wrap-prefix-mode was merged into Emacs? I've made a bunch of chang=
es to the mode relatively recently, but the wrap-prefix part is mostly the =
same as before, aside from some different methods to calculate the width.
Barring methodological errors, a smoketest using adaptive-wrap (0.8)
suggests that it did not have this bug; the text properties on the
second line are:
There are text properties here:
fontified t
wrap-prefix ""
That's all I have for now; can try to bisect later!
bug-gnu-emacs@HIDDEN:bug#76018; Package emacs.
Full text available.Received: (at 76018) by debbugs.gnu.org; 3 Feb 2025 22:42:08 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Feb 03 17:42:07 2025 Received: from localhost ([127.0.0.1]:41720 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tf58p-0004kn-Nz for submit <at> debbugs.gnu.org; Mon, 03 Feb 2025 17:42:07 -0500 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]:50523) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <jporterbugs@HIDDEN>) id 1tf58n-0004kF-42 for 76018 <at> debbugs.gnu.org; Mon, 03 Feb 2025 17:42:05 -0500 Received: by mail-pj1-x102f.google.com with SMTP id 98e67ed59e1d1-2ee86a1a92dso6679060a91.1 for <76018 <at> debbugs.gnu.org>; Mon, 03 Feb 2025 14:42:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738622519; x=1739227319; 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=TP2yaHmiI99mlyYS1z9WsJOtKvTiIG9rGji/DJsFx9k=; b=a5taB2G9TRPE2rVebUsS8DjiHoi42PjfqVmGdwyWQjCaTTZAxLsGvyM1Zgz/AV8U2h gBKAJ4oYuMu7u6He1KloF7JfimElxOBQNWOJ/4XN/pwCz2Fjy54Iue45RwfLEd4Zn4UQ nqwkE0+irHRHoUfXoF5skK9hDnRTS4zf7EazV5CB9NstUmMn3m98Tw4Ru8Fb0td3VUc1 H2S4bgTQ1gTl+ejp9CG019U7nH3g3edSm+X3cPiQioAU9iH87qFVjFGXDw4EIlz4Ki91 ltW6URGR50XVUZISm2CwjmpJTuG8699ie95hGeJw3V9H28YOTB1gzfvFh0mszIUoq/FH A9cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738622519; x=1739227319; 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=TP2yaHmiI99mlyYS1z9WsJOtKvTiIG9rGji/DJsFx9k=; b=kRKS0VdBay408sUFXAKknKqBl4KH3Ey2Tj0rWiCfYCBOsNQIvJQ1SsBMgD34kkJMRq yVjMkGVUVo4lT7YzOpHR6PAU2yclSMVKBa6+mDG03CcQCaT5RxgmT3sYPuJlzOyuBONX tfEr72Yb/VlOUUAnN4ecmNRy57fsyXa5zLW87wZJm/SCtCCcv/tOHd3gOGrz/z1ZJLDn sBcgOU97nntA5aIEkRh8tD5heh3m4rR5oXF4gJk8jofz1QAEfSqu7SPU6uaq4Qvso4cM UyfnSMC/DQElBL/co8ScjkzhfDswDKRiz4Ty6wPcZw4A+noIan4W5l17Xw5a7YoYVbrj OyUQ== X-Forwarded-Encrypted: i=1; AJvYcCXVc18J84BDw6bx5n8veGxjcls+HsM5BZAj+8LvUm9WzFeWEeT8mbp2Mw3wnf/t6NCW/XdYVw==@debbugs.gnu.org X-Gm-Message-State: AOJu0Yyn9Rb4JaA69FjoQ25Y/qGbd6OF9YlSJaI5pIHb++xih63L2p/F 4++61IqdSW6v4jRoIuKr5UY0g2siqyGMpxKLMrDmW4JPUNO+69EV X-Gm-Gg: ASbGncv3yg0SC85eARqq9jLGZG+iTbTHdeb5Bk4bLj2GpWQao8wmTCyN5ZxbNMoQ9gr qbk14+53nfxCEnsgCIqKjq7RA6gMd0JFx3qI+P1vW2CtOWGLTfi9c3NIJNLA53hRjpQ/6Al473n LnbpQYRxOkkX5vQZmDpKgC0LRsWGRNzhu/wX1JF7+EuUyDr7k+ygN0egoz1mh46SucbU1c73xA3 Qjbj2b1ZeIgqSVWwGwzcQNBvoBL4YOrMuYOSp/BSc1boKrcC5K7942XQ+23VPwRNW4gMvYeMbCg rx7wA6q5oW2E9Qdmi2ldwRQ5IN3VfwNUzr4m/aQX4bu04onw2ep75gvLIPmFz2jamSxx X-Google-Smtp-Source: AGHT+IEmLuOVysCpcewSACYWv5O6K8py6qKaSCBvsO6lG6nRetAcgt/KvsUUMVi6xqbStow7fhNGpA== X-Received: by 2002:a17:90b:5387:b0:2ee:5111:a54b with SMTP id 98e67ed59e1d1-2f83ac8ad6emr32345331a91.31.1738622518947; Mon, 03 Feb 2025 14:41:58 -0800 (PST) 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-2f84897a290sm10645241a91.1.2025.02.03.14.41.58 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 03 Feb 2025 14:41:58 -0800 (PST) Message-ID: <2f92f6fe-6669-ea0f-ce0e-9b264a1167f3@HIDDEN> Date: Mon, 3 Feb 2025 14:41:58 -0800 MIME-Version: 1.0 Subject: Re: bug#76018: 31.0.50; wrap-prefix properties from visual-wrap-prefix-mode proliferate Content-Language: en-US To: =?UTF-8?Q?K=c3=a9vin_Le_Gouguec?= <kevin.legouguec@HIDDEN>, 76018 <at> debbugs.gnu.org References: <87a5b42q33.fsf@HIDDEN> From: Jim Porter <jporterbugs@HIDDEN> In-Reply-To: <87a5b42q33.fsf@HIDDEN> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 76018 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) On 2/2/2025 9:50 AM, Kévin Le Gouguec wrote: > Expectation: continuation lines for the "second line of [words…]" should > not have any indentation. > Observation: text on that second line has these properties: > > There are text properties here: > fontified t > wrap-prefix (space :align-to (2 . width)) Do you know if this is a recent regression, or if it's been this way since visual-wrap-prefix-mode was merged into Emacs? I've made a bunch of changes to the mode relatively recently, but the wrap-prefix part is mostly the same as before, aside from some different methods to calculate the width.
bug-gnu-emacs@HIDDEN:bug#76018; Package emacs.
Full text available.
Received: (at submit) by debbugs.gnu.org; 2 Feb 2025 17:50:54 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Feb 02 12:50:54 2025
Received: from localhost ([127.0.0.1]:36182 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tee7S-0002h8-3y
for submit <at> debbugs.gnu.org; Sun, 02 Feb 2025 12:50:54 -0500
Received: from lists.gnu.org ([2001:470:142::17]:41428)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <kevin.legouguec@HIDDEN>)
id 1tee7P-0002gk-DK
for submit <at> debbugs.gnu.org; Sun, 02 Feb 2025 12:50:52 -0500
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 <kevin.legouguec@HIDDEN>)
id 1tee7J-0005Or-Ql
for bug-gnu-emacs@HIDDEN; Sun, 02 Feb 2025 12:50:45 -0500
Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <kevin.legouguec@HIDDEN>)
id 1tee7I-0005Ys-4q
for bug-gnu-emacs@HIDDEN; Sun, 02 Feb 2025 12:50:45 -0500
Received: by mail-wr1-x432.google.com with SMTP id
ffacd0b85a97d-385e971a2a0so197652f8f.1
for <bug-gnu-emacs@HIDDEN>; Sun, 02 Feb 2025 09:50:43 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1738518642; x=1739123442; darn=gnu.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:to
:from:from:to:cc:subject:date:message-id:reply-to;
bh=WfOit+35NzyU4k2KDPDfISOA/tFOy07Mk/TiXRJUE0E=;
b=AB7g3WnEKsmBmSuoatrNO884iUWnb9hxgi3580pHVoYa41asQw6Hp5YbULqFHMnlVk
aLIGmStLNyOLKA0zBc0DP9YVA1lSoWo49jZ8FYBCVrOTnkI/k9/9Q5YMeE7G/Biv+fVt
DpCBaQ1QcPw02fkbTFomWfpsi9Weu8SbA9NyXf6NC08CPPPSZyBH12dIEb7tRIUJTfVT
Gi/DrM4rT/cxUw9Y5Gn3NN5vC3AbvI2c0bjvOY5Wqg6fz624lLPbjiRN9P4l7v/TT2Za
dbkCUNFaBIqmqCREnXKYTounakbaX2eoPPOCZymEpavI+K856VJhWmmnn3NwqiJ09piG
B76w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1738518642; x=1739123442;
h=content-transfer-encoding:mime-version:message-id:date:subject:to
:from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
bh=WfOit+35NzyU4k2KDPDfISOA/tFOy07Mk/TiXRJUE0E=;
b=RgrggemP46g5xnyWy1uFAITBxEedr9KixGSbMLOpzfAvq8amQ8tQOzHhBO3sXZG5m+
lQHCBJlRFBcGVdSgjAHdPjCjhlshlNLtko4ffAUwJgr7jAfz3TBqUkkYfDqi2TstAI/t
wmEZ3aI0/8uoWiN5Vg/LX9SxHO1+xXMopBnpdiuvh3wdnFN1pULkmHpNocTf2wZ+kyyu
R4S2ghJ6+/duzUZWRdd6UKdEu/Bbi55ZRW0WyFHzcJoROQWq3MrtNSxO9aIGOZU4uzFr
KS4CI24SKEXhbE3K6lmSxX9gxTGW3P51XulROCCsCOAwyHet3nImCuf37fz9imAZdgIg
kwEQ==
X-Gm-Message-State: AOJu0YzXx5BUyZNvlpT4vDkvRtLxj1vjzAmhs3HDgxiizGNoXSB4Gdqg
AjUbSFqtJXICaiidqkq5xTl7wDMdhQ8AoA333sveMjLZ7cRJjtsXMHH7cg==
X-Gm-Gg: ASbGncvZjDOQ0VV+hKOC/YTPrt1t0oEMrJPb39+QKOXbNzsqixL1x5TSf3hn7HwaLJi
u9xL1OXzD1lj/GL3idTJbiSILTbcQTp1X5DLgaZ56TcnIKJwFk/qisNirmj/lFHNTHM7wnh774g
A+VUSoo3kVFnhwxotkDBSW4YVEpmTEHSZsptIR1kNt9n9TfleV2BxexGH1vy7JBDgbeGScz9AcB
zCxMwlyzz5aHmfRy7zCbY2BHmvW/NoPhYKdKrfGkUtnr0r4PPvzXWfNLNDvAyugNLAbQTPkGZd+
3mIMee7erz75f90+N58=
X-Google-Smtp-Source: AGHT+IHmOgigCReVboDIdKisiDBLCZeF5QsPd7bCXH/uTDK+wLzSVP67PQzKxAGczpQhtw411wNf5g==
X-Received: by 2002:a05:6000:1544:b0:38d:9e86:2b24 with SMTP id
ffacd0b85a97d-38d9e862bb7mr321777f8f.8.1738518642293;
Sun, 02 Feb 2025 09:50:42 -0800 (PST)
Received: from amdahl30 ([2a01:e0a:253:fe0:2ef0:5dff:fed2:7b49])
by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-438dcc13139sm161888015e9.3.2025.02.02.09.50.41
for <bug-gnu-emacs@HIDDEN>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 02 Feb 2025 09:50:41 -0800 (PST)
From: =?utf-8?Q?K=C3=A9vin_Le_Gouguec?= <kevin.legouguec@HIDDEN>
To: bug-gnu-emacs@HIDDEN
Subject: 31.0.50; wrap-prefix properties from visual-wrap-prefix-mode
proliferate
X-Debbugs-Cc: Jim Porter <jporterbugs@HIDDEN>
Date: Sun, 02 Feb 2025 18:50:40 +0100
Message-ID: <87a5b42q33.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass client-ip=2a00:1450:4864:20::432;
envelope-from=kevin.legouguec@HIDDEN; helo=mail-wr1-x432.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-Spam-Score: 1.0 (+)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.0 (/)
Heya!
To reproduce from emacs -Q:
C-x b repro
M-x visual-wrap-prefix-mode
- first line of [words=E2=80=A6]
RET
RET
second line of [words=E2=80=A6]
C-o
Expectation: continuation lines for the "second line of [words=E2=80=A6]" s=
hould
not have any indentation.
Observation: text on that second line has these properties:
There are text properties here:
fontified t
wrap-prefix (space :align-to (2 . width))
(NB: "C-o" in the recipe ensures there is a character at point,
otherwise "C-u C-x =3D" shows nothing on account of being at EOB)
Denoting "hard spaces" (buffer text) with "=C2=B7" and "visual spaces"
(visual-wrap-prefix-mode decoration) with " ", text thus wraps like
this:
-=C2=B7first=C2=B7line=C2=B7of=C2=B7
words=C2=B7words
second=C2=B7line=C2=B7of
words=C2=B7words
Not sure what the right fix is; having just learned about text property
"stickiness", I can at least work around the issue with=E2=80=A6
(push '(wrap-prefix . t) text-property-default-nonsticky)
=E2=80=A6 but I have not dogfooded this much yet.
Thanks for your time!
In GNU Emacs 31.0.50 (build 1, x86_64-pc-linux-gnu, GTK+ Version
3.24.43, cairo version 1.18.2) of 2025-01-18 built on amdahl30
Repository revision: 840057bb1bfc05a52519793c620d729688ea1d8f
Repository branch: master
Windowing system distributor 'SUSE LINUX', version 11.0.12401004
System Description: openSUSE Tumbleweed
Configured using:
'configure --prefix=3D/home/peniblec/apps/.emacs.2025-01-18 --with-cairo
--with-native-compilation=3Dno --with-sqlite3 --with-xinput2'
Configured features:
ACL CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GPM GSETTINGS HARFBUZZ JPEG
LCMS2 LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 M17N_FLT MODULES NOTIFY
INOTIFY PDUMPER PNG RSVG SECCOMP SOUND SQLITE3 THREADS TIFF
TOOLKIT_SCROLL_BARS TREE_SITTER WEBP X11 XDBE XIM XINPUT2 XPM GTK3 ZLIB
Important settings:
value of $LC_TIME: en_GB.UTF-8
value of $LANG: en_US.UTF-8
locale-coding-system: utf-8-unix
Kévin Le Gouguec <kevin.legouguec@HIDDEN>:jporterbugs@HIDDEN, bug-gnu-emacs@HIDDEN.
Full text available.jporterbugs@HIDDEN, bug-gnu-emacs@HIDDEN:bug#76018; Package emacs.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.