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: Native line numbers landed on master Date: Thu, 3 Oct 2019 16:47:38 +0200 Message-ID: References: <834l4xbfmp.fsf@gnu.org> <87ef414dfn.fsf@wavexx.thregr.org> <83o9359w3l.fsf@gnu.org> <83eezycce5.fsf@gnu.org> <87muekj0i9.fsf@wavexx.thregr.org> <87d0fgagjl.fsf@gnus.org> <20191001225254.mwjnxlynjdc3mz7y@Ergus> <83lfu389vn.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="000000000000ea34d4059402ac3c" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="99493"; mail-complaints-to="usenet@blaine.gmane.org" Cc: wavexx@thregr.org, Lars Magne Ingebrigtsen , Eli Zaretskii , spacibba@aol.com, Emacs developers To: Robert Pluim Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Oct 03 16:48:50 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 1iG2PS-000Pgw-96 for ged-emacs-devel@m.gmane.org; Thu, 03 Oct 2019 16:48:50 +0200 Original-Received: from localhost ([::1]:37130 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iG2PQ-0002oQ-7e for ged-emacs-devel@m.gmane.org; Thu, 03 Oct 2019 10:48:48 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:37912) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iG2P4-0002oC-Jh for emacs-devel@gnu.org; Thu, 03 Oct 2019 10:48:28 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iG2P2-0000fv-7V for emacs-devel@gnu.org; Thu, 03 Oct 2019 10:48:26 -0400 Original-Received: from mail-qk1-x734.google.com ([2607:f8b0:4864:20::734]:41560) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iG2Ov-0000c7-Bl; Thu, 03 Oct 2019 10:48:18 -0400 Original-Received: by mail-qk1-x734.google.com with SMTP id p10so2602699qkg.8; Thu, 03 Oct 2019 07:48:16 -0700 (PDT) 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=06h5IQDTh+McEjjQ3ilNOVflifJdzuvVA1ADzyayk3o=; b=qESwb17LbhStxbU31WR6T83e5J5Rxqc9bLSvYDGr1lqq8lUs6MUMzeHJVYXxxqdjV1 p9afsFnMK+d7/IuZEmGSf08q+UOsJKNA4UHC9U7GCvfOT+Dotxt34IVCpLmtYKgT3nx/ wq7Zbc7hji5OS9/XUhymgR7qQ/AVGggftCCKZ2kOcAQItTW76YU4IvvwpAVTgO/6eTjd gzixt+Iy1wfKs8xenpM717u8YXbhqRsEoKdG5Ho/wpRxeRb9FoHSWuGx4kc516XA1VmT B+uE+AgJ7QlNjHz1doyhQy/dButM94N+JU9bUBKhrBFn11woaMc61AxjoaJr5XHOI3JS HT+w== 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=06h5IQDTh+McEjjQ3ilNOVflifJdzuvVA1ADzyayk3o=; b=Ykdnua/n4zmjJHNonekF3VEb4BZTiBC+lwvmfmx50UHqM3fU/rKR+vqZll0uth2Nl1 kBNOuCMaZtIgUx+s6b48ejMSR14sZItp4GqLm6bt1aMFM5kjd/E1zXq86c7KO+0uBS6f lJJ4vtV/H8NknGF7lHb1hWzX9rx1FvtLdPb4be+4QyD2lLki4Kp8l9yEe0GC1NpjjZ/b ziu8mlw97N+uUmmhf3mnD45zaAXz3MvXZY7rSpx+3Iuwp+X9oadsfETR9QBmFY0b8FPg n+tmPxcPEvx3mn1vG0j64kXlzZf74fKcmXHrZnCgYNU1nmJDedQnxLJTykDOEk+nooCS gT8Q== X-Gm-Message-State: APjAAAUbF9FXZPIahbsRhk3Ye4D1gQj0o1N1TZG3tQSHqeTvglwL+jxy aZXx/1Lk9fnmjbzzxif2mp9AYK7/9GLcbq9GZh3sKg== X-Google-Smtp-Source: APXvYqwjyfq4AC/RFFUC6TmtpoX32z3GCwBD+nk2mpigidGuT/zqzwz80bgCoSVGf0Jz4Yu+E71X3p33dLlmYgj5/no= X-Received: by 2002:a37:a411:: with SMTP id n17mr4791378qke.216.1570114095415; Thu, 03 Oct 2019 07:48:15 -0700 (PDT) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::734 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:240513 Archived-At: --000000000000ea34d4059402ac3c Content-Type: multipart/alternative; boundary="000000000000ea34cb059402ac3a" --000000000000ea34cb059402ac3a Content-Type: text/plain; charset="UTF-8" On Thu, Oct 3, 2019 at 11:10 AM Robert Pluim wrote: > This sentence blew my stack. Please excuse me for weaponizing and deplopying bad english upon you. I can't really promise it won't happen again... ;-) > How about Yes, thanks. Fixed patch attached. > Would it make sense to document that? I don't think so. It's kind of harmless, and the docstring for display-line-numbers-Nth-line already says that it takes precedence. But if you feel strongly about it, please suggest a wording and I'll add it. --000000000000ea34cb059402ac3a Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Thu, Oct 3, 2019 at 11:10 AM Robert Pluim <rpluim@gmail.com> wrote:

