From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Juanma Barranquero Newsgroups: gmane.emacs.devel Subject: Re: master 49192e9: Strip "(fn...)" from output of `describe-mode' (bug#38222) Date: Sat, 23 Nov 2019 22:12:27 +0100 Message-ID: References: <20191119101930.28082.63466@vcs0.savannah.gnu.org> <20191119101931.EA4E2209BF@vcs0.savannah.gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="000000000000f84726059809fef0" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="121649"; mail-complaints-to="usenet@blaine.gmane.org" Cc: Emacs developers To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 23 22:13:18 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iYciT-000VWy-DW for ged-emacs-devel@m.gmane.org; Sat, 23 Nov 2019 22:13:17 +0100 Original-Received: from localhost ([::1]:32794 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iYciS-0004jN-BF for ged-emacs-devel@m.gmane.org; Sat, 23 Nov 2019 16:13:16 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:55842) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iYciK-0004ig-Tf for emacs-devel@gnu.org; Sat, 23 Nov 2019 16:13:10 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iYciJ-0006Z7-EU for emacs-devel@gnu.org; Sat, 23 Nov 2019 16:13:08 -0500 Original-Received: from mail-qv1-xf2d.google.com ([2607:f8b0:4864:20::f2d]:39596) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iYciI-0006YY-C4 for emacs-devel@gnu.org; Sat, 23 Nov 2019 16:13:07 -0500 Original-Received: by mail-qv1-xf2d.google.com with SMTP id v16so4269342qvq.6 for ; Sat, 23 Nov 2019 13:13:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=36GbdN1dCtc5SvyXT8MYNh1bHMhpEJnqtKQdUFU7mUA=; b=DZtfeM4knTa07ov7jCs7R2Xmxpzo+0uTskWfpLHqEv6Au/mWPyBvdrlumLPzjfn7Vl d7sb4lDMuTIZn9gdcdCitGBMg6OOZZHxizrYtyciCTlfOThQ7D2fXY1c6AV6UwUtY16O sj/W5XaLC24TSr2DSmd36oD19iYCM+ewEW4KHnSxiINN2Yg5427VlMQN+QrCJgIru6He i1TQE59FkL/u7ae6Q0umSEYMxXWsdIQSCj87Aa+AWkxnYSfMxNM0XjD0k9KeAPGNSJeh WQyNkF+CJd3lvVASxQ24gxaLEvojbxbxqjeLIJQPH1hgE8y9NeOT+q6e3QOWlZTdlnam tn4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=36GbdN1dCtc5SvyXT8MYNh1bHMhpEJnqtKQdUFU7mUA=; b=LfgFtHMXSgcfUpejBnMASkI75bZuPKdm7N54HWDPbvo+yLfonjZVIRVKNH2KPv8tYc 1BZKKXcfQY3tBP6/NwMkJibEjq4vVOVYvL+NhpRFB0AMesWGyEgkphYsSKpXydUqumBj AHQZzXm8hBB1CBWpnS06ZLdQxFVE2sbh5FtFhWCET5RFTruzlr1Er7+YSCqNxBeYpAzh Ljp2fZrNgF2wO9oMHcZfQHzt2dUrNt4/Fda6OvQHDPjzvjVFbkoayLq+PilvoFqCqKSt 0eDEy31eu1tGu/jHjuaDE1QgCP0JNhzIhn1htD20akMqZmPGU1bdMIup2aWhWOe7ccKO JteQ== X-Gm-Message-State: APjAAAWBkmMcn01acIwcBTYNccWcD3yDI7YrSrKcFXdrLqRpVQT7J6hE TEYeeyAsoNEdOo5mUu+LYHUuT5qZy0/oFU+8+fp8ezsU X-Google-Smtp-Source: APXvYqwNG5C6bwwwxoTUOaYa+zQ38Mkzc/Pzrg137f8+FSdeU6Q1TrxqSYAco3bvza0eRFF/CCF0zXlwU8HlmIph6PI= X-Received: by 2002:a05:6214:1427:: with SMTP id o7mr20865149qvx.83.1574543583348; Sat, 23 Nov 2019 13:13:03 -0800 (PST) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::f2d X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:242662 Archived-At: --000000000000f84726059809fef0 Content-Type: multipart/alternative; boundary="000000000000f84722059809feee" --000000000000f84722059809feee Content-Type: text/plain; charset="UTF-8" On Fri, Nov 22, 2019 at 10:45 PM Stefan Monnier wrote: > And if it's just t it could always return a pair. > Sounds good. Please take a look. The patches do not include info changes, because help-split-fundoc is not documented. Should this change, once accepted, be mentioned in NEWS? BTW, other than the discussed new feature, I've added the following tiny, sort of incompatible change: Before: - DEF = non-symbol => usage = "(anonymous ARGS...)" - DEF = symbol s => usage = "(s ARGS...)" Now: - DEF = non-symbol OR nil => "(anonymous ARGS...)" - DEF = other symbol s => "(s ARGS...)" When callers are not interested in the usage they can already pass a non-symbol, like "" or 0, but perusing the sources, 3 out of 14 uses of help-split-fundoc pass nil, and none of them passes a non-symbol. Treating nil like "don't care" saves two function calls over the current code (which passes nil through help--docstring-quote), and DEF is documented as "the function whose usage we're looking for", so nil = "don't care" makes more sense than "" or 0. I can revert this part of the patch (is a one-liner), if you're worried about the incompatibility. --000000000000f84722059809feee Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Fri, Nov 22, 2019 at 10:45 PM = Stefan Monnier <monnier@iro.= umontreal.ca> wrote:

> And if it's just t it could alw= ays return a pair.
> Sounds good.

Please take a look.

The patches do not include info changes, because help-split-fundoc is n= ot
documented. Should this change= , once accepted, be mentioned in NEWS?

BTW, other than the discussed new feature, I've added th= e following tiny,
sort of incompa= tible change:

=C2=A0Befor= e:
- DEF =3D non-symbol =3D> usage =3D "(anonymous ARGS...)"= ;
- DEF =3D symbol s =3D> usage =3D "(s ARGS...)"

Now:
- DEF =3D non-symbol OR ni= l =3D> "(anonymous ARGS...)"
- DEF =3D other symbol s =3D&g= t; "(s ARGS...)"

When callers are not interested in the usage they can already pass a
non-symbol, like "" or 0, b= ut perusing the sources, 3 out of 14 uses of
help-split-fundoc pass nil, and none of them passes a non-symbo= l.

Treating nil like &quo= t;don't care" saves two function calls over the current
code (which passes nil through help--docstr= ing-quote), and DEF is
documented= as "the function whose usage we're looking for", so
nil =3D "don't care" makes = more sense than "" or 0.

I can revert this part of the patch (is a one-liner), if you'= re worried
about the incompatibil= ity.


--000000000000f84722059809feee-- --000000000000f84726059809fef0 Content-Type: application/octet-stream; name="0001-Make-help-split-fundoc-more-flexible-about-what-retu.patch" Content-Disposition: attachment; filename="0001-Make-help-split-fundoc-more-flexible-about-what-retu.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k3c2jhff0 RnJvbSAwMzUxZjhjMmI2MTYyNGViOTk1Mjk1N2RkNTQ2NTVlNTMzY2ZlNTczIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKdWFubWEgQmFycmFucXVlcm8gPGxla2t0dUBnbWFpbC5jb20+ CkRhdGU6IFNhdCwgMjMgTm92IDIwMTkgMjE6MzM6MzIgKzAxMDAKU3ViamVjdDogW1BBVENIIDEv Ml0gTWFrZSBoZWxwLXNwbGl0LWZ1bmRvYyBtb3JlIGZsZXhpYmxlIGFib3V0IHdoYXQgcmV0dXJu cwoKKiBsaXNwL2hlbHAuZWwgKGhlbHAtc3BsaXQtZnVuZG9jKTogTmV3IGFyZyBTRUNUSU9OIHRv IHJldHVybgpvbmx5IHRoZSB1c2FnZSBvciBkb2MgcGFydHMgb2YgdGhlIGRvY3N0cmluZywgb3Ig Ym90aCBldmVuIGlmCnRoZXJlIGlzIG5vIHVzYWdlLgoKKiB0ZXN0L2xpc3AvaGVscC10ZXN0cy5l bDogTmV3IGZpbGUuCi0tLQogbGlzcC9oZWxwLmVsICAgICAgICAgICAgfCA0NCArKysrKysrKysr KysrKysrKysrKy0tLS0tLS0tLS0tLQogdGVzdC9saXNwL2hlbHAtdGVzdHMuZWwgfCA1NiArKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogMiBmaWxlcyBjaGFuZ2VkLCA4 NCBpbnNlcnRpb25zKCspLCAxNiBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCB0ZXN0 L2xpc3AvaGVscC10ZXN0cy5lbAoKZGlmZiAtLWdpdCBhL2xpc3AvaGVscC5lbCBiL2xpc3AvaGVs cC5lbAppbmRleCAyMmYzNWRmMWRlLi4wNjI2NGFlMmYzIDEwMDY0NAotLS0gYS9saXNwL2hlbHAu ZWwKKysrIGIvbGlzcC9oZWxwLmVsCkBAIC0xMzgwLDI3ICsxMzgwLDM5IEBAIGhlbHAtLWRvY3N0 cmluZy1xdW90ZQogOzsgQnV0IGZvciB2YXJpb3VzIHJlYXNvbnMsIHRoZXkgYXJlIG1vcmUgd2lk ZWx5IG5lZWRlZCwgc28gdGhleSB3ZXJlCiA7OyBtb3ZlZCB0byB0aGlzIGZpbGUsIHdoaWNoIGlz IHByZWxvYWRlZC4gIGh0dHBzOi8vZGViYnVncy5nbnUub3JnLzE3MDAxCiAKLShkZWZ1biBoZWxw LXNwbGl0LWZ1bmRvYyAoZG9jc3RyaW5nIGRlZikKKyhkZWZ1biBoZWxwLXNwbGl0LWZ1bmRvYyAo ZG9jc3RyaW5nIGRlZiAmb3B0aW9uYWwgc2VjdGlvbikKICAgIlNwbGl0IGEgZnVuY3Rpb24gRE9D U1RSSU5HIGludG8gdGhlIGFjdHVhbCBkb2MgYW5kIHRoZSB1c2FnZSBpbmZvLgotUmV0dXJuIChV U0FHRSAuIERPQykgb3IgbmlsIGlmIHRoZXJlJ3Mgbm8gdXNhZ2UgaW5mbywgd2hlcmUgVVNBR0Ug aW5mbwotaXMgYSBzdHJpbmcgZGVzY3JpYmluZyB0aGUgYXJndW1lbnQgbGlzdCBvZiBERUYsIHN1 Y2ggYXMKLVwiKGFwcGx5IEZVTkNUSU9OICZyZXN0IEFSR1VNRU5UUylcIi4KLURFRiBpcyB0aGUg ZnVuY3Rpb24gd2hvc2UgdXNhZ2Ugd2UncmUgbG9va2luZyBmb3IgaW4gRE9DU1RSSU5HLiIKK1Jl dHVybiAoVVNBR0UgLiBET0MpLCB3aGVyZSBVU0FHRSBpcyBhIHN0cmluZyBkZXNjcmliaW5nIHRo ZSBhcmd1bWVudAorbGlzdCBvZiBERUYsIHN1Y2ggYXMgXCIoYXBwbHkgRlVOQ1RJT04gJnJlc3Qg QVJHVU1FTlRTKVwiLgorREVGIGlzIHRoZSBmdW5jdGlvbiB3aG9zZSB1c2FnZSB3ZSdyZSBsb29r aW5nIGZvciBpbiBET0NTVFJJTkcuCitXaXRoIFNFQ1RJT04gbmlsLCByZXR1cm4gbmlsIGlmIHRo ZXJlIGlzIG5vIHVzYWdlIGluZm87IGNvbnZlcnNlbHksCitTRUNUSU9OIHQgbWVhbnMgdG8gcmV0 dXJuIChVU0FHRSAuIERPQykgZXZlbiBpZiB0aGVyZSdzIG5vIHVzYWdlIGluZm8uCitXaGVuIFNF Q1RJT04gaXMgXFw9J3VzYWdlIG9yIFxcPSdkb2MsIHJldHVybiBvbmx5IHRoYXQgcGFydC4iCiAg IDs7IEZ1bmN0aW9ucyBjYW4gZ2V0IHRoZSBjYWxsaW5nIHNlcXVlbmNlIGF0IHRoZSBlbmQgb2Yg dGhlIGRvYyBzdHJpbmcuCiAgIDs7IEluIGNhc2VzIHdoZXJlIGBmdW5jdGlvbicgaGFzIGJlZW4g ZnNldCB0byBhIHN1YnIgd2UgY2FuJ3Qgc2VhcmNoIGZvcgogICA7OyBmdW5jdGlvbidzIG5hbWUg aW4gdGhlIGRvYyBzdHJpbmcgc28gd2UgdXNlIGBmbicgYXMgdGhlIGFub255bW91cwogICA7OyBm dW5jdGlvbiBuYW1lIGluc3RlYWQuCi0gICh3aGVuIChhbmQgZG9jc3RyaW5nIChzdHJpbmctbWF0 Y2ggIlxuXG4oZm5cXChcXCggLipcXCk/KVxcKVxcJyIgZG9jc3RyaW5nKSkKLSAgICAobGV0ICgo ZG9jICh1bmxlc3MgKHplcm9wIChtYXRjaC1iZWdpbm5pbmcgMCkpCi0JCSAoc3Vic3RyaW5nIGRv Y3N0cmluZyAwIChtYXRjaC1iZWdpbm5pbmcgMCkpKSkKLQkgICh1c2FnZS10YWlsIChtYXRjaC1z dHJpbmcgMSBkb2NzdHJpbmcpKSkKLSAgICAgIChjb25zIChmb3JtYXQgIiglcyVzIgotCQkgICAg OzsgUmVwbGFjZSBgZm4nIHdpdGggdGhlIGFjdHVhbCBmdW5jdGlvbiBuYW1lLgotCQkgICAgKGlm IChzeW1ib2xwIGRlZikKLQkJCShoZWxwLS1kb2NzdHJpbmctcXVvdGUgKGZvcm1hdCAiJVMiIGRl ZikpCi0JCSAgICAgICdhbm9ueW1vdXMpCi0JCSAgICB1c2FnZS10YWlsKQotCSAgICBkb2MpKSkp CisgIChsZXQqICgoZm91bmQgKGFuZCBkb2NzdHJpbmcKKyAgICAgICAgICAgICAgICAgICAgIChz dHJpbmctbWF0Y2ggIlxuXG4oZm5cXChcXCggLipcXCk/KVxcKVxcJyIgZG9jc3RyaW5nKSkpCisg ICAgICAgICAoZG9jIChpZiBmb3VuZAorICAgICAgICAgICAgICAgICAgKGFuZCAobWVtcSBzZWN0 aW9uICcodCBuaWwgZG9jKSkKKyAgICAgICAgICAgICAgICAgICAgICAgKG5vdCAoemVyb3AgKG1h dGNoLWJlZ2lubmluZyAwKSkpCisgICAgICAgICAgICAgICAgICAgICAgIChzdWJzdHJpbmcgZG9j c3RyaW5nIDAgKG1hdGNoLWJlZ2lubmluZyAwKSkpCisgICAgICAgICAgICAgICAgZG9jc3RyaW5n KSkKKyAgICAgICAgICh1c2FnZSAoYW5kIGZvdW5kCisgICAgICAgICAgICAgICAgICAgICAobWVt cSBzZWN0aW9uICcodCBuaWwgdXNhZ2UpKQorICAgICAgICAgICAgICAgICAgICAgKGxldCAoKHRh aWwgKG1hdGNoLXN0cmluZyAxIGRvY3N0cmluZykpKQorICAgICAgICAgICAgICAgICAgICAgICAo Zm9ybWF0ICIoJXMlcyIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA7OyBSZXBsYWNl IGBmbicgd2l0aCB0aGUgYWN0dWFsIGZ1bmN0aW9uIG5hbWUuCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgKGlmIChhbmQgKHN5bWJvbHAgZGVmKSBkZWYpCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIChoZWxwLS1kb2NzdHJpbmctcXVvdGUgKGZvcm1hdCAiJVMiIGRl ZikpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnYW5vbnltb3VzKQorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHRhaWwpKSkpKQorICAgIChwY2FzZSBzZWN0aW9uCisg ICAgICAoYG5pbCAoYW5kIHVzYWdlIChjb25zIHVzYWdlIGRvYykpKQorICAgICAgKGB0IChjb25z IHVzYWdlIGRvYykpCisgICAgICAoYHVzYWdlIHVzYWdlKQorICAgICAgKGBkb2MgZG9jKSkpKQog CiAoZGVmdW4gaGVscC1hZGQtZnVuZG9jLXVzYWdlIChkb2NzdHJpbmcgYXJnbGlzdCkKICAgIkFk ZCB0aGUgdXNhZ2UgaW5mbyB0byBET0NTVFJJTkcuCmRpZmYgLS1naXQgYS90ZXN0L2xpc3AvaGVs cC10ZXN0cy5lbCBiL3Rlc3QvbGlzcC9oZWxwLXRlc3RzLmVsCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAuLjI4ZGQ4ODMwZTQKLS0tIC9kZXYvbnVsbAorKysgYi90ZXN0L2xp c3AvaGVscC10ZXN0cy5lbApAQCAtMCwwICsxLDU2IEBACis7OzsgaGVscC10ZXN0cy5lbCAtLS0g VGVzdHMgZm9yIGhlbHAuZWwgIC0qLSBsZXhpY2FsLWJpbmRpbmc6IHQ7IC0qLQorCis7OyBDb3B5 cmlnaHQgKEMpIDIwMTkgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuCisKKzs7IEF1dGhv cjogSnVhbm1hIEJhcnJhbnF1ZXJvIDxsZWtrdHVAZ21haWwuY29tPgorOzsgS2V5d29yZHM6IGhl bHAsIGludGVybmFsCisKKzs7IFRoaXMgZmlsZSBpcyBwYXJ0IG9mIEdOVSBFbWFjcy4KKworOzsg R05VIEVtYWNzIGlzIGZyZWUgc29mdHdhcmU6IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9v ciBtb2RpZnkKKzs7IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGlj IExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5Cis7OyB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9u LCBlaXRoZXIgdmVyc2lvbiAzIG9mIHRoZSBMaWNlbnNlLCBvcgorOzsgKGF0IHlvdXIgb3B0aW9u KSBhbnkgbGF0ZXIgdmVyc2lvbi4KKworOzsgR05VIEVtYWNzIGlzIGRpc3RyaWJ1dGVkIGluIHRo ZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsCis7OyBidXQgV0lUSE9VVCBBTlkgV0FSUkFO VFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgorOzsgTUVSQ0hBTlRBQklM SVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiAgU2VlIHRoZQorOzsgR05V IEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWlscy4KKworOzsgWW91IHNob3Vs ZCBoYXZlIHJlY2VpdmVkIGEgY29weSBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UK Kzs7IGFsb25nIHdpdGggR05VIEVtYWNzLiAgSWYgbm90LCBzZWUgPGh0dHBzOi8vd3d3LmdudS5v cmcvbGljZW5zZXMvPi4KKworOzs7IENvZGU6CisKKyhyZXF1aXJlICdlcnQpCisKKyhlcnQtZGVm dGVzdCBoZWxwLXNwbGl0LWZ1bmRvYy1TRUNUSU9OICgpCisgICJUZXN0IG5ldyBvcHRpb25hbCBh cmcgU0VDVElPTi4iCisgIChsZXQqICgoZG9jICJEb2MgZmlyc3QgbGluZS5cbkRvYyBzZWNvbmQg bGluZS4iKQorICAgICAgICAgKHVzZyAiXG5cbihmbiBBUkcxICZvcHRpb25hbCBBUkcyKSIpCisg ICAgICAgICAoZnVsbCAoY29uY2F0IGRvYyB1c2cpKQorICAgICAgICAgKHVzYWdlICIodCBBUkcx ICZvcHRpb25hbCBBUkcyKSIpKQorICAgIDs7IERvY3N0cmluZyBoYXMgYm90aCB1c2FnZSBhbmQg ZG9jCisgICAgKHNob3VsZCAoZXF1YWwgKGhlbHAtc3BsaXQtZnVuZG9jIGZ1bGwgdCBuaWwpICAg IGAoLHVzYWdlIC4gLGRvYykpKQorICAgIChzaG91bGQgKGVxdWFsIChoZWxwLXNwbGl0LWZ1bmRv YyBmdWxsIHQgdCkgICAgICBgKCx1c2FnZSAuICxkb2MpKSkKKyAgICAoc2hvdWxkIChlcXVhbCAo aGVscC1zcGxpdC1mdW5kb2MgZnVsbCB0ICd1c2FnZSkgIHVzYWdlKSkKKyAgICAoc2hvdWxkIChl cXVhbCAoaGVscC1zcGxpdC1mdW5kb2MgZnVsbCB0ICdkb2MpICAgIGRvYykpCisgICAgOzsgRG9j c3RyaW5nIGhhcyBubyB1c2FnZSwgb25seSBkb2MKKyAgICAoc2hvdWxkIChlcXVhbCAoaGVscC1z cGxpdC1mdW5kb2MgZG9jIHQgbmlsKSAgICAgIG5pbCkpCisgICAgKHNob3VsZCAoZXF1YWwgKGhl bHAtc3BsaXQtZnVuZG9jIGRvYyB0IHQpICAgICAgIGAobmlsIC4gLGRvYykpKQorICAgIChzaG91 bGQgKGVxdWFsIChoZWxwLXNwbGl0LWZ1bmRvYyBkb2MgdCAndXNhZ2UpICBuaWwpKQorICAgIChz aG91bGQgKGVxdWFsIChoZWxwLXNwbGl0LWZ1bmRvYyBkb2MgdCAnZG9jKSAgICBkb2MpKQorICAg IDs7IERvY3N0cmluZyBpcyBvbmx5IHVzYWdlLCBubyBkb2MKKyAgICAoc2hvdWxkIChlcXVhbCAo aGVscC1zcGxpdC1mdW5kb2MgdXNnIHQgbmlsKSAgICAgYCgsdXNhZ2UgLiBuaWwpKSkKKyAgICAo c2hvdWxkIChlcXVhbCAoaGVscC1zcGxpdC1mdW5kb2MgdXNnIHQgdCkgICAgICAgYCgsdXNhZ2Ug LiBuaWwpKSkKKyAgICAoc2hvdWxkIChlcXVhbCAoaGVscC1zcGxpdC1mdW5kb2MgdXNnIHQgJ3Vz YWdlKSAgdXNhZ2UpKQorICAgIChzaG91bGQgKGVxdWFsIChoZWxwLXNwbGl0LWZ1bmRvYyB1c2cg dCAnZG9jKSAgICBuaWwpKQorICAgIDs7IERvY3N0cmluZyBpcyBudWxsCisgICAgKHNob3VsZCAo ZXF1YWwgKGhlbHAtc3BsaXQtZnVuZG9jIG5pbCB0IG5pbCkgICAgIG5pbCkpCisgICAgKHNob3Vs ZCAoZXF1YWwgKGhlbHAtc3BsaXQtZnVuZG9jIG5pbCB0IHQpICAgICAgICcobmlsKSkpCisgICAg KHNob3VsZCAoZXF1YWwgKGhlbHAtc3BsaXQtZnVuZG9jIG5pbCB0ICd1c2FnZSkgIG5pbCkpCisg ICAgKHNob3VsZCAoZXF1YWwgKGhlbHAtc3BsaXQtZnVuZG9jIG5pbCB0ICdkb2MpICAgIG5pbCkp KSkKKworKHByb3ZpZGUgJ2hlbHAtdGVzdHMpCisKKzs7OyBoZWxwLXRlc3RzLmVsIGVuZHMgaGVy ZQotLSAKMi4yMy4wLndpbmRvd3MuMQoK --000000000000f84726059809fef0 Content-Type: application/octet-stream; name="0002-Rework-previous-change-to-fix-bug-38222.patch" Content-Disposition: attachment; filename="0002-Rework-previous-change-to-fix-bug-38222.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k3c2jlnr1 RnJvbSAxOWUyYzQ4ODA2MmZiODE2NDVmOTBlNzkxZGEyMjdmNzliZTQ1NjExIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKdWFubWEgQmFycmFucXVlcm8gPGxla2t0dUBnbWFpbC5jb20+ CkRhdGU6IFNhdCwgMjMgTm92IDIwMTkgMjE6NDY6MDMgKzAxMDAKU3ViamVjdDogW1BBVENIIDIv Ml0gUmV3b3JrIHByZXZpb3VzIGNoYW5nZSB0byBmaXggYnVnIzM4MjIyCgoqIGxpc3AvaGVscC5l bCAoaGVscC0tZG9jLXdpdGhvdXQtZm4pOiBSZW1vdmUuCihkZXNjcmliZS1tb2RlKTogVXNlIGhl bHAtc3BsaXQtZnVuZG9jIGluc3RlYWQuCi0tLQogbGlzcC9oZWxwLmVsIHwgOSArKystLS0tLS0K IDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvbGlzcC9oZWxwLmVsIGIvbGlzcC9oZWxwLmVsCmluZGV4IDA2MjY0YWUyZjMuLmM0NDAy ZWNlNGUgMTAwNjQ0Ci0tLSBhL2xpc3AvaGVscC5lbAorKysgYi9saXNwL2hlbHAuZWwKQEAgLTg3 OCwxMCArODc4LDYgQEAgZGVzY3JpYmUta2V5CiAgICAgICAgICAgICAocHJpbmMgIiwgd2hpY2gg aXMgIikKIAkgICAgKGRlc2NyaWJlLWZ1bmN0aW9uLTEgZGVmbikpKSkpKSkKIAwKLShkZWZ1biBo ZWxwLS1kb2Mtd2l0aG91dC1mbiAobW9kZSkKLSAgOzsgUmVtb3ZlIHRoZSAoZm4uLi4pIHRoaW5n eSBhdCB0aGUgZW5kIG9mIHRoZSBkb2NzdHJpbmcKLSAgKHJlcGxhY2UtcmVnZXhwLWluLXN0cmlu ZyAiXG5cbihmblteKV0qPylcXCciICIiIChkb2N1bWVudGF0aW9uIG1vZGUpKSkKLQogKGRlZnVu IGRlc2NyaWJlLW1vZGUgKCZvcHRpb25hbCBidWZmZXIpCiAgICJEaXNwbGF5IGRvY3VtZW50YXRp b24gb2YgY3VycmVudCBtYWpvciBtb2RlIGFuZCBtaW5vciBtb2Rlcy4KIEEgYnJpZWYgc3VtbWFy eSBvZiB0aGUgbWlub3IgbW9kZXMgY29tZXMgZmlyc3QsIGZvbGxvd2VkIGJ5IHRoZQpAQCAtOTU1 LDcgKzk1MSw4IEBAIGRlc2NyaWJlLW1vZGUKIAkJCQkgICAgICJubyBpbmRpY2F0b3IiCiAJCQkJ ICAgKGZvcm1hdCAiaW5kaWNhdG9yJXMiCiAJCQkJCSAgIGluZGljYXRvcikpKSkKLQkJICAocHJp bmMgKGhlbHAtLWRvYy13aXRob3V0LWZuIG1vZGUtZnVuY3Rpb24pKSkKKwkJICAocHJpbmMgKGhl bHAtc3BsaXQtZnVuZG9jIChkb2N1bWVudGF0aW9uIG1vZGUtZnVuY3Rpb24pCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5pbCAnZG9jKSkpCiAJCShpbnNlcnQt YnV0dG9uIHByZXR0eS1taW5vci1tb2RlCiAJCQkgICAgICAgJ2FjdGlvbiAoY2FyIGhlbHAtYnV0 dG9uLWNhY2hlKQogCQkJICAgICAgICdmb2xsb3ctbGluayB0CkBAIC05ODUsNyArOTgyLDcgQEAg ZGVzY3JpYmUtbW9kZQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbmlsIHQp CiAJCShoZWxwLXhyZWYtYnV0dG9uIDEgJ2hlbHAtZnVuY3Rpb24tZGVmIG1vZGUgZmlsZS1uYW1l KSkpKSkKIAkocHJpbmMgIjpcbiIpCi0JKHByaW5jIChoZWxwLS1kb2Mtd2l0aG91dC1mbiBtYWpv ci1tb2RlKSkpKSkKKwkocHJpbmMgKGhlbHAtc3BsaXQtZnVuZG9jIChkb2N1bWVudGF0aW9uIG1h am9yLW1vZGUpIG5pbCAnZG9jKSkpKSkKICAgOzsgRm9yIHRoZSBzYWtlIG9mIElFTE0gYW5kIG1h eWJlIG90aGVycwogICBuaWwpCiAKLS0gCjIuMjMuMC53aW5kb3dzLjEKCg== --000000000000f84726059809fef0--