From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Liu Hui Newsgroups: gmane.emacs.bugs Subject: bug#67161: 30.0.50; [PATCH] Add option `dired-filename-display-length' Date: Mon, 20 Nov 2023 12:34:13 +0800 Message-ID: References: <8334x8tqi9.fsf@gnu.org> <83a5rfrych.fsf@gnu.org> <83sf55q4nc.fsf@gnu.org> <83jzqfmiuj.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="0000000000002dbca8060a8e005d" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="4332"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 67161@debbugs.gnu.org, stefankangas@gmail.com, monnier@iro.umontreal.ca To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Nov 20 05:35:26 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1r4w0K-0000sf-Vm for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 20 Nov 2023 05:35:25 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r4vzx-0008HX-P0; Sun, 19 Nov 2023 23:35:01 -0500 Original-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 ) id 1r4vzw-0008HL-Lk for bug-gnu-emacs@gnu.org; Sun, 19 Nov 2023 23:35:00 -0500 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r4vzw-0008BQ-Dn for bug-gnu-emacs@gnu.org; Sun, 19 Nov 2023 23:35:00 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r4vzx-0001rQ-Ti for bug-gnu-emacs@gnu.org; Sun, 19 Nov 2023 23:35:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Liu Hui Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 20 Nov 2023 04:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67161 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 67161-submit@debbugs.gnu.org id=B67161.17004548777108 (code B ref 67161); Mon, 20 Nov 2023 04:35:01 +0000 Original-Received: (at 67161) by debbugs.gnu.org; 20 Nov 2023 04:34:37 +0000 Original-Received: from localhost ([127.0.0.1]:52340 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4vzY-0001qZ-J9 for submit@debbugs.gnu.org; Sun, 19 Nov 2023 23:34:37 -0500 Original-Received: from mail-vs1-xe33.google.com ([2607:f8b0:4864:20::e33]:47612) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r4vzU-0001qI-G0 for 67161@debbugs.gnu.org; Sun, 19 Nov 2023 23:34:35 -0500 Original-Received: by mail-vs1-xe33.google.com with SMTP id ada2fe7eead31-45d88053c24so1134799137.3 for <67161@debbugs.gnu.org>; Sun, 19 Nov 2023 20:34:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700454865; x=1701059665; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=SqoA8UtdpCYGCubPhrRgb55/BhgjJa/KNlqMpdJv13A=; b=eUrThaRwjTqkflY+pZD+c+WfO6mkC83gcjtX2kBACXu5u/00d6K+DAEID4Ta0Krmmn JFYZh4tMyXnjmqdVeTpUzJ1MkoQq9JB5qiN1MXVi3bojdVDkfbUeVvkz4frGFsL1X4xl CzfKSut3d5ihOKL7MAcBgoyHscUsCwG/QsdV7h4QoFpcprQAFlAtJEgFGwNkbpi307Kq M1zzjrMI/VaGxPntEp3LcESl8R91dXLiyhlxKlzzrLdQJwSxo267AMcp5fwFwDK9DDo6 n2Yy/jrmwqrbGvG7IGygnryRa3hNQuoJLRfKfvI51rEJBkCHwLmd8IGzrX3shNroX2ke FpcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700454865; x=1701059665; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=SqoA8UtdpCYGCubPhrRgb55/BhgjJa/KNlqMpdJv13A=; b=IyW6dsfU3wG8pIXaeMXC18CFCKdGgvBJ92b8iHcSKtDrOwEG0NEjxn3yVUIuIEcLx9 GxZjeIkGqe0Dwo3vbZVW1CXEIAJEt3ZwMv3XFt4njKA0TW9M6ewQRUKFTdM8C/cmqXD+ TRrKafPmesC09LyQdY0ail+rnTXeVWcZWpWGSd82cpe5jsB49W0PsjTedWttlW+HOgmx cyepkKNm0lZnky3BxXirq93J7WNDyx9kX816mkzFO39XQtXO3IcdVfOxlSNmFSHs/H1T M92pw1Hp+4rT45scPDZ9hLVG3Jvc7hekPAVs8HKVN8NdJYneJScgZS+/MqPohk0RLML1 L2pg== X-Gm-Message-State: AOJu0YwiznddMj1soiPoVr7lpiVW4h/OU0lDWYjwSxkqBNwiFWeO+F/P wqL0+7ikn97XXheurLGPcdqfVLcGpq61u1nDKV4= X-Google-Smtp-Source: AGHT+IEXvfk6ISH5U/YcHsYj3jS67t92FE4QUEoGhnq0WN29WFJxrgBod6QGytE6/NMXTsSMChR2WxIE5vcoizqR/T8= X-Received: by 2002:a05:6102:20ca:b0:462:a86a:53d8 with SMTP id i10-20020a05610220ca00b00462a86a53d8mr595738vsr.19.1700454864877; Sun, 19 Nov 2023 20:34:24 -0800 (PST) In-Reply-To: <83jzqfmiuj.fsf@gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:274647 Archived-At: --0000000000002dbca8060a8e005d Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Eli Zaretskii =E4=BA=8E2023=E5=B9=B411=E6=9C=8818=E6=97=A5= =E5=91=A8=E5=85=AD 18:55=E5=86=99=E9=81=93=EF=BC=9A > If there are two different modes of using this function, the doc > string could describe them both. Currently, it only describes the use > case where dired-filename-display-length is an integer, in which case > it is a simple accessor. The other use case is more subtle, and the > doc string is completely silent about that, in particular it doesn't > mention that point should be at the first character of the file name > in that case. Thanks for the explanation. I have updated the doc string as suggested. > > BTW, I just find isearch doesn't handle hidden filenames based on > > 'invisible' text property, which needs to be fixed. So maybe an > > overlay-based approach is better? though I don't know if there is any > > possible problem with using overlays for this feature. WDYT? > > Doesn't "M-x i" during isearch handle this? No. I want to search text in hidden part rather than only in the visible part, which is necessary for users to find relevant files even if they are partly hidden. Here is an example illustrating the problem: 1. emacs -Q 2. type M-: (insert "visible " (propertize "hidden" 'invisible t)) 3. C-s hidden isearch fails to match the invisible text by default, unless search-invisible is changed to t. However, the default value of search-invisible is open and it cannot be changed to t during isearch by M-s i. Therefore, I would like to change (put-text-property ell-beg (point) 'invisible 'dired-filename-hide) to (let ((ov (make-overlay ell-beg (point)))) (overlay-put ov 'invisible 'dired-filename-hide) (overlay-put ov 'isearch-open-invisible t) (overlay-put ov 'evaporate t)) in the attached patch, then text in hidden part can be matched regardless of search-invisible being open or t. It also has a bonus that hidden text can be revealed during isearch. > > --- a/lisp/wdired.el > > +++ b/lisp/wdired.el > > @@ -261,6 +261,9 @@ wdired-change-to-wdired-mode > > (add-function :override (local 'revert-buffer-function) #'wdired-rev= ert) > > (set-buffer-modified-p nil) > > (setq buffer-undo-list nil) > > + ;; remove filename invisibility spec to ensure filenames are visible > > + ;; for editing > > Comments should be complete sentences: begin with a capital letter and > end with a period. Also, please mention here the new defcustom you > add to Dired, so that the comment could better explain itself. > > Thanks. Fixed. --0000000000002dbca8060a8e005d Content-Type: text/x-patch; charset="US-ASCII"; name="0001-Add-option-dired-filename-display-length.patch" Content-Disposition: attachment; filename="0001-Add-option-dired-filename-display-length.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lp6etbnz0 RnJvbSAxN2EwMmU4YWY0NTAyYzg0MDU0ZmQ3YmFjOWQ2OWYwMDRkMDlkNmE0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMaXUgSHVpIDxsaXVodWkxNjEwQGdtYWlsLmNvbT4KRGF0ZTog TW9uLCAyMCBOb3YgMjAyMyAxMjowOToxNSArMDgwMApTdWJqZWN0OiBbUEFUQ0hdIEFkZCBvcHRp b24gYGRpcmVkLWZpbGVuYW1lLWRpc3BsYXktbGVuZ3RoJwoKKiBsaXNwL2RpcmVkLmVsIChkaXJl ZC1maWxlbmFtZS1kaXNwbGF5LWxlbmd0aCk6IE5ldyBvcHRpb24uCihkaXJlZC1pbnNlcnQtc2V0 LXByb3BlcnRpZXMpOiBTZXQgaW52aXNpYmlsaXR5IHNwZWMgZm9yIGxvbmcKZmlsZW5hbWVzLgoo ZGlyZWQtLWdldC1lbGxpcHNpcy1sZW5ndGgpCihkaXJlZC0tZ2V0LWZpbGVuYW1lLWRpc3BsYXkt bGVuZ3RoKQooZGlyZWQtZmlsZW5hbWUtdXBkYXRlLWludmlzaWJpbGl0eS1zcGVjKTogTmV3IGZ1 bmN0aW9ucy4KKGRpcmVkLW1vZGUpOiBBZGQgZmlsZW5hbWUgaW52aXNpYmlsaXR5IHNwZWMuCihk aXJlZC1tYWtlLWRpcmVjdG9yeS1jbGlja2FibGUpOgooZGlyZWQta2lsbC13aGVuLW9wZW5pbmct bmV3LWRpcmVkLWJ1ZmZlcik6CihkaXJlZC1oaWRlLWRldGFpbHMtcHJlc2VydmVkLWNvbHVtbnMp OiBBZGQgbWlzc2luZyBncm91cC4KKiBsaXNwL3dkaXJlZC5lbCAod2RpcmVkLWNoYW5nZS10by13 ZGlyZWQtbW9kZSkKKHdkaXJlZC1jaGFuZ2UtdG8tZGlyZWQtbW9kZSk6IFVwZGF0ZSBmaWxlbmFt ZSBpbnZpc2liaWxpdHkgc3BlYy4KKiBldGMvTkVXUzogQW5ub3VuY2UgdGhlIGNoYW5nZS4KLS0t CiBldGMvTkVXUyAgICAgICB8ICAgNyArKysKIGxpc3AvZGlyZWQuZWwgIHwgMTQxICsrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0KIGxpc3Avd2RpcmVkLmVs IHwgICA3ICsrKwogMyBmaWxlcyBjaGFuZ2VkLCAxMTQgaW5zZXJ0aW9ucygrKSwgNDEgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZXRjL05FV1MgYi9ldGMvTkVXUwppbmRleCAyM2Y0YThiNTMx MS4uYWQ5YmRhNTRiNWUgMTAwNjQ0Ci0tLSBhL2V0Yy9ORVdTCisrKyBiL2V0Yy9ORVdTCkBAIC00 NzIsNiArNDcyLDEzIEBAIGVtcHR5IGxpbmVzLiAgSXQgYWxzbyBjb250cm9scyBob3cgdG8gbW92 ZSBwb2ludCB3aGVuIGVuY291bnRlcmluZyBhCiBib3VuZGFyeSAoZS5nLiwgaWYgZXZlcnkgbGlu ZSBpcyB2aXNpYmxlLCBpbnZva2luZyAnZGlyZWQtbmV4dC1saW5lJwogYXQgdGhlIGxhc3QgbGlu ZSB3aWxsIG1vdmUgdG8gdGhlIGZpcnN0IGxpbmUpLiAgVGhlIGRlZmF1bHQgaXMgbmlsLgogCisq KiogTmV3IHVzZXIgb3B0aW9uICdkaXJlZC1maWxlbmFtZS1kaXNwbGF5LWxlbmd0aCcuCitJdCBp cyBhbiBpbnRlZ2VyIHJlcHJlc2VudGluZyB0aGUgbWF4aW11bSBkaXNwbGF5IGxlbmd0aCBvZiBm aWxlbmFtZXMuCitUaGUgbWlkZGxlIHBhcnQgb2YgZmlsZW5hbWUgd2hvc2UgbGVuZ3RoIGV4Y2Vl ZHMgdGhlIHJlc3RyaWN0aW9uIGlzCitoaWRkZW4gYW5kIGFuIGVsbGlwc2lzIGlzIGRpc3BsYXll ZCBpbnN0ZWFkLiAgQSB2YWx1ZSBvZiAnd2luZG93JworbWVhbnMgdXNpbmcgdGhlIHJpZ2h0IGVk Z2Ugb2Ygd2luZG93IGFzIHRoZSBkaXNwbGF5IHJlc3RyaWN0aW9uLiAgVGhlCitkZWZhdWx0IGlz IG5pbC4KKwogKiogRWRpZmYKIAogLS0tCmRpZmYgLS1naXQgYS9saXNwL2RpcmVkLmVsIGIvbGlz cC9kaXJlZC5lbAppbmRleCA4OTE5ZDJjMjIzZi4uZTE4OTNiMWU4ZjEgMTAwNjQ0Ci0tLSBhL2xp c3AvZGlyZWQuZWwKKysrIGIvbGlzcC9kaXJlZC5lbApAQCAtMzUwLDYgKzM1MCw3IEBAIGRpcmVk LWFmdGVyLXJlYWRpbi1ob29rCiAoZGVmY3VzdG9tIGRpcmVkLW1ha2UtZGlyZWN0b3J5LWNsaWNr YWJsZSB0CiAgICJXaGVuIG5vbi1uaWwsIG1ha2UgdGhlIGRpcmVjdG9yeSBhdCB0aGUgc3RhcnQg b2YgdGhlIGRpcmVkIGJ1ZmZlciBjbGlja2FibGUuIgogICA6dmVyc2lvbiAiMjkuMSIKKyAgOmdy b3VwICdkaXJlZAogICA6dHlwZSAnYm9vbGVhbikKIAogKGRlZmN1c3RvbSBkaXJlZC1pbml0aWFs LXBvc2l0aW9uLWhvb2sgbmlsCkBAIC00MjksNiArNDMwLDcgQEAgZGlyZWQtbWFyay1yZWdpb24K IChkZWZjdXN0b20gZGlyZWQta2lsbC13aGVuLW9wZW5pbmctbmV3LWRpcmVkLWJ1ZmZlciBuaWwK ICAgIklmIG5vbi1uaWwsIGtpbGwgdGhlIGN1cnJlbnQgYnVmZmVyIHdoZW4gc2VsZWN0aW5nIGEg bmV3IGRpcmVjdG9yeS4iCiAgIDp0eXBlICdib29sZWFuCisgIDpncm91cCAnZGlyZWQKICAgOnZl cnNpb24gIjI4LjEiKQogCiAoZGVmY3VzdG9tIGRpcmVkLWd1ZXNzLXNoZWxsLWNhc2UtZm9sZC1z ZWFyY2ggdApAQCAtNTE1LDYgKzUxNywyMiBAQCBkaXJlZC1tb3ZlbWVudC1zdHlsZQogKGRlZmN1 c3RvbSBkaXJlZC1oaWRlLWRldGFpbHMtcHJlc2VydmVkLWNvbHVtbnMgbmlsCiAgICJMaXN0IG9m IGNvbHVtbnMgd2hpY2ggYXJlIG5vdCBoaWRkZW4gaW4gYGRpcmVkLWhpZGUtZGV0YWlscy1tb2Rl Jy4iCiAgIDp0eXBlICcocmVwZWF0IGludGVnZXIpCisgIDpncm91cCAnZGlyZWQKKyAgOnZlcnNp b24gIjMwLjEiKQorCisoZGVmY3VzdG9tIGRpcmVkLWZpbGVuYW1lLWRpc3BsYXktbGVuZ3RoIG5p bAorICAiSWYgbm9uLW5pbCwgcmVzdHJpY3QgdGhlIGRpc3BsYXkgbGVuZ3RoIG9mIGZpbGVuYW1l cy4KK0lmIHRoZSB2YWx1ZSBpcyB0aGUgc3ltYm9sIGB3aW5kb3cnLCB0aGUgcmlnaHQgZWRnZSBv ZiBjdXJyZW50Cit3aW5kb3cgaXMgdXNlZCBhcyB0aGUgcmVzdHJpY3Rpb24uICBPdGhlcndpc2Us IGl0IHNob3VsZCBiZSBhbgoraW50ZWdlciByZXByZXNlbnRpbmcgdGhlIG1heGltdW0gZmlsZW5h bWUgbGVuZ3RoLgorCitUaGUgbWlkZGxlIHBhcnQgb2YgZmlsZW5hbWUgd2hvc2UgbGVuZ3RoIGV4 Y2VlZHMgdGhlIHJlc3RyaWN0aW9uCitpcyBoaWRkZW4gYnkgdXNpbmcgdGhlIGBpbnZpc2libGUn IHByb3BlcnR5IGFuZCBhbiBlbGxpcHNpcyBpcworZGlzcGxheWVkIGluc3RlYWQuIgorICA6dHlw ZSAnKGNob2ljZSAoY29uc3QgICA6dGFnICJObyByZXN0cmljdGlvbiIgbmlsKQorICAgICAgICAg ICAgICAgICAoY29uc3QgICA6dGFnICJXaW5kb3ciIHdpbmRvdykKKyAgICAgICAgICAgICAgICAg KGludGVnZXIgOnRhZyAiSW50ZWdlciIpKQorICA6Z3JvdXAgJ2RpcmVkCiAgIDp2ZXJzaW9uICIz MC4xIikKIAogDApAQCAtMTkwMyw0OCArMTkyMSw2MSBAQCBkaXJlZC1pbnNlcnQtc2V0LXByb3Bl cnRpZXMKICAgIkFkZCB2YXJpb3VzIHRleHQgcHJvcGVydGllcyB0byB0aGUgbGluZXMgaW4gdGhl IHJlZ2lvbiwgZnJvbSBCRUcgdG8gRU5ELiIKICAgKHNhdmUtZXhjdXJzaW9uCiAgICAgKGdvdG8t Y2hhciBiZWcpCi0gICAgKHdoaWxlICg8IChwb2ludCkgZW5kKQotICAgICAgKGlnbm9yZS1lcnJv cnMKLQkoaWYgKG5vdCAoZGlyZWQtbW92ZS10by1maWxlbmFtZSkpCi0JICAgICh1bmxlc3MgKG9y IChsb29raW5nLWF0LXAgIl4kIikKLQkJCShsb29raW5nLWF0LXAgZGlyZWQtc3ViZGlyLXJlZ2V4 cCkpCi0JICAgICAgKHB1dC10ZXh0LXByb3BlcnR5IChsaW5lLWJlZ2lubmluZy1wb3NpdGlvbikK LQkJCQkgKDErIChsaW5lLWVuZC1wb3NpdGlvbikpCi0JCQkJICdpbnZpc2libGUgJ2RpcmVkLWhp ZGUtZGV0YWlscy1pbmZvcm1hdGlvbikpCi0JICAoc2F2ZS1leGN1cnNpb24KLSAgICAgICAgICAg IChsZXQgKChlbmQgKDEtIChwb2ludCkpKQotICAgICAgICAgICAgICAgICAgKG9wb2ludCAoZ290 by1jaGFyICgxKyAocG9zLWJvbCkpKSkKLSAgICAgICAgICAgICAgICAgIChpIDApKQotICAgICAg ICAgICAgICAocHV0LXRleHQtcHJvcGVydHkgb3BvaW50IGVuZCAnaW52aXNpYmxlICdkaXJlZC1o aWRlLWRldGFpbHMtZGV0YWlsKQotICAgICAgICAgICAgICAod2hpbGUgKHJlLXNlYXJjaC1mb3J3 YXJkICJbXiBdKyIgZW5kIHQpCi0gICAgICAgICAgICAgICAgKHdoZW4gKG1lbWJlciAoY2wtaW5j ZiBpKSBkaXJlZC1oaWRlLWRldGFpbHMtcHJlc2VydmVkLWNvbHVtbnMpCi0gICAgICAgICAgICAg ICAgICAocHV0LXRleHQtcHJvcGVydHkgb3BvaW50IChwb2ludCkgJ2ludmlzaWJsZSBuaWwpKQot ICAgICAgICAgICAgICAgIChzZXRxIG9wb2ludCAocG9pbnQpKSkpKQotICAgICAgICAgIChsZXQg KChiZWcgKHBvaW50KSkgKGVuZCAoc2F2ZS1leGN1cnNpb24KLQkgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIChkaXJlZC1tb3ZlLXRvLWVuZC1vZi1maWxlbmFtZSkKLQkgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICgxLSAocG9pbnQpKSkpKQotICAgICAgICAgICAgKGlmIGRpcmVkLWNs aWNrLXRvLXNlbGVjdC1tb2RlCi0gICAgICAgICAgICAgICAgKHB1dC10ZXh0LXByb3BlcnR5IGJl ZyBlbmQgJ2tleW1hcAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaXJlZC1j bGljay10by1zZWxlY3QtbWFwKQotICAgICAgICAgICAgICAod2hlbiAoYW5kIGRpcmVkLW1vdXNl LWRyYWctZmlsZXMgKGZib3VuZHAgJ3gtYmVnaW4tZHJhZykpCi0gICAgICAgICAgICAgICAgKHB1 dC10ZXh0LXByb3BlcnR5IGJlZyBlbmQgJ2tleW1hcAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBkaXJlZC1tb3VzZS1kcmFnLWZpbGVzLW1hcCkpKQotCSAgICAoYWRkLXRleHQt cHJvcGVydGllcwotCSAgICAgYmVnICgxKyBlbmQpCi0JICAgICBgKG1vdXNlLWZhY2UKLQkgICAg ICAgaGlnaGxpZ2h0Ci0JICAgICAgIGRpcmVkLWZpbGVuYW1lIHQKLQkgICAgICAgaGVscC1lY2hv ICwoaWYgZGlyZWQtY2xpY2stdG8tc2VsZWN0LW1vZGUKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICJtb3VzZS0yOiBtYXJrIG9yIHVubWFyayB0aGlzIGZpbGUiCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgKGlmIChhbmQgZGlyZWQtbW91c2UtZHJhZy1maWxlcwotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIChmYm91bmRwICd4LWJlZ2luLWRyYWcpKQotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiZG93bi1tb3VzZS0xOiBkcmFnIHRoaXMgZmls ZSB0byBhbm90aGVyIHByb2dyYW0KKyAgICAobGV0ICgoZWxsLWxlbiAoZGlyZWQtLWdldC1lbGxp cHNpcy1sZW5ndGgpKSBtYXhsZW4gZmlsZW5hbWUtY29sKQorICAgICAgKHdoaWxlICg8IChwb2lu dCkgZW5kKQorICAgICAgICAoaWdub3JlLWVycm9ycworCSAgKGlmIChub3QgKGRpcmVkLW1vdmUt dG8tZmlsZW5hbWUpKQorCSAgICAgICh1bmxlc3MgKG9yIChsb29raW5nLWF0LXAgIl4kIikKKwkJ CSAgKGxvb2tpbmctYXQtcCBkaXJlZC1zdWJkaXItcmVnZXhwKSkKKwkgICAgICAgIChwdXQtdGV4 dC1wcm9wZXJ0eSAobGluZS1iZWdpbm5pbmctcG9zaXRpb24pCisJCQkJICAgKDErIChsaW5lLWVu ZC1wb3NpdGlvbikpCisJCQkJICAgJ2ludmlzaWJsZSAnZGlyZWQtaGlkZS1kZXRhaWxzLWluZm9y bWF0aW9uKSkKKwkgICAgKHNhdmUtZXhjdXJzaW9uCisgICAgICAgICAgICAgIChsZXQgKChlbmQg KDEtIChwb2ludCkpKQorICAgICAgICAgICAgICAgICAgICAob3BvaW50IChnb3RvLWNoYXIgKDEr IChwb3MtYm9sKSkpKQorICAgICAgICAgICAgICAgICAgICAoaSAwKSkKKyAgICAgICAgICAgICAg ICAocHV0LXRleHQtcHJvcGVydHkgb3BvaW50IGVuZCAnaW52aXNpYmxlICdkaXJlZC1oaWRlLWRl dGFpbHMtZGV0YWlsKQorICAgICAgICAgICAgICAgICh3aGlsZSAocmUtc2VhcmNoLWZvcndhcmQg IlteIF0rIiBlbmQgdCkKKyAgICAgICAgICAgICAgICAgICh3aGVuIChtZW1iZXIgKGNsLWluY2Yg aSkgZGlyZWQtaGlkZS1kZXRhaWxzLXByZXNlcnZlZC1jb2x1bW5zKQorICAgICAgICAgICAgICAg ICAgICAocHV0LXRleHQtcHJvcGVydHkgb3BvaW50IChwb2ludCkgJ2ludmlzaWJsZSBuaWwpKQor ICAgICAgICAgICAgICAgICAgKHNldHEgb3BvaW50IChwb2ludCkpKSkpCisgICAgICAgICAgICAo bGV0ICgoYmVnIChwb2ludCkpIChlbmQgKHNhdmUtZXhjdXJzaW9uCisJICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIChkaXJlZC1tb3ZlLXRvLWVuZC1vZi1maWxlbmFtZSkKKwkgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgKDEtIChwb2ludCkpKSkpCisgICAgICAgICAgICAgIChp ZiBkaXJlZC1jbGljay10by1zZWxlY3QtbW9kZQorICAgICAgICAgICAgICAgICAgKHB1dC10ZXh0 LXByb3BlcnR5IGJlZyBlbmQgJ2tleW1hcAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGRpcmVkLWNsaWNrLXRvLXNlbGVjdC1tYXApCisgICAgICAgICAgICAgICAgKHdoZW4g KGFuZCBkaXJlZC1tb3VzZS1kcmFnLWZpbGVzIChmYm91bmRwICd4LWJlZ2luLWRyYWcpKQorICAg ICAgICAgICAgICAgICAgKHB1dC10ZXh0LXByb3BlcnR5IGJlZyBlbmQgJ2tleW1hcAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpcmVkLW1vdXNlLWRyYWctZmlsZXMtbWFw KSkpCisgICAgICAgICAgICAgICh3aGVuIGRpcmVkLWZpbGVuYW1lLWRpc3BsYXktbGVuZ3RoCisg ICAgICAgICAgICAgICAgKGxldCAoKGxlbiAoc3RyaW5nLXdpZHRoIChidWZmZXItc3Vic3RyaW5n IGJlZyAoMSsgZW5kKSkpKQorICAgICAgICAgICAgICAgICAgICAgIGVsbC1iZWcpCisgICAgICAg ICAgICAgICAgICAob3IgbWF4bGVuIChzZXRxIG1heGxlbiAoZGlyZWQtLWdldC1maWxlbmFtZS1k aXNwbGF5LWxlbmd0aCkpKQorICAgICAgICAgICAgICAgICAgKHdoZW4gKGFuZCAoaW50ZWdlcnAg bWF4bGVuKSAoPiBsZW4gbWF4bGVuICgrIGVsbC1sZW4gMikpKQorICAgICAgICAgICAgICAgICAg ICAob3IgZmlsZW5hbWUtY29sIChzZXRxIGZpbGVuYW1lLWNvbCAoY3VycmVudC1jb2x1bW4pKSkK KyAgICAgICAgICAgICAgICAgICAgKG1vdmUtdG8tY29sdW1uICgrIGZpbGVuYW1lLWNvbCAoLyBt YXhsZW4gMikpKQorICAgICAgICAgICAgICAgICAgICAoc2V0cSBlbGwtYmVnIChwb2ludCkpCisg ICAgICAgICAgICAgICAgICAgIChtb3ZlLXRvLWNvbHVtbiAoKyBmaWxlbmFtZS1jb2wgKC8gbWF4 bGVuIDIpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoLSBsZW4gbWF4 bGVuKSBlbGwtbGVuKSkKKyAgICAgICAgICAgICAgICAgICAgKHB1dC10ZXh0LXByb3BlcnR5Cisg ICAgICAgICAgICAgICAgICAgICBlbGwtYmVnIChwb2ludCkgJ2ludmlzaWJsZSAnZGlyZWQtZmls ZW5hbWUtaGlkZSkpKSkKKwkgICAgICAoYWRkLXRleHQtcHJvcGVydGllcworCSAgICAgICBiZWcg KDErIGVuZCkKKwkgICAgICAgYChtb3VzZS1mYWNlCisJICAgICAgICAgaGlnaGxpZ2h0CisJICAg ICAgICAgZGlyZWQtZmlsZW5hbWUgdAorCSAgICAgICAgIGhlbHAtZWNobyAsKGlmIGRpcmVkLWNs aWNrLXRvLXNlbGVjdC1tb2RlCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJtb3Vz ZS0yOiBtYXJrIG9yIHVubWFyayB0aGlzIGZpbGUiCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAoaWYgKGFuZCBkaXJlZC1tb3VzZS1kcmFnLWZpbGVzCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAoZmJvdW5kcCAneC1iZWdpbi1kcmFnKSkKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAiZG93bi1tb3VzZS0xOiBkcmFnIHRoaXMgZmlsZSB0byBh bm90aGVyIHByb2dyYW0KIG1vdXNlLTI6IHZpc2l0IHRoaXMgZmlsZSBpbiBvdGhlciB3aW5kb3ci Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAibW91c2UtMjogdmlzaXQgdGhpcyBmaWxl IGluIG90aGVyIHdpbmRvdyIpKSkpCi0JICAgICh3aGVuICg8ICgrIGVuZCA1KSAobGluZS1lbmQt cG9zaXRpb24pKQotCSAgICAgIChwdXQtdGV4dC1wcm9wZXJ0eSAoKyBlbmQgNSkgKGxpbmUtZW5k LXBvc2l0aW9uKQotCQkJICAgICAgICAgJ2ludmlzaWJsZSAnZGlyZWQtaGlkZS1kZXRhaWxzLWxp bmspKSkpKQotICAgICAgKGZvcndhcmQtbGluZSAxKSkpKQorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAibW91c2UtMjogdmlzaXQgdGhpcyBmaWxlIGluIG90aGVyIHdpbmRvdyIpKSkp CisJICAgICAgKHdoZW4gKDwgKCsgZW5kIDUpIChsaW5lLWVuZC1wb3NpdGlvbikpCisJICAgICAg ICAocHV0LXRleHQtcHJvcGVydHkgKCsgZW5kIDUpIChsaW5lLWVuZC1wb3NpdGlvbikKKwkJCSAg ICAgICAgICAgJ2ludmlzaWJsZSAnZGlyZWQtaGlkZS1kZXRhaWxzLWxpbmspKSkpKQorICAgICAg ICAoZm9yd2FyZC1saW5lIDEpKSkpKQogCiAoZGVmdW4gZGlyZWQtLW1ha2UtZGlyZWN0b3J5LWNs aWNrYWJsZSAoKQogICAoc2F2ZS1leGN1cnNpb24KQEAgLTE5NzYsNiArMjAwNywyNCBAQCBkaXJl ZC0tbWFrZS1kaXJlY3RvcnktY2xpY2thYmxlCiAgICAgICAgICAgICAgICAgICAgICAgICAgICJS RVQiIGNsaWNrKSkpKQogICAgICAgICAgIChzZXRxIHNlZ21lbnQtc3RhcnQgKHBvaW50KSkpKSkp KQogCisoZGVmdW4gZGlyZWQtLWdldC1lbGxpcHNpcy1sZW5ndGggKCkKKyAgIlJldHVybiBsZW5n dGggb2YgZWxsaXBzaXMuIgorICAobGV0KiAoKGR0IChvciAod2luZG93LWRpc3BsYXktdGFibGUp CisgICAgICAgICAgICAgICAgIGJ1ZmZlci1kaXNwbGF5LXRhYmxlCisgICAgICAgICAgICAgICAg IHN0YW5kYXJkLWRpc3BsYXktdGFibGUpKQorICAgICAgICAgKGdseXBocyAoYW5kIGR0IChkaXNw bGF5LXRhYmxlLXNsb3QgZHQgJ3NlbGVjdGl2ZS1kaXNwbGF5KSkpKQorICAgIChzdHJpbmctd2lk dGggKGlmIGdseXBocyAoY29uY2F0IGdseXBocykgIi4uLiIpKSkpCisKKyhkZWZ1biBkaXJlZC0t Z2V0LWZpbGVuYW1lLWRpc3BsYXktbGVuZ3RoICgpCisgICJSZXR1cm4gbWF4aW11bSBkaXNwbGF5 IGxlbmd0aCBvZiBmaWxlbmFtZS4KK1doZW4gYGRpcmVkLWZpbGVuYW1lLWRpc3BsYXktbGVuZ3Ro JyBpcyBub3QgYW4gaW50ZWdlciwgdGhlCitmdW5jdGlvbiBhY3R1YWxseSByZXR1cm5zIHRoZSBu dW1iZXIgb2YgY29sdW1ucyBhdmFpbGFibGUgZm9yCitkaXNwbGF5aW5nIHRoZSBmaWxlIG5hbWVz LCBhbmQgc2hvdWxkIGJlIGNhbGxlZCB3aXRoIHBvaW50IGF0IHRoZQorZmlyc3QgY2hhcmFjdGVy IG9mIHRoZSBmaWxlIG5hbWUuIgorICAoaWYgKGludGVnZXJwIGRpcmVkLWZpbGVuYW1lLWRpc3Bs YXktbGVuZ3RoKQorICAgICAgZGlyZWQtZmlsZW5hbWUtZGlzcGxheS1sZW5ndGgKKyAgICAoLSAo d2luZG93LW1heC1jaGFycy1wZXItbGluZSkgMSAoY3VycmVudC1jb2x1bW4pKSkpCisKIAwKIDs7 OyBSZXZlcnRpbmcgYSBkaXJlZCBidWZmZXIKIApAQCAtMjYxNyw2ICsyNjY2LDcgQEAgZGlyZWQt bW9kZQogCW1vZGUtbGluZS1idWZmZXItaWRlbnRpZmljYXRpb24KIAkocHJvcGVydGl6ZWQtYnVm ZmVyLWlkZW50aWZpY2F0aW9uICIlMTdiIikpCiAgIChhZGQtdG8taW52aXNpYmlsaXR5LXNwZWMg JyhkaXJlZCAuIHQpKQorICAoZGlyZWQtZmlsZW5hbWUtdXBkYXRlLWludmlzaWJpbGl0eS1zcGVj KQogICA7OyBJZ25vcmUgZGlyZWQtaGlkZS1kZXRhaWxzLSogdmFsdWUgb2YgaW52aXNpYmxlIHRl eHQgcHJvcGVydHkgYnkgZGVmYXVsdC4KICAgKHdoZW4gKGVxIGJ1ZmZlci1pbnZpc2liaWxpdHkt c3BlYyB0KQogICAgIChzZXRxIGJ1ZmZlci1pbnZpc2liaWxpdHktc3BlYyAobGlzdCB0KSkpCkBA IC0zMTA2LDYgKzMxNTYsMTUgQEAgZGlyZWQtaGlkZS1kZXRhaWxzLXVwZGF0ZS1pbnZpc2liaWxp dHktc3BlYwogDAogOzs7IEZ1bmN0aW9ucyB0byBoaWRlL3VuaGlkZSB0ZXh0CiAKKyhkZWZ1biBk aXJlZC1maWxlbmFtZS11cGRhdGUtaW52aXNpYmlsaXR5LXNwZWMgKCkKKyAgIlVwZGF0ZSBgYnVm ZmVyLWludmlzaWJpbGl0eS1zcGVjJyBmb3IgZmlsZW5hbWVzLgorU3BlY2lmaWNhbGx5LCB0aGUg ZmlsZW5hbWUgaW52aXNpYmlsaXR5IHNwZWMgaXMgYWRkZWQgaW4gRGlyZWQKK2J1ZmZlcnMgYW5k IHJlbW92ZWQgaW4gV0RpcmVkIGJ1ZmZlcnMuIgorICAoZnVuY2FsbCAoaWYgKGRlcml2ZWQtbW9k ZS1wICdkaXJlZC1tb2RlKQorICAgICAgICAgICAgICAgJ2FkZC10by1pbnZpc2liaWxpdHktc3Bl YworICAgICAgICAgICAgICdyZW1vdmUtZnJvbS1pbnZpc2liaWxpdHktc3BlYykKKyAgICAgICAg ICAgJyhkaXJlZC1maWxlbmFtZS1oaWRlIC4gdCkpKQorCiAoZGVmdW4gZGlyZWQtLWZpbmQtaGlk ZGVuLXBvcyAoc3RhcnQgZW5kKQogICAodGV4dC1wcm9wZXJ0eS1hbnkgc3RhcnQgZW5kICdpbnZp c2libGUgJ2RpcmVkKSkKIApkaWZmIC0tZ2l0IGEvbGlzcC93ZGlyZWQuZWwgYi9saXNwL3dkaXJl ZC5lbAppbmRleCAwNzlkOTNkNjAxMS4uYjViMDFmMGQwODkgMTAwNjQ0Ci0tLSBhL2xpc3Avd2Rp cmVkLmVsCisrKyBiL2xpc3Avd2RpcmVkLmVsCkBAIC0yNjEsNiArMjYxLDEwIEBAIHdkaXJlZC1j aGFuZ2UtdG8td2RpcmVkLW1vZGUKICAgKGFkZC1mdW5jdGlvbiA6b3ZlcnJpZGUgKGxvY2FsICdy ZXZlcnQtYnVmZmVyLWZ1bmN0aW9uKSAjJ3dkaXJlZC1yZXZlcnQpCiAgIChzZXQtYnVmZmVyLW1v ZGlmaWVkLXAgbmlsKQogICAoc2V0cSBidWZmZXItdW5kby1saXN0IG5pbCkKKyAgOzsgTm9uLW5p bCBgZGlyZWQtZmlsZW5hbWUtZGlzcGxheS1sZW5ndGgnIG1heSBjYXVzZSBmaWxlbmFtZXMgdG8g YmUKKyAgOzsgaGlkZGVuIHBhcnRseSwgc28gd2UgcmVtb3ZlIGZpbGVuYW1lIGludmlzaWJpbGl0 eSBzcGVjCisgIDs7IHRlbXBvcmFyaWx5IHRvIGVuc3VyZSBmaWxlbmFtZXMgYXJlIHZpc2libGUg Zm9yIGVkaXRpbmcuCisgIChkaXJlZC1maWxlbmFtZS11cGRhdGUtaW52aXNpYmlsaXR5LXNwZWMp CiAgIChydW4tbW9kZS1ob29rcyAnd2RpcmVkLW1vZGUtaG9vaykKICAgKG1lc3NhZ2UgIiVzIiAo c3Vic3RpdHV0ZS1jb21tYW5kLWtleXMKIAkJICJQcmVzcyBcXFt3ZGlyZWQtZmluaXNoLWVkaXRd IHdoZW4gZmluaXNoZWQgXApAQCAtNDU2LDYgKzQ2MCw5IEBAIHdkaXJlZC1jaGFuZ2UtdG8tZGly ZWQtbW9kZQogICAoZGlyZWQtc29ydC1zZXQtbW9kZS1saW5lKQogICAoZGlyZWQtYWR2ZXJ0aXNl KQogICAoZGlyZWQtaGlkZS1kZXRhaWxzLXVwZGF0ZS1pbnZpc2liaWxpdHktc3BlYykKKyAgOzsg UmVzdG9yZSBmaWxlbmFtZSBpbnZpc2liaWxpdHkgc3BlYyB0aGF0IGlzIHJlbW92ZWQgaW4KKyAg OzsgYHdkaXJlZC1jaGFuZ2UtdG8td2RpcmVkLW1vZGUnLgorICAoZGlyZWQtZmlsZW5hbWUtdXBk YXRlLWludmlzaWJpbGl0eS1zcGVjKQogICAocmVtb3ZlLWhvb2sgJ2tpbGwtYnVmZmVyLWhvb2sg Iyd3ZGlyZWQtY2hlY2sta2lsbC1idWZmZXIgdCkKICAgKHJlbW92ZS1ob29rICdiZWZvcmUtY2hh bmdlLWZ1bmN0aW9ucyAjJ3dkaXJlZC0tYmVmb3JlLWNoYW5nZS1mbiB0KQogICAocmVtb3ZlLWhv b2sgJ2FmdGVyLWNoYW5nZS1mdW5jdGlvbnMgIyd3ZGlyZWQtLXJlc3RvcmUtcHJvcGVydGllcyB0 KQotLSAKMi4yNS4xCgo= --0000000000002dbca8060a8e005d--