&g= t; This sentence blew my stack.

Please excuse me f= or weaponizing and deplopying bad english upon you. I can't really prom= ise it won't happen again... ;-)

> How abou= t

Yes, thanks. Fixed patch attached.

> Would it=C2=A0 make sense to document that?
=
I don't think so. It's kind of harmless, and the doc= string for display-line-numbers-Nth-line already says that it takes precede= nce.

But if you feel strongly about it, please sug= gest a wording and I'll add it.

--000000000000ea34cb059402ac3a-- --000000000000ea34d4059402ac3c Content-Type: application/octet-stream; name="0001-Allow-highlighting-line-numbers-that-are-multiple-of.patch" Content-Disposition: attachment; filename="0001-Allow-highlighting-line-numbers-that-are-multiple-of.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k1atczui0 RnJvbSA4NjIwOTNiNTEwZWUxNDQ2YzVhN2VhODQ3MGJmYWY0ZTNlYWRlODc5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKdWFubWEgQmFycmFucXVlcm8gPGxla2t0dUBnbWFpbC5jb20+ CkRhdGU6IFRodSwgMyBPY3QgMjAxOSAwNjowNDo1MyArMDIwMApTdWJqZWN0OiBbUEFUQ0hdIEFs bG93IGhpZ2hsaWdodGluZyBsaW5lIG51bWJlcnMgdGhhdCBhcmUgbXVsdGlwbGUgb2YgZ2l2ZW4K IHZhbHVlcwoKKiBsaXNwL2ZhY2VzLmVsIChsaW5lLW51bWJlci1OdGgtbGluZSwgbGluZS1udW1i ZXItTXRoLWxpbmUpOgpOZXcgZmFjZXMuCiogbGlzcC9jdXMtc3RhcnQuZWwgKGRpc3BsYXktbGlu ZS1udW1iZXJzLU50aC1saW5lKQooZGlzcGxheS1saW5lLW51bWJlcnMtTXRoLWxpbmUpOiBBZGQg Y3VzdG9taXphdGlvbiBpbmZvLgoKKiBzcmMveGRpc3AuYyAoc3ltc19vZl94ZGlzcCkgPGRpc3Bs YXktbGluZS1udW1iZXJzLU50aC1saW5lPgo8ZGlzcGxheS1saW5lLW51bWJlcnMtTXRoLWxpbmU+ OiBEZWZ2YXIgbmV3IG9wdGlvbnMuCihzeW1zX29mX3hkaXNwKSA8bGluZS1udW1iZXItTnRoLWxp bmUsIGxpbmUtbnVtYmVyLU10aC1saW5lPjoKRGVmc3ltIG5ldyBmYWNlcy4KKG1heWJlX3Byb2R1 Y2VfbGluZV9udW1iZXIpOiBVc2UgbmV3IGZhY2VzIGZvciBsaW5lIG51bWJlcnMKdGhhdCBhcmUg bXVsdGlwbGUgb2YgYGRpc3BsYXktbGluZS1udW1iZXJzLU50aC1saW5lJyBhbmQKYGRpc3BsYXkt bGluZS1udW1iZXJzLU10aC1saW5lJy4KCiogZXRjL05FV1MgKHZhbHVlKTogQW5ub3VuY2UgbmV3 IGZlYXR1cmUuCiogZG9jL2VtYWNzL2Rpc3BsYXkudGV4aSAoRGlzcGxheSBDdXN0b20pOiBEZXNj cmliZSBpdC4gIFdvcmRpbmcgYnkKUm9iZXJ0IFBsdWltIDxycGx1aW1AZ21haWwuY29tPgotLS0K IGRvYy9lbWFjcy9kaXNwbGF5LnRleGkgfCAgNyArKysrKystCiBldGMvTkVXUyAgICAgICAgICAg ICAgIHwgMTAgKysrKysrKysrKwogbGlzcC9jdXMtc3RhcnQuZWwgICAgICB8IDEyICsrKysrKysr KysrKwogbGlzcC9mYWNlcy5lbCAgICAgICAgICB8IDMyICsrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrCiBzcmMveGRpc3AuYyAgICAgICAgICAgIHwgMjcgKysrKysrKysrKysrKysrKysr KysrKysrKysrCiA1IGZpbGVzIGNoYW5nZWQsIDg3IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24o LSkKCmRpZmYgLS1naXQgYS9kb2MvZW1hY3MvZGlzcGxheS50ZXhpIGIvZG9jL2VtYWNzL2Rpc3Bs YXkudGV4aQppbmRleCA4NDM2M2QwZjBkLi4zNGVlOGRhNmI3IDEwMDY0NAotLS0gYS9kb2MvZW1h Y3MvZGlzcGxheS50ZXhpCisrKyBiL2RvYy9lbWFjcy9kaXNwbGF5LnRleGkKQEAgLTE4NzEsNyAr MTg3MSwxMiBAQCBEaXNwbGF5IEN1c3RvbQogVGhlIGN1cnJlbnQgbGluZSBudW1iZXIgaXMgZGlz cGxheWVkIGluIGEgZGlmZmVyZW50IGZhY2UsCiBAY29kZXtsaW5lLW51bWJlci1jdXJyZW50LWxp bmV9LCBzbyB5b3UgY2FuIG1ha2UgdGhlIGN1cnJlbnQgbGluZSdzCiBudW1iZXIgaGF2ZSBhIGRp c3RpbmN0IGFwcGVhcmFuY2UsIHdoaWNoIHdpbGwgaGVscCBsb2NhdGluZyB0aGUgbGluZQotc2hv d2luZyBwb2ludC4KK3Nob3dpbmcgcG9pbnQuIEFkZGl0aW9uYWwgZmFjZXMgQGNvZGV7bGluZS1u dW1iZXItTnRoLWxpbmV9IGFuZAorQGNvZGV7bGluZS1udW1iZXItTXRoLWxpbmV9IGNhbiBiZSB1 c2VkIHRvIGhpZ2hsaWdodCB0aGUgbGluZSBudW1iZXJzCitvZiBsaW5lcyB3aGljaCBhcmUgYSBt dWx0aXBsZSBvZiBjZXJ0YWluIG51bWJlcnMuICBDdXN0b21pemUKK0Bjb2Rle2Rpc3BsYXktbGlu ZS1udW1iZXJzLU50aC1saW5lfSBhbmQKK0Bjb2Rle2Rpc3BsYXktbGluZS1udW1iZXJzLU10aC1s aW5lfSByZXNwZWN0aXZlbHkgdG8gc2V0IHRob3NlCitudW1iZXJzLgogCiBAdmluZGV4IHZpc2li bGUtYmVsbAogICBJZiB0aGUgdmFyaWFibGUgQGNvZGV7dmlzaWJsZS1iZWxsfSBpcyBub24tQGNv ZGV7bmlsfSwgRW1hY3MgYXR0ZW1wdHMKZGlmZiAtLWdpdCBhL2V0Yy9ORVdTIGIvZXRjL05FV1MK aW5kZXggMDBhMDE5OTlhNy4uZjE0ZDczZWY5MSAxMDA2NDQKLS0tIGEvZXRjL05FV1MKKysrIGIv ZXRjL05FV1MKQEAgLTU1Myw2ICs1NTMsMTYgQEAgbmV0d29yayBjb25uZWN0aW9uIGluZm9ybWF0 aW9uIChpbiBhZGRpdGlvbiB0byB0aGUgaG9zdCBuYW1lKS4KICoqKiBXaGVuIGNhbGxlZCBpbnRl cmFjdGl2ZWx5IHdpdGggYSBwcmVmaXggYXJnICdDLXUnLCAnZGVza3RvcC1yZWFkJwogbm93IHBy b21wdHMgdGhlIHVzZXIgZm9yIHRoZSBkaXJlY3RvcnkgY29udGFpbmluZyB0aGUgZGVza3RvcCBm aWxlLgogCisrKysKKyoqIGRpc3BsYXktbGluZS1udW1iZXJzLW1vZGUKKyoqKiBOZXcgZmFjZXMg J2xpbmUtbnVtYmVyLU50aC1saW5lJyBhbmQgJ2xpbmUtbnVtYmVyLU10aC1saW5lJywKK2FuZCBj dXN0b21pemFibGUgdmFyaWFibGVzICdkaXNwbGF5LWxpbmUtbnVtYmVycy1OdGgtbGluZScgYW5k CisnZGlzcGxheS1saW5lLW51bWJlcnMtTXRoLWxpbmUnLCBjYW4gYmUgdXNlZCB0byBoaWdobGln aHQgdGhlIGxpbmUKK251bWJlcnMgb2YgbGluZXMgbXVsdGlwbGUgb2YgTiBhbmQgTS4KKworKioq IE5ldyBmYWNlcyAnbGluZS1udW1iZXItZmlmdGgtbGluZScgYW5kICdsaW5lLW51bWJlci10ZW50 aC1saW5lJworY2FuIGJlIHVzZWQgdG8gaGlnaGxpZ2h0IHRoZSBsaW5lIG51bWJlciBvZiBldmVy eSBmaWZ0aCBvciB0ZW50aCBsaW5lLgorCiArKysKICoqIHdpbm5lcgogKioqIEEgbmV3IHZhcmlh YmxlLCAnd2lubmVyLWJvcmluZy1idWZmZXJzLXJlZ2V4cCcsIGhhcyBiZWVuIGFkZGVkLgpkaWZm IC0tZ2l0IGEvbGlzcC9jdXMtc3RhcnQuZWwgYi9saXNwL2N1cy1zdGFydC5lbAppbmRleCBlNjFj MTk1NGExLi44ZmYxYmQzM2VjIDEwMDY0NAotLS0gYS9saXNwL2N1cy1zdGFydC5lbAorKysgYi9s aXNwL2N1cy1zdGFydC5lbApAQCAtNjU1LDYgKzY1NSwxOCBAQCBtaW5pYnVmZmVyLXByb21wdC1w cm9wZXJ0aWVzLS1zZXR0ZXIKICAgICAgICAgICAgICAgIChjb25zdCA6dGFnICJDb3VudCBsaW5l cyBmcm9tIGJlZ2lubmluZyBvZiBuYXJyb3dlZCByZWdpb24iCiAgICAgICAgICAgICAgICAgICAg ICAgOnZhbHVlIG5pbCkpCiAgICAgICAgICAgICAgICIyNi4xIikKKyAgICAgICAgICAgICAoZGlz cGxheS1saW5lLW51bWJlcnMtTnRoLWxpbmUKKyAgICAgICAgICAgICAgZGlzcGxheS1saW5lLW51 bWJlcnMKKyAgICAgICAgICAgICAgKGNob2ljZQorICAgICAgICAgICAgICAgKGNvbnN0IDp0YWcg Ik5vIGxpbmUiIDApCisgICAgICAgICAgICAgICAoaW50ZWdlciA6dGFnICJNdWx0aXBsZXMgb2Yi IDEwKSkKKyAgICAgICAgICAgICAgIjI3LjEiKQorICAgICAgICAgICAgIChkaXNwbGF5LWxpbmUt bnVtYmVycy1NdGgtbGluZQorICAgICAgICAgICAgICBkaXNwbGF5LWxpbmUtbnVtYmVycworICAg ICAgICAgICAgICAoY2hvaWNlCisgICAgICAgICAgICAgICAoY29uc3QgOnRhZyAiTm8gbGluZSIg MCkKKyAgICAgICAgICAgICAgIChpbnRlZ2VyIDp0YWcgIk11bHRpcGxlcyBvZiIgNSkpCisgICAg ICAgICAgICAgICIyNy4xIikKIAogICAgICAgICAgICAgIChkaXNwbGF5LWZpbGwtY29sdW1uLWlu ZGljYXRvcgogICAgICAgICAgICAgICBkaXNwbGF5LWZpbGwtY29sdW1uLWluZGljYXRvcgpkaWZm IC0tZ2l0IGEvbGlzcC9mYWNlcy5lbCBiL2xpc3AvZmFjZXMuZWwKaW5kZXggOWM1ZmZlMWU1OS4u Y2IwYjhiNzdhZiAxMDA2NDQKLS0tIGEvbGlzcC9mYWNlcy5lbAorKysgYi9saXNwL2ZhY2VzLmVs CkBAIC0yMzkwLDYgKzIzOTAsMzggQEAgbGluZS1udW1iZXItY3VycmVudC1saW5lCiAgIDpncm91 cCAnYmFzaWMtZmFjZXMKICAgOmdyb3VwICdkaXNwbGF5LWxpbmUtbnVtYmVycykKIAorKGRlZmZh Y2UgbGluZS1udW1iZXItTnRoLWxpbmUKKyAgJygodCA6aW5oZXJpdCBsaW5lLW51bWJlcikpCisg ICJGYWNlIGZvciBoaWdobGlnaHRpbmcgdGhlIGxpbmUgbnVtYmVyIG9mIGV2ZXJ5IE50aCBsaW5l LgorVGhpcyBmYWNlIGlzIHVzZWQgd2hlbiBgZGlzcGxheS1saW5lLW51bWJlcnMnIGlzIG5vbi1u aWwgYW5kCit2YXJpYWJsZSBgZGlzcGxheS1saW5lLW51bWJlcnMtTnRoLWxpbmUnIGhhcyBhIHBv c2l0aXZlIHZhbHVlLgorCitJZiB5b3UgY3VzdG9taXplIHRoZSBmb250IG9mIHRoaXMgZmFjZSwg bWFrZSBzdXJlIGl0IGlzIGEKK21vbm9zcGFjZWQgZm9udCwgb3RoZXJ3aXNlIGxpbmUgbnVtYmVy cyB3aWxsIG5vdCBsaW5lIHVwLAorYW5kIHRleHQgbGluZXMgbWlnaHQgbW92ZSBob3Jpem9udGFs bHkgYXMgeW91IG1vdmUgdGhyb3VnaAordGhlIGJ1ZmZlci4gIFNpbWlsYXJseSwgbWFraW5nIHRo aXMgZmFjZSdzIGZvbnQgZGlmZmVyZW50Citmcm9tIHRoYXQgb2YgdGhlIGBsaW5lLW51bWJlcicg ZmFjZSBjb3VsZCBwcm9kdWNlIHN1Y2gKK3Vud2FudGVkIGVmZmVjdHMuIgorICA6dmVyc2lvbiAi MjcuMSIKKyAgOmdyb3VwICdiYXNpYy1mYWNlcworICA6Z3JvdXAgJ2Rpc3BsYXktbGluZS1udW1i ZXJzKQorCisoZGVmZmFjZSBsaW5lLW51bWJlci1NdGgtbGluZQorICAnKCh0IDppbmhlcml0IGxp bmUtbnVtYmVyKSkKKyAgIkZhY2UgZm9yIGhpZ2hsaWdodGluZyB0aGUgbGluZSBudW1iZXIgb2Yg ZXZlcnkgTXRoIGxpbmUuCitUaGlzIGZhY2UgaXMgdXNlZCB3aGVuIGBkaXNwbGF5LWxpbmUtbnVt YmVycycgaXMgbm9uLW5pbCBhbmQKK3ZhcmlhYmxlIGBkaXNwbGF5LWxpbmUtbnVtYmVycy1NdGgt bGluZScgaGFzIGEgcG9zaXRpdmUgdmFsdWUuCisKK0lmIHlvdSBjdXN0b21pemUgdGhlIGZvbnQg b2YgdGhpcyBmYWNlLCBtYWtlIHN1cmUgaXQgaXMgYQorbW9ub3NwYWNlZCBmb250LCBvdGhlcndp c2UgbGluZSBudW1iZXJzIHdpbGwgbm90IGxpbmUgdXAsCithbmQgdGV4dCBsaW5lcyBtaWdodCBt b3ZlIGhvcml6b250YWxseSBhcyB5b3UgbW92ZSB0aHJvdWdoCit0aGUgYnVmZmVyLiAgU2ltaWxh cmx5LCBtYWtpbmcgdGhpcyBmYWNlJ3MgZm9udCBkaWZmZXJlbnQKK2Zyb20gdGhhdCBvZiB0aGUg YGxpbmUtbnVtYmVyJyBmYWNlIGNvdWxkIHByb2R1Y2Ugc3VjaAordW53YW50ZWQgZWZmZWN0cy4i CisgIDp2ZXJzaW9uICIyNy4xIgorICA6Z3JvdXAgJ2Jhc2ljLWZhY2VzCisgIDpncm91cCAnZGlz cGxheS1saW5lLW51bWJlcnMpCisKIDs7IERlZmluaXRpb24gc3RvbGVuIGZyb20gZGlzcGxheS1s aW5lLW51bWJlcnMuCiAoZGVmZmFjZSBmaWxsLWNvbHVtbi1pbmRpY2F0b3IKICAgJygodCA6aW5o ZXJpdCBzaGFkb3cgOndlaWdodCBub3JtYWwgOnNsYW50IG5vcm1hbApkaWZmIC0tZ2l0IGEvc3Jj L3hkaXNwLmMgYi9zcmMveGRpc3AuYwppbmRleCA4OWE3MmZmNzUxLi4yMjVmYjAyNTc2IDEwMDY0 NAotLS0gYS9zcmMveGRpc3AuYworKysgYi9zcmMveGRpc3AuYwpAQCAtMjI1NjYsNiArMjI1NjYs MTQgQEAgbWF5YmVfcHJvZHVjZV9saW5lX251bWJlciAoc3RydWN0IGl0ICppdCkKIAkgICAgIGVt cHR5IGxpbmVzIGJleW9uZCBFT0IuICAqLwogCSAgJiYgaXQtPndoYXQgIT0gSVRfRU9CKQogCXRl bV9pdC5mYWNlX2lkID0gY3VycmVudF9sbnVtX2ZhY2VfaWQ7CisgICAgICBlbHNlIGlmIChSQU5H RURfRklYTlVNUCAoMSwgVmRpc3BsYXlfbGluZV9udW1iZXJzX050aF9saW5lLCBJTlRfTUFYKQor CSAgICAgICAmJiAobG51bV90b19kaXNwbGF5ICUgWEZJWE5VTSAoVmRpc3BsYXlfbGluZV9udW1i ZXJzX050aF9saW5lKSA9PSAwKSkKKwl0ZW1faXQuZmFjZV9pZCA9IG1lcmdlX2ZhY2VzIChpdC0+ dywgUWxpbmVfbnVtYmVyX050aF9saW5lLAorCQkJCSAgICAgIDAsIERFRkFVTFRfRkFDRV9JRCk7 CisgICAgICBlbHNlIGlmIChSQU5HRURfRklYTlVNUCAoMSwgVmRpc3BsYXlfbGluZV9udW1iZXJz X010aF9saW5lLCBJTlRfTUFYKQorCSAgICAgICAmJiAobG51bV90b19kaXNwbGF5ICUgWEZJWE5V TSAoVmRpc3BsYXlfbGluZV9udW1iZXJzX010aF9saW5lKSA9PSAwKSkKKwl0ZW1faXQuZmFjZV9p ZCA9IG1lcmdlX2ZhY2VzIChpdC0+dywgUWxpbmVfbnVtYmVyX010aF9saW5lLAorCQkJCSAgICAg IDAsIERFRkFVTFRfRkFDRV9JRCk7CiAgICAgICBlbHNlCiAJdGVtX2l0LmZhY2VfaWQgPSBsbnVt X2ZhY2VfaWQ7CiAgICAgICBpZiAoYmV5b25kX3p2CkBAIC0zNDAwNiw2ICszNDAxNCw4IEBAIHN5 bXNfb2ZfeGRpc3AgKHZvaWQpCiAgIC8qIE5hbWVzIG9mIHRoZSBmYWNlcyB1c2VkIHRvIGRpc3Bs YXkgbGluZSBudW1iZXJzLiAgKi8KICAgREVGU1lNIChRbGluZV9udW1iZXIsICJsaW5lLW51bWJl ciIpOwogICBERUZTWU0gKFFsaW5lX251bWJlcl9jdXJyZW50X2xpbmUsICJsaW5lLW51bWJlci1j dXJyZW50LWxpbmUiKTsKKyAgREVGU1lNIChRbGluZV9udW1iZXJfTnRoX2xpbmUsICJsaW5lLW51 bWJlci1OdGgtbGluZSIpOworICBERUZTWU0gKFFsaW5lX251bWJlcl9NdGhfbGluZSwgImxpbmUt bnVtYmVyLU10aC1saW5lIik7CiAgIC8qIE5hbWUgb2YgYSB0ZXh0IHByb3BlcnR5IHdoaWNoIGRp c2FibGVzIGxpbmUtbnVtYmVyIGRpc3BsYXkuICAqLwogICBERUZTWU0gKFFkaXNwbGF5X2xpbmVf bnVtYmVyc19kaXNhYmxlLCAiZGlzcGxheS1saW5lLW51bWJlcnMtZGlzYWJsZSIpOwogCkBAIC0z NDY0MSw2ICszNDY1MSwyMyBAQCBzeW1zX29mX3hkaXNwICh2b2lkKQogICBERUZTWU0gKFFkaXNw bGF5X2ZpbGxfY29sdW1uX2luZGljYXRvcl9jaGFyYWN0ZXIsICJkaXNwbGF5LWZpbGwtY29sdW1u LWluZGljYXRvci1jaGFyYWN0ZXIiKTsKICAgRm1ha2VfdmFyaWFibGVfYnVmZmVyX2xvY2FsIChR ZGlzcGxheV9maWxsX2NvbHVtbl9pbmRpY2F0b3JfY2hhcmFjdGVyKTsKIAorICBERUZWQVJfTElT UCAoImRpc3BsYXktbGluZS1udW1iZXJzLU50aC1saW5lIiwgVmRpc3BsYXlfbGluZV9udW1iZXJz X050aF9saW5lLAorICAgIGRvYzogLyogSWYgYW4gaW50ZWdlciBOID4gMCwgaGlnaGxpZ2h0IGxp bmUgbnVtYmVyIG9mIGV2ZXJ5IE50aCBsaW5lLgorVGhlIGxpbmUgbnVtYmVyIGlzIHNob3duIHdp dGggdGhlIGBsaW5lLW51bWJlci1OdGgtbGluZScgZmFjZS4KK090aGVyd2lzZSwgbm8gc3BlY2lh bCBoaWdobGlnaHRpbmcgaXMgZG9uZSBldmVyeSBOdGggbGluZXMuICAqLyk7CisgIFZkaXNwbGF5 X2xpbmVfbnVtYmVyc19OdGhfbGluZSA9IG1ha2VfZml4bnVtICgwKTsKKyAgREVGU1lNIChRZGlz cGxheV9saW5lX251bWJlcnNfTnRoX2xpbmUsICJkaXNwbGF5LWxpbmUtbnVtYmVycy1OdGgtbGlu ZSIpOworICBGbWFrZV92YXJpYWJsZV9idWZmZXJfbG9jYWwgKFFkaXNwbGF5X2xpbmVfbnVtYmVy c19OdGhfbGluZSk7CisKKyAgREVGVkFSX0xJU1AgKCJkaXNwbGF5LWxpbmUtbnVtYmVycy1NdGgt bGluZSIsIFZkaXNwbGF5X2xpbmVfbnVtYmVyc19NdGhfbGluZSwKKyAgICBkb2M6IC8qIElmIGFu IGludGVnZXIgTSA+IDAsIGhpZ2hsaWdodCBsaW5lIG51bWJlciBvZiBldmVyeSBNdGggbGluZS4K K1RoZSBsaW5lIG51bWJlciBpcyBzaG93biB3aXRoIHRoZSBgbGluZS1udW1iZXItTXRoLWxpbmUn IGZhY2UuCitPdGhlcndpc2UsIG5vIHNwZWNpYWwgaGlnaGxpZ2h0aW5nIGlzIGRvbmUgZXZlcnkg TXRoIGxpbmVzLgorTm90ZSB0aGF0IGBkaXNwbGF5LWxpbmUtbnVtYmVycy1OdGgtbGluZScgdGFr ZXMgcHJlY2VkZW5jZS4gICovKTsKKyAgVmRpc3BsYXlfbGluZV9udW1iZXJzX010aF9saW5lID0g bWFrZV9maXhudW0gKDApOworICBERUZTWU0gKFFkaXNwbGF5X2xpbmVfbnVtYmVyc19NdGhfbGlu ZSwgImRpc3BsYXktbGluZS1udW1iZXJzLU10aC1saW5lIik7CisgIEZtYWtlX3ZhcmlhYmxlX2J1 ZmZlcl9sb2NhbCAoUWRpc3BsYXlfbGluZV9udW1iZXJzX010aF9saW5lKTsKKwogICBERUZWQVJf Qk9PTCAoImluaGliaXQtZXZhbC1kdXJpbmctcmVkaXNwbGF5IiwgaW5oaWJpdF9ldmFsX2R1cmlu Z19yZWRpc3BsYXksCiAgICAgZG9jOiAvKiBOb24tbmlsIG1lYW5zIGRvbid0IGV2YWwgTGlzcCBk dXJpbmcgcmVkaXNwbGF5LiAgKi8pOwogICBpbmhpYml0X2V2YWxfZHVyaW5nX3JlZGlzcGxheSA9 IGZhbHNlOwotLSAKMi4yMy4wLndpbmRvd3MuMQoK --000000000000ea34d4059402ac3c--