From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Jens Schmidt via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#63627: Improve plstore.el and fix various issues of it Date: Mon, 22 May 2023 22:11:19 +0200 Message-ID: <37949bc5-c572-ff98-ebe6-9217ab7067cc@vodafonemail.de> References: <2063d5d2-ae9e-020a-3c19-54508ddbabab@vodafonemail.de> Reply-To: Jens Schmidt Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------utN6yetRwjNAcKNnrsmPrziz" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="29376"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 To: 63627@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon May 22 22:12:33 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 1q1BtQ-0007Ob-NX for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 22 May 2023 22:12:32 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1Bt4-00019M-5Z; Mon, 22 May 2023 16:12:10 -0400 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 1q1Bt2-00019B-Ae for bug-gnu-emacs@gnu.org; Mon, 22 May 2023 16:12:08 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1Bsx-0001kB-3R for bug-gnu-emacs@gnu.org; Mon, 22 May 2023 16:12:07 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q1Bsw-0007U7-Dz for bug-gnu-emacs@gnu.org; Mon, 22 May 2023 16:12:02 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: <2063d5d2-ae9e-020a-3c19-54508ddbabab@vodafonemail.de> Resent-From: Jens Schmidt Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 22 May 2023 20:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63627 X-GNU-PR-Package: emacs Original-Received: via spool by 63627-submit@debbugs.gnu.org id=B63627.168478630628746 (code B ref 63627); Mon, 22 May 2023 20:12:02 +0000 Original-Received: (at 63627) by debbugs.gnu.org; 22 May 2023 20:11:46 +0000 Original-Received: from localhost ([127.0.0.1]:36840 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1Bsf-0007TZ-AJ for submit@debbugs.gnu.org; Mon, 22 May 2023 16:11:46 -0400 Original-Received: from mr4.vodafonemail.de ([145.253.228.164]:60762) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1Bsa-0007TD-0g for 63627@debbugs.gnu.org; Mon, 22 May 2023 16:11:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vodafonemail.de; s=vfde-mb-mr2-21dec; t=1684786293; bh=z++YKghaTVTaG2LGNhiXhWTc8KhLdzx/7nzvWyy/gFI=; h=Content-Type:Message-ID:Date:User-Agent:To:Content-Language:From: Subject:From; b=f8Gdr0Hp4AaLt5WVh+LuWh6Ie6bQ70yP2Ip1nvi2lLOK0tN5cV0CfSbeNZEz429hl 7B1ARV6EENVWR2oosj+MMCNKeWia74SE5S5ruuIPGQSrcCoINOBt9xFiZTBUB4G49D kVdF8QYe9OTkIjflDQ5J7qoVgOOfabn6SIAXwaYw= Original-Received: from smtp.vodafone.de (unknown [10.0.0.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by mr4.vodafonemail.de (Postfix) with ESMTPS id 4QQ7rP6gSHz1y1W for <63627@debbugs.gnu.org>; Mon, 22 May 2023 20:11:33 +0000 (UTC) Original-Received: from [192.168.178.42] (port-92-194-94-177.dynamic.as20676.net [92.194.94.177]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp.vodafone.de (Postfix) with ESMTPSA id 4QQ7rK1j9Gz9s9r for <63627@debbugs.gnu.org>; Mon, 22 May 2023 20:11:26 +0000 (UTC) Content-Language: de-DE-frami, en-US X-purgate-type: clean X-purgate: clean X-purgate-size: 26545 X-purgate-ID: 155817::1684786289-50FF8404-D46C6A4B/0/0 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:262191 Archived-At: This is a multi-part message in MIME format. --------------utN6yetRwjNAcKNnrsmPrziz Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Tag: patch Here come the first two patches: 0001-Add-internal-documentation-on-plstore.el.patch Few but large changes, mostly in the commentary section, to describe internal structures and nail down terminology. 0002-Brush-up-doc-strings-and-terminology-in-plstore.el.patch Many but small changes, building on the work from the first patch. All of these changes so far are doc fixes or message changes, none of them touches any code. Not sure whether they qualify for emacs-29, but I guess it would be easier to have them there to have the diff context ready for any following bug fixes. The further plan is: Provide bug fixes, ERT tests for existing code, new features, ERT tests for new features (roughly in that order, new features last). So please don't close this bug yet. Comments welcome. --------------utN6yetRwjNAcKNnrsmPrziz Content-Type: text/x-patch; charset=UTF-8; name="0001-Add-internal-documentation-on-plstore.el.patch" Content-Disposition: attachment; filename="0001-Add-internal-documentation-on-plstore.el.patch" Content-Transfer-Encoding: base64 RnJvbSA2YjBmYzRiYzkzNzE3ZTZmZjM0YmZiMDViZjY2YTc5ZDkzNzBhYjVkIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKZW5zIFNjaG1pZHQgPGpzY2htaWR0NGdudUB2b2Rh Zm9uZW1haWwuZGU+CkRhdGU6IFN1biwgMjEgTWF5IDIwMjMgMjE6Mzc6MzUgKzAyMDAKU3Vi amVjdDogW1BBVENIIDEvMl0gQWRkIGludGVybmFsIGRvY3VtZW50YXRpb24gb24gcGxzdG9y ZS5lbAoKKiBsaXNwL3Bsc3RvcmUuZWw6IEFkZCBpbnRlcm5hbCBkb2N1bWVudGF0aW9uIGFu ZCBzb21lIHdvcmRzIG9mCndhcm5pbmcgaW4gdGhlIHVzZXIgZG9jdW1lbnRhdGlvbi4gIChC dWcjNjM2MjcpCi0tLQogbGlzcC9wbHN0b3JlLmVsIHwgMTMzICsrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLQogMSBmaWxlIGNoYW5nZWQsIDEzMSBp bnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpc3AvcGxzdG9y ZS5lbCBiL2xpc3AvcGxzdG9yZS5lbAppbmRleCAwMjc2YTc1MmEwZi4uMWEwZGFjZmZiMDEg MTAwNjQ0Ci0tLSBhL2xpc3AvcGxzdG9yZS5lbAorKysgYi9saXNwL3Bsc3RvcmUuZWwKQEAg LTI0LDYgKzI0LDE0IEBACiAKIDs7IFBsaXN0IGJhc2VkIGRhdGEgc3RvcmUgcHJvdmlkaW5n IHNlYXJjaCBhbmQgcGFydGlhbCBlbmNyeXB0aW9uLgogOzsKKzs7IEJ5IGRlZmF1bHQsIHRo aXMgcGFja2FnZSB1c2VzIHN5bW1ldHJpYyBlbmNyeXB0aW9uLCB3aGljaCBtZWFucworOzsg dGhhdCB5b3UgaGF2ZSB0byBlbnRlciB0aGUgcGFzc3dvcmQgcHJvdGVjdGluZyB5b3VyIHN0 b3JlIG1vcmUKKzs7IG9mdGVuIHRoYW4geW91IHByb2JhYmx5IGV4cGVjdCB0by4gIFRvIHVz ZSBwdWJsaWMga2V5IGVuY3J5cHRpb24KKzs7IHdpdGggdGhpcyBwYWNrYWdlLCBjcmVhdGUg YSBHbnVQRyBrZXkgYW5kIGN1c3RvbWl6ZSB1c2VyIG9wdGlvbgorOzsgYHBsc3RvcmUtZW5j cnlwdC10bycgdG8gdXNlIGl0LiAgWW91IGNhbiB0aGVuIGNvbmZpZ3VyZSB0aGUgR251UEcK Kzs7IGFnZW50IHRvIGFkanVzdCBjYWNoaW5nIGFuZCBleHBpcmF0aW9uIG9mIHRoZSBwYXNz cGhyYXNlIGZvciB5b3VyCis7OyBzdG9yZS4KKzs7CiA7OyBDcmVhdGluZzoKIDs7CiA7OyA7 OyBPcGVuIGEgbmV3IHN0b3JlIGFzc29jaWF0ZWQgd2l0aCB+Ly5lbWFjcy5kL2F1dGgucGxp c3QuCkBAIC00MywxMiArNTEsMTYgQEAKIDs7IDs7IEtpbGwgdGhlIGJ1ZmZlciB2aXNpdGlu ZyB+Ly5lbWFjcy5kL2F1dGgucGxpc3QuCiA7OyAocGxzdG9yZS1jbG9zZSBzdG9yZSkKIDs7 Cis7OyBBdm9pZCBtYXJraW5nIG9uZSBwcm9wZXJ0eSBib3RoIGFzIHB1YmxpYyAqYW5kKiBz ZWNyZXQsIGFzIHRoZQorOzsgYmVoYXZpb3Igb2YgdGhpcyBwYWNrYWdlIHdpdGggcmVzcGVj dCB0byBzdWNoIGR1cGxpY2F0ZSBwcm9wZXJ0aWVzCis7OyBpcyBub3QgKHlldCkgZGVmaW5l ZC4KKzs7CiA7OyBTZWFyY2hpbmc6CiA7OwogOzsgKHNldHEgc3RvcmUgKHBsc3RvcmUtb3Bl biAoZXhwYW5kLWZpbGUtbmFtZSAifi8uZW1hY3MuZC9hdXRoLnBsaXN0IikpKQogOzsKIDs7 IDs7IEFzIHRoZSBlbnRyeSAiZm9vIiBhc3NvY2lhdGVkIHdpdGggImZvby5leGFtcGxlLm9y ZyIgaGFzIG5vCi07OyA7OyBzZWNyZXQgcHJvcGVydGllcywgbm8gbmVlZCB0byBkZWNyeXB0 aW9uLgorOzsgOzsgc2VjcmV0IHByb3BlcnRpZXMsIG5vIG5lZWQgZm9yIGRlY3J5cHRpb24u CiA7OyAocGxzdG9yZS1maW5kIHN0b3JlICcoOmhvc3QgKCJmb28uZXhhbXBsZS5vcmciKSkp CiA7OwogOzsgOzsgQXMgdGhlIGVudHJ5ICJiYXIiIGFzc29jaWF0ZWQgd2l0aCAiYmFyLmV4 YW1wbGUub3JnIiBoYXMgYQpAQCAtNzMsMTAgKzg1LDExMiBAQAogOzsKIDs7IHdoZXJlIHRo ZSBwcmVmaXhpbmcgYDpzZWNyZXQtJyBtZWFucyB0aGUgcHJvcGVydHkgKHdpdGhvdXQKIDs7 IGA6c2VjcmV0LScgcHJlZml4KSBpcyBtYXJrZWQgYXMgc2VjcmV0LiAgVGh1cywgd2hlbiB5 b3Ugc2F2ZSB0aGUKLTs7IGJ1ZmZlciwgdGhlIGA6c2VjcmV0LXVzZXInIHByb3BlcnR5IGlz IGVuY3J5cHRlZCBhcyBgOnVzZXInLgorOzsgYnVmZmVyLCB0aGUgYDpzZWNyZXQtdXNlcicg cHJvcGVydHkgaXMgZW5jcnlwdGVkIGFzIGA6dXNlcicuICBEbworOzsgbm90IHVzZSBhIHBy b3BlcnR5IGNvbnNpc3Rpbmcgc29sZWx5IG9mIHRoZSBwcmVmaXgsIGFzIHRoZSBiZWhhdmlv cgorOzsgb2YgdGhpcyBwYWNrYWdlIHdpdGggcmVzcGVjdCB0byBzdWNoIHByb3BlcnRpZXMg aXMgbm90ICh5ZXQpCis7OyBkZWZpbmVkLgogOzsKIDs7IFlvdSBjYW4gdG9nZ2xlIHRoZSB2 aWV3IGJldHdlZW4gZW5jcnlwdGVkIGZvcm0gYW5kIHRoZSBkZWNyeXB0ZWQKIDs7IGZvcm0g d2l0aCBDLWMgQy1jLgorOzsKKzs7IElmIHlvdSBoYXZlIG9wZW5lZCBhIHBsc3RvcmUgd2l0 aCBgcGxzdG9yZS1vcGVuJyB5b3Ugc2hvdWxkIG5vdAorOzsgZWRpdCBpdHMgdW5kZXJseWlu ZyBidWZmZXIgaW4gYHBsc3RvcmUtbW9kZScgb3IgaW4gYW55IG90aGVyIHdheSBhdAorOzsg dGhlIHNhbWUgdGltZSwgc2luY2UgeW91ciBtYW51YWwgY2hhbmdlcyB3aWxsIGJlIG92ZXJ3 cml0dGVuIHdoZW4KKzs7IGBwbHN0b3JlLXNhdmUnIGlzIGNhbGxlZCBvbiB0aGF0IHBsc3Rv cmUuCis7OworOzsgSW50ZXJuYWxzOgorOzsKKzs7IFRoaXMgaXMgaW5mb3JtYXRpb24gb24g dGhlIGludGVybmFsIGRhdGEgc3RydWN0dXJlIGFuZCBmdW5jdGlvbnMgb2YKKzs7IHRoaXMg cGFja2FnZS4gIE5vbmUgb2YgaXQgc2hvdWxkIGJlIG5lY2Vzc2FyeSB0byBhY3R1YWxseSB1 c2UgaXQuCis7OyBGb3IgZWFzaWVyIHJlYWRpbmcsIHdlIHVzdWFsbHkgZG8gbm90IGRpc3Rp bmd1aXNoIGluIHRoaXMgaW50ZXJuYWwKKzs7IGRvY3VtZW50YXRpb24gYmV0d2VlbiBhIExp c3Agb2JqZWN0IGFuZCBpdHMgcHJpbnRlZCByZXByZXNlbnRhdGlvbi4KKzs7Cis7OyBBIHBs c3RvcmUgY29ycmVzcG9uZHMgdG8gYW4gYWxpc3QgbWFwcGluZyBzdHJpbmdzIHRvIHByb3Bl cnR5Cis7OyBsaXN0cy4gIEludGVybmFsbHksIHRoYXQgYWxpc3QgaXMgb3JnYW5pemVkIGFz IHR3byBhbGlzdHMsIG9uZQorOzsgbWFwcGluZyB0byB0aGUgbm9uLXNlY3JldCBwcm9wZXJ0 aWVzIGFuZCBwbGFjZWhvbGRlcnMgZm9yIHRoZQorOzsgc2VjcmV0IHByb3BlcnRpZXMgKGNh bGxlZCAidGVtcGxhdGUgYWxpc3QiIHdpdGggaWRlbnRpZmllciBBTElTVCkKKzs7IGFuZCBv bmUgbWFwcGluZyB0byB0aGUgc2VjcmV0IHByb3BlcnRpZXMgKCJzZWNyZXQgYWxpc3QiLAor OzsgU0VDUkVULUFMSVNUKS4gIFRoZSBzZWNyZXQgYWxpc3QgaXMgcmVhZCBmcm9tIGFuZCB3 cml0dGVuIHRvIGZpbGUKKzs7IGFzIHBncC1lbmNyeXB0ZWQgcHJpbnRlZCByZXByZXNlbnRh dGlvbiBvZiB0aGUgYWxpc3QgKCJlbmNyeXB0ZWQKKzs7IGRhdGEiLCBFTkNSWVBURUQtREFU QSkuCis7OworOzsgRHVyaW5nIHRoZSBsaWZldGltZSBvZiBhIHBsc3RvcmUsIGEgdGhpcmQg dHlwZSBvZiBhbGlzdCBtYXkgcG9wIHVwLAorOzsgd2hpY2ggbWFwcyB0byB0aGUgbWVyZ2Vk IG5vbi1zZWNyZXQgcHJvcGVydGllcyBhbmQgcGxhaW4tdGV4dAorOzsgc2VjcmV0IHByb3Bl cnRpZXMgKCJtZXJnZWQgYWxpc3QiLCBNRVJHRUQtQUxJU1QpLgorOzsKKzs7IEFmdGVyIGV4 ZWN1dGluZyB0aGUgImZvbyIsICJiYXIiLCAiYmF6IiBleGFtcGxlIGZyb20gYWJvdmUgdGhl Cis7OyBhbGlzdHMgZGVzY3JpYmVkIGFib3ZlIGxvb2sgbGlrZSB0aGUgZm9sbG93aW5nOgor OzsKKzs7ICAgVGVtcGxhdGUgQWxpc3Q6Cis7OworOzsgICAgICgoImZvbyIgOmhvc3QgImZv by5leGFtcGxlLm9yZyIgOnBvcnQgODApCis7OyAgICAgICgiYmFyIiA6c2VjcmV0LXVzZXIg dCA6aG9zdCAiYmFyLmV4YW1wbGUub3JnIikKKzs7ICAgICAgKCJiYXoiIDpzZWNyZXQtcGFz c3dvcmQgdCA6aG9zdCAiYmF6LmV4YW1wbGUub3JnIikpCis7OworOzsgICBTZWNyZXQgQWxp c3Q6Cis7OworOzsgICAgICgoImJhciIgOnVzZXIgInRlc3QiKQorOzsgICAgICAoImJheiIg OnBhc3N3b3JkICJ0ZXN0IikpCis7OworOzsgICBNZXJnZWQgQWxpc3Q6Cis7OworOzsgICAg ICgoImZvbyIgOmhvc3QgImZvby5leGFtcGxlLm9yZyIgOnBvcnQgODApCis7OyAgICAgICgi YmFyIiA6dXNlciAidGVzdCIgOmhvc3QgImJhci5leGFtcGxlLm9yZyIpCis7OyAgICAgICgi YmF6IiA6cGFzc3dvcmQgInRlc3QiIDpob3N0ICJiYXouZXhhbXBsZS5vcmciKSkKKzs7Cis7 OyBGaW5hbGx5LCBhIHBsc3RvcmUgcmVxdWlyZXMgYSBidWZmZXIgKCJwbHN0b3JlIGJ1ZmZl ciIsIEJVRkZFUikgZm9yCis7OyBjb252ZXJzaW9uIGJldHdlZW4gaXRzIExpc3Agb2JqZWN0 cyBhbmQgaXRzIGZpbGUgcmVwcmVzZW50YXRpb24uCis7OyBJdCBpcyBpbXBvcnRhbnQgdG8g bm90ZSB0aGF0IHRoaXMgYnVmZmVyIGlzICpub3QqIGNvbnRpbnVvdXNseQorOzsgc3luY2hy b25pemVkIGFzIHRoZSBwbHN0b3JlIGNoYW5nZXMuICBEdXJpbmcgdGhlIGxpZmV0aW1lIG9m IGEKKzs7IHBsc3RvcmUsIGl0cyBidWZmZXIgaXMgcmVhZCBmcm9tIGluIGZ1bmN0aW9uIGBw bHN0b3JlLW9wZW4nIGFuZAorOzsgKGRlc3RydWN0aXZlbHkpIHdyaXR0ZW4gdG8gaW4gYHBs c3RvcmUtc2F2ZScsIGJ1dCBub3QgdG91Y2hlZAorOzsgb3RoZXJ3aXNlLiAgV2UgY2FsbCB0 aGUgZmlsZSB2aXNpdGVkIGJ5IHRoZSBwbHN0b3JlIGJ1ZmZlciB0aGUKKzs7IGFzc29jaWF0 ZWQgZmlsZSBvZiB0aGUgcGxzdG9yZS4KKzs7Cis7OyBXaXRoIHRoZSBpZGVudGlmaWVycyBk ZWZpbmVkIGFib3ZlIGEgcGxzdG9yZSBpcyBhIHZlY3RvciB3aXRoIHRoZQorOzsgZm9sbG93 aW5nIGVsZW1lbnRzIGFuZCBhY2Nlc3NvciBmdW5jdGlvbnM6Cis7OworOzsgICBbCis7OyAg ICAgQlVGRkVSICAgICAgICAgICA7IHBsc3RvcmUtLWdldC9zZXQtYnVmZmVyCis7OyAgICAg QUxJU1QgICAgICAgICAgICA7IHBsc3RvcmUtLWdldC9zZXQtYWxpc3QKKzs7ICAgICBFTkNS WVBURUQtREFUQSAgIDsgcGxzdG9yZS0tZ2V0L3NldC1lbmNyeXB0ZWQtZGF0YQorOzsgICAg IFNFQ1JFVC1BTElTVCAgICAgOyBwbHN0b3JlLS1nZXQvc2V0LXNlY3JldC1hbGlzdAorOzsg ICAgIE1FUkdFRC1BTElTVCAgICAgOyBwbHN0b3JlLS1nZXQvc2V0LW1lcmdlZC1hbGlzdAor OzsgICBdCis7OworOzsgV2hlbiBhIHBsc3RvcmUgaXMgY3JlYXRlZCB0aHJvdWdoIGBwbHN0 b3JlLW9wZW4nLCBpdHMgQUxJU1QgYW5kCis7OyBFTkNSWVBURUQtREFUQSBhcmUgaW5pdGlh bGl6ZWQgZnJvbSB0aGUgY29udGVudHMgb2YgQlVGRkVSIHdpdGhvdXQKKzs7IGFueSBkZWNy eXB0aW9uIHRha2luZyBwbGFjZSwgYW5kIE1FUkdFRC1BTElTVCBpcyBpbml0aWFsaXplZCBh cyBhCis7OyBjb3B5IG9mIEFMSVNULiAgKFdoaWNoIG1lYW5zIHRoYXQgYXQgdGhhdCBzdGFn ZSB0aGUgbWVyZ2VkIGFsaXN0Cis7OyBzdGlsbCBjb250YWlucyB0aGUgc2VjcmV0IHByb3Bl cnR5IHBsYWNlaG9sZGVycyEpCis7OworOzsgRHVyaW5nIG9uLWRlbWFuZCBkZWNyeXB0aW9u IG9mIGEgcGxzdG9yZSB0aHJvdWdoIGZ1bmN0aW9uCis7OyBgcGxzdG9yZS0tZGVjcnlwdCcs IFNFQ1JFVC1BTElTVCBpcyBwb3B1bGF0ZWQgZnJvbSBFTkNSWVBURUQtREFUQSwKKzs7IHdo aWNoIGlzIGluIHR1cm4gcmVwbGFjZWQgYnkgdmFsdWUgbmlsLiAgKFdoaWNoIGZ1cnRoZXIg c2VydmVzIGFzCis7OyBhbiBpbmRpY2F0b3IgdGhhdCB0aGUgcGxzdG9yZSBoYXMgYmVlbiBk ZWNyeXB0ZWQgYWxyZWFkeS4pICBJbgorOzsgYWRkaXRpb24sIE1FUkdFRC1BTElTVCBpcyBy ZWNvbXB1dGVkIGJ5IGZ1bmN0aW9uCis7OyBgcGxzdG9yZS0tbWVyZ2Utc2VjcmV0JyB0byBy ZXBsYWNlIHRoZSBzZWNyZXQgcHJvcGVydHkgcGxhY2Vob2xkZXJzCis7OyBieSB0aGVpciBw bGFpbi10ZXh0IHNlY3JldCBwcm9wZXJ0eSBlcXVpdmFsZW50cy4KKzs7Cis7OyBUaGUgZmls ZSByZXByZXNlbnRhdGlvbiBvZiBhIHBsc3RvcmUgY29uc2lzdHMgb2YgdHdvIExpc3AgZm9y bXMgcGx1cworOzsgbWFya2VycyB0byBpbnRyb2R1Y2UgdGhlbToKKzs7Cis7OyAgIDs7OyBw dWJsaWMgZW50cmllcworOzsgICBBTElTVAorOzsgICA7Ozsgc2VjcmV0IGVudHJpZXMKKzs7 ICAgRU5DUllQVEVELURBVEEKKzs7Cis7OyBCb3RoIG9mIHRoZXNlIGFyZSBvcHRpb25hbCwg YnV0IHRoZSBmaXJzdCBzZWN0aW9uIG11c3QgYmUgcHJlc2VudAorOzsgaWYgdGhlIHNlY29u ZCBvbmUgaXMuICBJZiBib3RoIHNlY3Rpb25zIGFyZSBtaXNzaW5nLCB0aGUgcGxzdG9yZSBp cworOzsgZW1wdHkuICBJZiB0aGUgc2Vjb25kIHNlY3Rpb24gaXMgbWlzc2luZywgaXQgY29u dGFpbnMgb25seQorOzsgbm9uLXNlY3JldCBkYXRhLiAgSWYgcHJlc2VudCwgdGhlIHByaW50 ZWQgcmVwcmVzZW50YXRpb24gb2YgdGhlCis7OyBlbmNyeXB0ZWQgZGF0YSBpbmNsdWRlcyB0 aGUgZGVsaW1pdGluZyBkb3VibGUgcXVvdGVzLgorOzsKKzs7IFRoZSBwbHN0b3JlIEFQSSAo YHBsc3RvcmUtb3BlbicsIGBwbHN0b3JlLXB1dCcsIGV0Yy4pIGFuZCB0aGUKKzs7IHBsc3Rv cmUgbW9kZSBpbXBsZW1lbnRlZCBieSBgcGxzdG9yZS1tb2RlJyBhcmUgb3J0aG9nb25hbCB0 byBlYWNoCis7OyBvdGhlciBhbmQgc2hvdWxkIG5vdCBiZSBtaXhlZCB1cC4gIEluIHBhcnRp Y3VsYXIsIGVuY29kaW5nIGFuZAorOzsgZGVjb2RpbmcgYSBwbHN0b3JlIG1vZGUgYnVmZmVy IHdpdGggYHBsc3RvcmUtbW9kZS10b2dnbGUtZGlzcGxheScKKzs7IGlzIG5vdCByZWxhdGVk IGluIGFueSB3YXkgdG8gdGhlIHN0YXRlIG9mIHRoZSBwbHN0b3JlIGJ1ZmZlci4KIAogOzs7 IENvZGU6CiAKQEAgLTQ1Nyw2ICs1NzEsMjEgQEAgcGxzdG9yZS1zYXZlCiAgICAgKHBsc3Rv cmUtLWluc2VydC1idWZmZXIgcGxzdG9yZSkKICAgICAoc2F2ZS1idWZmZXIpKSkKIAorOzsg VGhlIGZ1bmN0aW9ucyByZWxhdGVkIHRvIHBsc3RvcmUgbW9kZSB1bmZvcnR1bmF0ZWx5IGlu dHJvZHVjZSB5ZXQKKzs7IGFub3RoZXIgYWxpc3QgZm9ybWF0ICgiZGVjb2RlZCBhbGlzdCIp LiAgQWZ0ZXIgZXhlY3V0aW5nIHRoZSAiZm9vIiwKKzs7ICJiYXIiLCAiYmF6IiBleGFtcGxl IGZyb20gYWJvdmUgdGhlIGRlY29kZWQgYWxpc3Qgb2YgdGhlIHBsc3RvcmUKKzs7IHdvdWxk IGxvb2sgbGlrZSB0aGUgZm9sbG93aW5nOgorOzsKKzs7ICAgKCgiZm9vIiA6aG9zdCAiZm9v LmV4YW1wbGUub3JnIiA6cG9ydCA4MCkKKzs7ICAgICgiYmFyIiA6c2VjcmV0LXVzZXIgInRl c3QiIDpob3N0ICJiYXIuZXhhbXBsZS5vcmciKQorOzsgICAgKCJiYXoiIDpzZWNyZXQtcGFz c3dvcmQgInRlc3QiIDpob3N0ICJiYXouZXhhbXBsZS5vcmciKSkKKzs7Cis7OyBFdmVuIG1v cmUgdW5mb3J0dW5hdGVseSwgdmFyaWFibGUgYW5kIGZ1bmN0aW9uIG5hbWVzIG9mIHRoZQor OzsgZm9sbG93aW5nIGFyZSBhIGJpdCBtaXhlZCB1cCBJTUhPOiBXaXRoIHRoZSBjdXJyZW50 IG5hbWVzLCB0aGUKKzs7IHJlc3VsdCBvZiBmdW5jdGlvbiBgcGxzdG9yZS0tZW5jb2RlJyBp cyB1c2VkIHRvIGNyZWF0ZSB3aGF0IGlzCis7OyBwcmVzZW50ZWQgYXMgImRlY29kZWQgZm9y bSBvZiBhIHBsc3RvcmUiIHRvIHRoZSB1c2VyLiAgQW5kIHZhcmlhYmxlCis7OyBgcGxzdG9y ZS1lbmNvZGVkJyBpcyBub24tbmlsIGlmIGEgYnVmZmVyIHNob3dzIHRoZSBkZWNvZGVkIGZv cm0uCisKIChkZWZ1biBwbHN0b3JlLS1lbmNvZGUgKHBsc3RvcmUpCiAgIChwbHN0b3JlLS1k ZWNyeXB0IHBsc3RvcmUpCiAgIChsZXQgKChtZXJnZWQtYWxpc3QgKHBsc3RvcmUtLWdldC1t ZXJnZWQtYWxpc3QgcGxzdG9yZSkpKQotLSAKMi4zMC4yCgo= --------------utN6yetRwjNAcKNnrsmPrziz Content-Type: text/x-patch; charset=UTF-8; name="0002-Brush-up-doc-strings-and-terminology-in-plstore.el.patch" Content-Disposition: attachment; filename*0="0002-Brush-up-doc-strings-and-terminology-in-plstore.el.patc"; filename*1="h" Content-Transfer-Encoding: base64 RnJvbSA0NTY4MDU2ZjIxNTQ3OTRjMDMxMDlmM2E3ODUzNGZlNjNjNjUzN2NiIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKZW5zIFNjaG1pZHQgPGpzY2htaWR0NGdudUB2b2Rh Zm9uZW1haWwuZGU+CkRhdGU6IE1vbiwgMjIgTWF5IDIwMjMgMjE6NDc6MTMgKzAyMDAKU3Vi amVjdDogW1BBVENIIDIvMl0gQnJ1c2ggdXAgZG9jIHN0cmluZ3MgYW5kIHRlcm1pbm9sb2d5 IGluIHBsc3RvcmUuZWwKCiogbGlzcC9wbHN0b3JlLmVsIChwbHN0b3JlLWVuY29kZWQsIHBs c3RvcmUtcGFzc3BocmFzZS1jYWxsYmFjay1mdW5jdGlvbikKKHBsc3RvcmUtLWluaXQtZnJv bS1idWZmZXIsIHBsc3RvcmUtcmV2ZXJ0LCBwbHN0b3JlLWNsb3NlKQoocGxzdG9yZS0tbWVy Z2Utc2VjcmV0LCBwbHN0b3JlLS1kZWNyeXB0LCBwbHN0b3JlLS1tYXRjaCwgcGxzdG9yZS1m aW5kKQoocGxzdG9yZS1nZXQsIHBsc3RvcmUtcHV0LCBwbHN0b3JlLWRlbGV0ZSwgcGxzdG9y ZS0taW5zZXJ0LWJ1ZmZlcikKKHBsc3RvcmUtc2F2ZSwgcGxzdG9yZS0tZW5jb2RlLCBwbHN0 b3JlLS1kZWNvZGUpCihwbHN0b3JlLS13cml0ZS1jb250ZW50cy1mdW5jdGlvbnMsIHBsc3Rv cmUtbW9kZS1kZWNvZGVkKQoocGxzdG9yZS1tb2RlKTogQnJ1c2ggdXAgZG9jIHN0cmluZ3Mg YW5kIGRvY3VtZW50YXRpb24gaW4gZ2VuZXJhbC4KRml4IHRlcm1pbm9sb2d5LCBpbiBwYXJ0 aWN1bGFyIHNwdXJpb3VzIG9jY3VyZW5jZXMgb2YgYWxsIHVwcGVyY2FzZQoiUExTVE9SRSIu ICAoQnVnIzYzNjI3KQotLS0KIGxpc3AvcGxzdG9yZS5lbCB8IDcwICsrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA1 MiBpbnNlcnRpb25zKCspLCAxOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saXNwL3Bs c3RvcmUuZWwgYi9saXNwL3Bsc3RvcmUuZWwKaW5kZXggMWEwZGFjZmZiMDEuLmQxOGQ0NjFk N2QxIDEwMDY0NAotLS0gYS9saXNwL3Bsc3RvcmUuZWwKKysrIGIvbGlzcC9wbHN0b3JlLmVs CkBAIC03OCw3ICs3OCw3IEBACiA7OyBFZGl0aW5nOgogOzsKIDs7IFRoaXMgZmlsZSBhbHNv IHByb3ZpZGVzIGBwbHN0b3JlLW1vZGUnLCBhIG1ham9yIG1vZGUgZm9yIGVkaXRpbmcKLTs7 IHRoZSBQTFNUT1JFIGZvcm1hdCBmaWxlLiAgVmlzaXQgYSBub24tZXhpc3RpbmcgZmlsZSBh bmQgcHV0IHRoZQorOzsgdGhlIHBsc3RvcmUgZm9ybWF0IGZpbGUuICBWaXNpdCBhIG5vbi1l eGlzdGluZyBmaWxlIGFuZCBwdXQgdGhlCiA7OyBmb2xsb3dpbmcgbGluZToKIDs7CiA7OyAo KCJmb28iIDpob3N0ICJmb28uZXhhbXBsZS5vcmciIDpzZWNyZXQtdXNlciAidXNlciIpKQpA QCAtMjM1LDEwICsyMzUsMTMgQEAgcGxzdG9yZS1lbmNyeXB0LXRvCiAKIChwdXQgJ3Bsc3Rv cmUtZW5jcnlwdC10byAncGVybWFuZW50LWxvY2FsIHQpCiAKLShkZWZ2YXIgcGxzdG9yZS1l bmNvZGVkIG5pbCkKKyhkZWZ2YXIgcGxzdG9yZS1lbmNvZGVkIG5pbAorICAiTm9uLW5pbCBp ZiB0aGUgY3VycmVudCBidWZmZXIgc2hvd3MgdGhlIGRlY29kZWQgYWxpc3QuIikgOyBbc2lj IV0KIAogKHB1dCAncGxzdG9yZS1lbmNvZGVkICdwZXJtYW5lbnQtbG9jYWwgdCkKIAorOzs7 IEVhc3lQRyBjYWxsYmFjayBmdW5jdGlvbnMuCisKIChkZWZ2YXIgcGxzdG9yZS1jYWNoZS1w YXNzcGhyYXNlLWZvci1zeW1tZXRyaWMtZW5jcnlwdGlvbiBuaWwpCiAoZGVmdmFyIHBsc3Rv cmUtcGFzc3BocmFzZS1hbGlzdCBuaWwpCiAKQEAgLTI1NSwxMSArMjU4LDExIEBAIHBsc3Rv cmUtcGFzc3BocmFzZS1jYWxsYmFjay1mdW5jdGlvbgogCQkgICAgICAoY29ucyBlbnRyeQog CQkJICAgIHBsc3RvcmUtcGFzc3BocmFzZS1hbGlzdCkpKQogCSAgICAgIChzZXRxIHBhc3Nw aHJhc2UKLQkJICAgIChyZWFkLXBhc3N3ZCAoZm9ybWF0ICJQYXNzcGhyYXNlIGZvciBQTFNU T1JFICVzOiAiCisJCSAgICAocmVhZC1wYXNzd2QgKGZvcm1hdCAiUGFzc3BocmFzZSBmb3Ig cGxzdG9yZSAlczogIgogCQkJCQkgKHBsc3RvcmUtLWdldC1idWZmZXIgcGxzdG9yZSkpKSkK IAkgICAgICAoc2V0Y2RyIGVudHJ5IChjb3B5LXNlcXVlbmNlIHBhc3NwaHJhc2UpKQogCSAg ICAgIHBhc3NwaHJhc2UpKSkKLSAgICAocmVhZC1wYXNzd2QgKGZvcm1hdCAiUGFzc3BocmFz ZSBmb3IgUExTVE9SRSAlczogIgorICAgIChyZWFkLXBhc3N3ZCAoZm9ybWF0ICJQYXNzcGhy YXNlIGZvciBwbHN0b3JlICVzOiAiCiAJCQkgKHBsc3RvcmUtLWdldC1idWZmZXIgcGxzdG9y ZSkpKSkpCiAKIChkZWZ1biBwbHN0b3JlLXByb2dyZXNzLWNhbGxiYWNrLWZ1bmN0aW9uIChf Y29udGV4dCBfd2hhdCBfY2hhciBjdXJyZW50IHRvdGFsCkBAIC0yNjksNiArMjcyLDggQEAg cGxzdG9yZS1wcm9ncmVzcy1jYWxsYmFjay1mdW5jdGlvbgogICAgIChtZXNzYWdlICIlcy4u LiVkJSUiIGhhbmRiYWNrCiAJICAgICAoaWYgKD4gdG90YWwgMCkgKGZsb29yICgqICgvIGN1 cnJlbnQgKGZsb2F0IHRvdGFsKSkgMTAwKSkgMCkpKSkKIAorOzs7IENvcmUgZnVuY3Rpb25z LgorCiAoZGVmdW4gcGxzdG9yZS0tZ2V0LWJ1ZmZlciAoYXJnKQogICAoYXJlZiBhcmcgMCkp CiAKQEAgLTMwNyw2ICszMTIsNyBAQCBwbHN0b3JlLS1tYWtlCiAgICh2ZWN0b3IgYnVmZmVy IGFsaXN0IGVuY3J5cHRlZC1kYXRhIHNlY3JldC1hbGlzdCBtZXJnZWQtYWxpc3QpKQogCiAo ZGVmdW4gcGxzdG9yZS0taW5pdC1mcm9tLWJ1ZmZlciAocGxzdG9yZSkKKyAgIlBhcnNlIGN1 cnJlbnQgYnVmZmVyIGFuZCBpbml0aWFsaXplIFBMU1RPUkUgZnJvbSBpdC4iCiAgIChnb3Rv LWNoYXIgKHBvaW50LW1pbikpCiAgICh3aGVuIChsb29raW5nLWF0ICI7OzsgcHVibGljIGVu dHJpZXMiKQogICAgIChmb3J3YXJkLWxpbmUpCkBAIC0zMzcsMTYgKzM0MywyMCBAQCBwbHN0 b3JlLW9wZW4KICAgICAgIHN0b3JlKSkpCiAKIChkZWZ1biBwbHN0b3JlLXJldmVydCAocGxz dG9yZSkKLSAgIlJlcGxhY2UgY3VycmVudCBkYXRhIGluIFBMU1RPUkUgd2l0aCB0aGUgZmls ZSBvbiBkaXNrLiIKKyAgIlJlcGxhY2UgY3VycmVudCBkYXRhIGluIFBMU1RPUkUgZnJvbSBp dHMgYXNzb2NpYXRlZCBmaWxlLiIKICAgKHdpdGgtY3VycmVudC1idWZmZXIgKHBsc3RvcmUt LWdldC1idWZmZXIgcGxzdG9yZSkKICAgICAocmV2ZXJ0LWJ1ZmZlciB0IHQpCiAgICAgKHBs c3RvcmUtLWluaXQtZnJvbS1idWZmZXIgcGxzdG9yZSkpKQogCiAoZGVmdW4gcGxzdG9yZS1j bG9zZSAocGxzdG9yZSkKLSAgIkRlc3Ryb3kgYSBwbHN0b3JlIGluc3RhbmNlIFBMU1RPUkUu IgorICAiRGVzdHJveSBwbHN0b3JlIGluc3RhbmNlIFBMU1RPUkUuIgogICAoa2lsbC1idWZm ZXIgKHBsc3RvcmUtLWdldC1idWZmZXIgcGxzdG9yZSkpKQogCiAoZGVmdW4gcGxzdG9yZS0t bWVyZ2Utc2VjcmV0IChwbHN0b3JlKQorICAiRGV0ZXJtaW5lIHRoZSBtZXJnZWQgYWxpc3Qg b2YgUExTVE9SRS4KK0NyZWF0ZSB0aGUgbWVyZ2VkIGFsaXN0IGFzIGEgY29weSBvZiB0aGUg dGVtcGxhdGUgYWxpc3Qgd2l0aCBhbGwKK3BsYWNlaG9sZGVyIHByb3BlcnRpZXMgdGhhdCBo YXZlIGNvcnJlc3BvbmRpbmcgcHJvcGVydGllcyBpbiB0aGUKK3NlY3JldCBhbGlzdCByZXBs YWNlZCBieSB0aGVpciBwbGFpbi10ZXh0IHNlY3JldCBwcm9wZXJ0aWVzLiIKICAgKGxldCAo KGFsaXN0IChwbHN0b3JlLS1nZXQtc2VjcmV0LWFsaXN0IHBsc3RvcmUpKQogCW1vZGlmaWVk LWFsaXN0CiAJbW9kaWZpZWQtcGxpc3QKQEAgLTM2NSwxOSArMzc1LDI2IEBAIHBsc3RvcmUt LW1lcmdlLXNlY3JldAogCSAgICBtb2RpZmllZC1lbnRyeSAoYXNzb2MgKGNhciBlbnRyeSkg bW9kaWZpZWQtYWxpc3QpCiAJICAgIG1vZGlmaWVkLXBsaXN0IChjZHIgbW9kaWZpZWQtZW50 cnkpKQogICAgICAgKHdoaWxlIHBsaXN0CisgICAgICAgIDs7IFNlYXJjaCBmb3IgYSBwbGFj ZWhvbGRlciBwcm9wZXJ0eSBpbiB0aGUgbWVyZ2VkIGFsaXN0CisgICAgICAgIDs7IGNvcnJl c3BvbmRpbmcgdG8gdGhlIGN1cnJlbnQgc2VjcmV0IHByb3BlcnR5LgogCShzZXRxIHBsYWNl aG9sZGVyCiAJICAgICAgKHBsaXN0LW1lbWJlcgogCSAgICAgICBtb2RpZmllZC1wbGlzdAog CSAgICAgICAoaW50ZXJuIChjb25jYXQgIjpzZWNyZXQtIgogCQkJICAgICAgIChzdWJzdHJp bmcgKHN5bWJvbC1uYW1lIChjYXIgcGxpc3QpKSAxKSkpKSkKKyAgICAgICAgOzsgUmVwbGFj ZSBpdHMgbmFtZSB3aXRoIHRoZSByZWFsLCBzZWNyZXQgcHJvcGVydHkgbmFtZS4KIAkoaWYg cGxhY2Vob2xkZXIKIAkgICAgKHNldGNhciBwbGFjZWhvbGRlciAoY2FyIHBsaXN0KSkpCisg ICAgICAgIDs7IFVwZGF0ZSBpdHMgdmFsdWUgdG8gdGhlIHBsYWluLXRleHQgc2VjcmV0IHBy b3BlcnR5IHZhbHVlLgogCShzZXRxIG1vZGlmaWVkLXBsaXN0CiAJICAgICAgKHBsaXN0LXB1 dCBtb2RpZmllZC1wbGlzdCAoY2FyIHBsaXN0KSAoY2FyIChjZHIgcGxpc3QpKSkpCiAJKHNl dHEgcGxpc3QgKG50aGNkciAyIHBsaXN0KSkpCiAgICAgICAoc2V0Y2RyIG1vZGlmaWVkLWVu dHJ5IG1vZGlmaWVkLXBsaXN0KSkpKQogCiAoZGVmdW4gcGxzdG9yZS0tZGVjcnlwdCAocGxz dG9yZSkKKyAgIkRlY3J5cHQgdGhlIGVuY3J5cHRlZCBkYXRhIG9mIFBMU1RPUkUuCitVcGRh dGUgaXRzIGludGVybmFsIGFsaXN0cyBhbmQgb3RoZXIgZGF0YSBzdHJ1Y3R1cmVzCithY2Nv cmRpbmdseS4iCiAgIChpZiAocGxzdG9yZS0tZ2V0LWVuY3J5cHRlZC1kYXRhIHBsc3RvcmUp CiAgICAgICAobGV0ICgoY29udGV4dCAoZXBnLW1ha2UtY29udGV4dCAnT3BlblBHUCkpCiAJ ICAgIHBsYWluKQpAQCAtNDA0LDYgKzQyMSwxMSBAQCBwbHN0b3JlLS1kZWNyeXB0CiAJKHBs c3RvcmUtLXNldC1lbmNyeXB0ZWQtZGF0YSBwbHN0b3JlIG5pbCkpKSkKIAogKGRlZnVuIHBs c3RvcmUtLW1hdGNoIChlbnRyeSBrZXlzIHNraXAtaWYtc2VjcmV0LWZvdW5kKQorICAiUmV0 dXJuIHdoZXRoZXIgcGxpc3QgS0VZUyBtYXRjaGVzIEVOVFJZLgorRU5UUlkgc2hvdWxkIGJl IGEga2V5IG9mIHRoZSBtZXJnZWQgYWxpc3Qgb2YgYSBQTFNUT1JFLiAgVGhpcworZnVuY3Rp b24gcmV0dXJucyBuaWwgaWYgS0VZUyBkbyBub3QgbWF0Y2ggRU5UUlksIHQgaWYgdGhleSBt YXRjaCwKK2FuZCBzeW1ib2wgYHNlY3JldCcgaWYgdGhlIHNlY3JldCBhbGlzdCBuZWVkcyB0 byBiZSBjb25zdWx0ZWQgdG8KK3BlcmZvcm0gYSBtYXRjaC4iCiAgIChsZXQgKChyZXN1bHQg dCkga2V5LW5hbWUga2V5LXZhbHVlIHByb3AtdmFsdWUgc2VjcmV0LW5hbWUpCiAgICAgKHdo aWxlIGtleXMKICAgICAgIChzZXRxIGtleS1uYW1lIChjYXIga2V5cykKQEAgLTQyNSwxMSAr NDQ3LDEwIEBAIHBsc3RvcmUtLW1hdGNoCiAgICAgcmVzdWx0KSkKIAogKGRlZnVuIHBsc3Rv cmUtZmluZCAocGxzdG9yZSBrZXlzKQotICAiUGVyZm9ybSBzZWFyY2ggb24gUExTVE9SRSB3 aXRoIEtFWVMuCi1LRVlTIGlzIGEgcGxpc3QuIgorICAiUmV0dXJuIGFsbCBQTFNUT1JFIGVu dHJpZXMgbWF0Y2hpbmcgcGxpc3QgS0VZUy4iCiAgIChsZXQgKGVudHJpZXMgYWxpc3QgZW50 cnkgbWF0Y2ggZGVjcnlwdCBwbGlzdCkKLSAgICA7OyBGaXJzdCwgZ28gdGhyb3VnaCB0aGUg bWVyZ2VkIHBsaXN0IGFsaXN0IGFuZCBjb2xsZWN0IGVudHJpZXMKLSAgICA7OyBtYXRjaGVk IHdpdGgga2V5cy4KKyAgICA7OyBGaXJzdCwgZ28gdGhyb3VnaCB0aGUgbWVyZ2VkIGFsaXN0 IGFuZCBjb2xsZWN0IGVudHJpZXMgbWF0Y2hlZAorICAgIDs7IGJ5IHRoZSBrZXlzLgogICAg IChzZXRxIGFsaXN0IChwbHN0b3JlLS1nZXQtbWVyZ2VkLWFsaXN0IHBsc3RvcmUpKQogICAg ICh3aGlsZSBhbGlzdAogICAgICAgKHNldHEgZW50cnkgKGNhciBhbGlzdCkKQEAgLTQ0NSw3 ICs0NjYsNyBAQCBwbHN0b3JlLWZpbmQKIAkJICAgICAgcGxpc3QgbmlsKSkKIAkgICAgKHNl dHEgcGxpc3QgKG50aGNkciAyIHBsaXN0KSkpCiAJICAoc2V0cSBlbnRyaWVzIChjb25zIGVu dHJ5IGVudHJpZXMpKSkpKQotICAgIDs7IFNlY29uZCwgZGVjcnlwdCB0aGUgZW5jcnlwdGVk IHBsaXN0IGFuZCB0cnkgYWdhaW4uCisgICAgOzsgU2Vjb25kLCBkZWNyeXB0IHRoZSBwbHN0 b3JlIGFuZCB0cnkgYWdhaW4uCiAgICAgKHdoZW4gZGVjcnlwdAogICAgICAgKHNldHEgZW50 cmllcyBuaWwpCiAgICAgICAocGxzdG9yZS0tZGVjcnlwdCBwbHN0b3JlKQpAQCAtNDU5LDcg KzQ4MCw4IEBAIHBsc3RvcmUtZmluZAogICAgIChucmV2ZXJzZSBlbnRyaWVzKSkpCiAKIChk ZWZ1biBwbHN0b3JlLWdldCAocGxzdG9yZSBuYW1lKQotICAiR2V0IGFuIGVudHJ5IHdpdGgg TkFNRSBpbiBQTFNUT1JFLiIKKyAgIlJldHVybiB0aGUgZW50cnkgbmFtZWQgTkFNRSBpbiBQ TFNUT1JFLgorUmV0dXJuIG5pbCBpZiB0aGVyZSBpcyBub25lLiIKICAgKGxldCAoKGVudHJ5 IChhc3NvYyBuYW1lIChwbHN0b3JlLS1nZXQtbWVyZ2VkLWFsaXN0IHBsc3RvcmUpKSkKIAlw bGlzdCkKICAgICAoc2V0cSBwbGlzdCAoY2RyIGVudHJ5KSkKQEAgLTQ3Myw3ICs0OTUsNyBA QCBwbHN0b3JlLWdldAogICAgIGVudHJ5KSkKIAogKGRlZnVuIHBsc3RvcmUtcHV0IChwbHN0 b3JlIG5hbWUga2V5cyBzZWNyZXQta2V5cykKLSAgIlB1dCBhbiBlbnRyeSB3aXRoIE5BTUUg aW4gUExTVE9SRS4KKyAgIlB1dCBhbiBlbnRyeSBuYW1lZCBOQU1FIGluIFBMU1RPUkUuCiBL RVlTIGlzIGEgcGxpc3QgY29udGFpbmluZyBub24tc2VjcmV0IGRhdGEuCiBTRUNSRVQtS0VZ UyBpcyBhIHBsaXN0IGNvbnRhaW5pbmcgc2VjcmV0IGRhdGEuIgogICAobGV0IChlbnRyeQpA QCAtNTEyLDcgKzUzNCw3IEBAIHBsc3RvcmUtcHV0CiAgICAgKHBsc3RvcmUtLW1lcmdlLXNl Y3JldCBwbHN0b3JlKSkpCiAKIChkZWZ1biBwbHN0b3JlLWRlbGV0ZSAocGxzdG9yZSBuYW1l KQotICAiRGVsZXRlIGFuIGVudHJ5IHdpdGggTkFNRSBmcm9tIFBMU1RPUkUuIgorICAiRGVs ZXRlIHRoZSBmaXJzdCBlbnRyeSBuYW1lZCBOQU1FIGZyb20gUExTVE9SRS4iCiAgIChsZXQg KChlbnRyeSAoYXNzb2MgbmFtZSAocGxzdG9yZS0tZ2V0LWFsaXN0IHBsc3RvcmUpKSkpCiAg ICAgKGlmIGVudHJ5CiAJKHBsc3RvcmUtLXNldC1hbGlzdApAQCAtNTMxLDYgKzU1Myw4IEBA IHBsc3RvcmUtZGVsZXRlCiAKIChkZWZ2YXIgcHAtZXNjYXBlLW5ld2xpbmVzKQogKGRlZnVu IHBsc3RvcmUtLWluc2VydC1idWZmZXIgKHBsc3RvcmUpCisgICJJbnNlcnQgdGhlIGZpbGUg cmVwcmVzZW50YXRpb24gb2YgUExTVE9SRSBhdCBwb2ludC4KK0Fzc3VtZXMgdGhhdCBQTFNU T1JFIGhhcyBiZWVuIGRlY3J5cHRlZC4iCiAgIChpbnNlcnQgIjs7OyBwdWJsaWMgZW50cmll cyAtKi0gbW9kZTogcGxzdG9yZSAtKi0gXG4iCiAJICAocHAtdG8tc3RyaW5nIChwbHN0b3Jl LS1nZXQtYWxpc3QgcGxzdG9yZSkpKQogICAoaWYgKHBsc3RvcmUtLWdldC1zZWNyZXQtYWxp c3QgcGxzdG9yZSkKQEAgLTU2NSwxMiArNTg5LDE0IEBAIHBsc3RvcmUtLWluc2VydC1idWZm ZXIKIAkoaW5zZXJ0ICI7Ozsgc2VjcmV0IGVudHJpZXNcbiIgKHBwLXRvLXN0cmluZyBjaXBo ZXIpKSkpKQogCiAoZGVmdW4gcGxzdG9yZS1zYXZlIChwbHN0b3JlKQotICAiU2F2ZSB0aGUg Y29udGVudHMgb2YgUExTVE9SRSBhc3NvY2lhdGVkIHdpdGggYSBGSUxFLiIKKyAgIlNhdmUg UExTVE9SRSB0byBpdHMgYXNzb2NpYXRlZCBmaWxlLiIKICAgKHdpdGgtY3VycmVudC1idWZm ZXIgKHBsc3RvcmUtLWdldC1idWZmZXIgcGxzdG9yZSkKICAgICAoZXJhc2UtYnVmZmVyKQog ICAgIChwbHN0b3JlLS1pbnNlcnQtYnVmZmVyIHBsc3RvcmUpCiAgICAgKHNhdmUtYnVmZmVy KSkpCiAKKzs7OyBwbHN0b3JlIG1vZGUuCisKIDs7IFRoZSBmdW5jdGlvbnMgcmVsYXRlZCB0 byBwbHN0b3JlIG1vZGUgdW5mb3J0dW5hdGVseSBpbnRyb2R1Y2UgeWV0CiA7OyBhbm90aGVy IGFsaXN0IGZvcm1hdCAoImRlY29kZWQgYWxpc3QiKS4gIEFmdGVyIGV4ZWN1dGluZyB0aGUg ImZvbyIsCiA7OyAiYmFyIiwgImJheiIgZXhhbXBsZSBmcm9tIGFib3ZlIHRoZSBkZWNvZGVk IGFsaXN0IG9mIHRoZSBwbHN0b3JlCkBAIC01ODcsNiArNjEzLDcgQEAgcGxzdG9yZS1zYXZl CiA7OyBgcGxzdG9yZS1lbmNvZGVkJyBpcyBub24tbmlsIGlmIGEgYnVmZmVyIHNob3dzIHRo ZSBkZWNvZGVkIGZvcm0uCiAKIChkZWZ1biBwbHN0b3JlLS1lbmNvZGUgKHBsc3RvcmUpCisg ICJSZXR1cm4gdGhlIHByaW50ZWQgcmVwcmVzZW50YXRpb24gb2YgdGhlIGRlY29kZWQgYWxp c3Qgb2YgUExTVE9SRS4iCiAgIChwbHN0b3JlLS1kZWNyeXB0IHBsc3RvcmUpCiAgIChsZXQg KChtZXJnZWQtYWxpc3QgKHBsc3RvcmUtLWdldC1tZXJnZWQtYWxpc3QgcGxzdG9yZSkpKQog ICAgIChjb25jYXQgIigiCkBAIC02MTEsNiArNjM4LDkgQEAgcGxzdG9yZS0tZW5jb2RlCiAJ ICAgICIpIikpKQogCiAoZGVmdW4gcGxzdG9yZS0tZGVjb2RlIChzdHJpbmcpCisgICJDcmVh dGUgYSBwbHN0b3JlIGluc3RhbmNlIGZyb20gU1RSSU5HLgorU1RSSU5HIHNob3VsZCBiZSB0 aGUgcHJpbnRlZCByZXByZXNlbnRhdGlvbiBvZiBhIGRlY29kZWQgYWxpc3Qgb2YKK3NvbWUg cGxzdG9yZS4iCiAgIChsZXQqICgoYWxpc3QgKGNhciAocmVhZC1mcm9tLXN0cmluZyBzdHJp bmcpKSkKIAkgKHBvaW50ZXIgYWxpc3QpCiAJIHNlY3JldC1hbGlzdApAQCAtNjE4LDcgKzY0 OCw3IEBAIHBsc3RvcmUtLWRlY29kZQogCSBlbnRyeSkKICAgICAod2hpbGUgcG9pbnRlcgog ICAgICAgKHVubGVzcyAoc3RyaW5ncCAoY2FyIChjYXIgcG9pbnRlcikpKQotCShlcnJvciAi SW52YWxpZCBQTFNUT1JFIGZvcm1hdCAlcyIgc3RyaW5nKSkKKwkoZXJyb3IgIkludmFsaWQg cGxzdG9yZSBmb3JtYXQgJXMiIHN0cmluZykpCiAgICAgICAoc2V0cSBwbGlzdCAoY2RyIChj YXIgcG9pbnRlcikpKQogICAgICAgKHdoaWxlIHBsaXN0CiAJKHdoZW4gKHN0cmluZy1tYXRj aCAiXFxgOnNlY3JldC0iIChzeW1ib2wtbmFtZSAoY2FyIHBsaXN0KSkpCkBAIC02MzgsNiAr NjY4LDEwIEBAIHBsc3RvcmUtLWRlY29kZQogICAgIChwbHN0b3JlLS1tYWtlIG5pbCBhbGlz dCBuaWwgc2VjcmV0LWFsaXN0KSkpCiAKIChkZWZ1biBwbHN0b3JlLS13cml0ZS1jb250ZW50 cy1mdW5jdGlvbnMgKCkKKyAgIkNvbnZlcnQgdGhlIGRlY29kZWQgZm9ybSBvZiBhIHBsc3Rv cmUgaW4gdGhlIGN1cnJlbnQgYnVmZmVyLgorQ29udmVydCBpdCB0byB0aGUgcmVndWxhciBm aWxlIHJlcHJlc2VudGF0aW9uIG9mIGEgcGxzdG9yZSBpZgorbmVlZGVkLiAgVGhpcyBmdW5j dGlvbiBpcyB1c2VkIG9uIGhvb2sgYHdyaXRlLWNvbnRlbnRzLWZ1bmN0aW9ucycKK2luIHBs c3RvcmUgbW9kZSBidWZmZXJzLiIKICAgKHdoZW4gcGxzdG9yZS1lbmNvZGVkCiAgICAgKGxl dCAoKHN0b3JlIChwbHN0b3JlLS1kZWNvZGUgKGJ1ZmZlci1zdHJpbmcpKSkKIAkgIChmaWxl IChidWZmZXItZmlsZS1uYW1lKSkpCkBAIC02NzUsNyArNzA5LDcgQEAgcGxzdG9yZS1tb2Rl LWRlY29kZWQKICAgICAgIChlcmFzZS1idWZmZXIpCiAgICAgICAoaW5zZXJ0CiAgICAgICAg KHN1YnN0aXR1dGUtY29tbWFuZC1rZXlzICJcCi07OzsgWW91IGFyZSBsb29raW5nIGF0IHRo ZSBkZWNvZGVkIGZvcm0gb2YgdGhlIFBMU1RPUkUgZmlsZS5cblwKKzs7OyBZb3UgYXJlIGxv b2tpbmcgYXQgdGhlIGRlY29kZWQgZm9ybSBvZiB0aGUgcGxzdG9yZSBmaWxlLlxuXAogOzs7 IFRvIHNlZSB0aGUgb3JpZ2luYWwgZm9ybSBjb250ZW50LCBkbyBcXFtwbHN0b3JlLW1vZGUt dG9nZ2xlLWRpc3BsYXldXG5cbiIpKQogICAgICAgKGluc2VydCAocGxzdG9yZS0tZW5jb2Rl IHN0b3JlKSkKICAgICAgIChzZXQtYnVmZmVyLW1vZGlmaWVkLXAgbmlsKQpAQCAtNjkwLDcg KzcyNCw3IEBAIHBsc3RvcmUtbW9kZS10b2dnbGUtZGlzcGxheQogCiA7OzsjIyNhdXRvbG9h ZAogKGRlZmluZS1kZXJpdmVkLW1vZGUgcGxzdG9yZS1tb2RlIGVtYWNzLWxpc3AtbW9kZSAi UExTVE9SRSIKLSAgIk1ham9yIG1vZGUgZm9yIGVkaXRpbmcgUExTVE9SRSBmaWxlcy4iCisg ICJNYWpvciBtb2RlIGZvciBlZGl0aW5nIHBsc3RvcmUgZmlsZXMuIgogICAobWFrZS1sb2Nh bC12YXJpYWJsZSAncGxzdG9yZS1lbmNvZGVkKQogICAoYWRkLWhvb2sgJ3dyaXRlLWNvbnRl bnRzLWZ1bmN0aW9ucyAjJ3Bsc3RvcmUtLXdyaXRlLWNvbnRlbnRzLWZ1bmN0aW9ucykKICAg KGRlZmluZS1rZXkgcGxzdG9yZS1tb2RlLW1hcCAiXEMtY1xDLWMiICMncGxzdG9yZS1tb2Rl LXRvZ2dsZS1kaXNwbGF5KQotLSAKMi4zMC4yCgo= --------------utN6yetRwjNAcKNnrsmPrziz--