From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Herring, Davis" Newsgroups: gmane.emacs.devel Subject: [PATCH] Showing the relevant part of a diff Date: Fri, 19 Feb 2016 05:43:23 +0000 Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="_003_B393F5AD12955C48A84FFB08032CD04F6C432C3CECSEXGPMB01winl_" X-Trace: ger.gmane.org 1455860641 26450 80.91.229.3 (19 Feb 2016 05:44:01 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 19 Feb 2016 05:44:01 +0000 (UTC) To: "emacs-devel@gnu.org" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Feb 19 06:43:50 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aWdr2-0004SZ-MK for ged-emacs-devel@m.gmane.org; Fri, 19 Feb 2016 06:43:48 +0100 Original-Received: from localhost ([::1]:48730 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWdr2-0005Fi-3k for ged-emacs-devel@m.gmane.org; Fri, 19 Feb 2016 00:43:48 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50118) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWdqm-0005EV-6V for emacs-devel@gnu.org; Fri, 19 Feb 2016 00:43:33 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aWdqi-00044l-2s for emacs-devel@gnu.org; Fri, 19 Feb 2016 00:43:32 -0500 Original-Received: from proofpoint5.lanl.gov ([2001:400:4210:400::a5]:45116) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWdqh-00044O-MU for emacs-devel@gnu.org; Fri, 19 Feb 2016 00:43:28 -0500 Original-Received: from mailrelay2.lanl.gov (mailrelay2.lanl.gov [128.165.4.103]) by mailgate5.lanl.gov (8.15.0.59/8.15.0.59) with ESMTP id u1J5hP6H009900 for ; Thu, 18 Feb 2016 22:43:25 -0700 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by mailrelay2.lanl.gov (Postfix) with ESMTP id 201D9EEE9CC for ; Thu, 18 Feb 2016 22:43:25 -0700 (MST) X-NIE-2-Virus-Scanner: amavisd-new at mailrelay2.lanl.gov Original-Received: from ECS-EXG-P-CH03.win.lanl.gov (ecs-exg-p-ch03.win.lanl.gov [128.165.106.13]) by mailrelay2.lanl.gov (Postfix) with ESMTP id F3288EEE9B1 for ; Thu, 18 Feb 2016 22:43:24 -0700 (MST) Original-Received: from ECS-EXG-P-MB01.win.lanl.gov ([169.254.1.2]) by ECS-EXG-P-CH03.win.lanl.gov ([128.165.106.13]) with mapi id 14.03.0266.001; Thu, 18 Feb 2016 22:43:24 -0700 Thread-Topic: [PATCH] Showing the relevant part of a diff Thread-Index: AdFq1dkEfO0ULeB2RLCQSdR8ko6sHQ== Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-originating-ip: [128.165.106.65] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.15.21, 1.0.33, 0.0.0000 definitions=2016-02-19_04:2016-02-18, 2016-02-19, 1970-01-01 signatures=0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 2001:400:4210:400::a5 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:200177 Archived-At: --_003_B393F5AD12955C48A84FFB08032CD04F6C432C3CECSEXGPMB01winl_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable When looking at changes made to a file, the ones most likely to be interest= ing are those affecting the portion of the file in view. The second attach= ed patch causes `vc-diff' to place point at the place in the diff that corr= esponds to point in the file being compared (only if the current source is = the endpoint of the diff, of course).=0A= =0A= The first patch (starting from a recent master) is preparatory and provides= (and uses) a defconst for the main work.=0A= =0A= To resolve:=0A= 1. Would this need a NEWS entry?=0A= 2. Does it need to be customizable? (M-< is all it takes to "recover the o= ld behavior"...)=0A= 3. Is it worth supporting the (very rare) "normal" diff format?=0A= 4. Should M-x diff (or any other diff commands) behave similarly?=0A= 5. Do context/unified headers lack the (correct) length of the hunk often e= nough to bother with "donttrustheader"? (This is the two FIXMEs in the pat= ch.)=0A= =0A= Davis= --_003_B393F5AD12955C48A84FFB08032CD04F6C432C3CECSEXGPMB01winl_ Content-Type: application/octet-stream; name="0001-Clean-up-context.patch" Content-Description: 0001-Clean-up-context.patch Content-Disposition: attachment; filename="0001-Clean-up-context.patch"; size=5285; creation-date="Fri, 19 Feb 2016 05:25:57 GMT"; modification-date="Fri, 19 Feb 2016 05:25:57 GMT" Content-Transfer-Encoding: base64 RnJvbSA1YWEzNzQ4ZDhlNGQ1Y2RiMWZkOTExZDhmMDk4YmVmY2MyODY3MGZhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEYXZpcyBIZXJyaW5nIDxoZXJyaW5nQGxhbmwuZ292PgpEYXRl OiBUaHUsIDE4IEZlYiAyMDE2IDA3OjQ3OjQ1IC0wNzAwClN1YmplY3Q6IFtQQVRDSCAxLzJdIENs ZWFuIHVwIGNvbnRleHQgZGlmZiBoZWFkZXIgcmVnZXhwcwoKKiBsaXNwL3ZjL2RpZmYtbW9kZS5l bCAoZGlmZi1odW5rLWhlYWRlci1yZS1jb250ZXh0KTogTmV3IGNvbnN0LgooZGlmZi1jb250ZXh0 LW1pZC1odW5rLWhlYWRlci1yZSk6IEFkZCBtaXNzaW5nIF4uCihkaWZmLWh1bmstaGVhZGVyLXJl LGRpZmYtY29udGV4dC0+dW5pZmllZCxkaWZmLXJldmVyc2UtZGlyZWN0aW9uLApkaWZmLXNhbml0 eS1jaGVjay1odW5rKTogVXNlIGl0LgotLS0KIGxpc3AvdmMvZGlmZi1tb2RlLmVsIHwgICAzNCAr KysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tCiAxIGZpbGVzIGNoYW5nZWQsIDIzIGlu c2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpc3AvdmMvZGlmZi1t b2RlLmVsIGIvbGlzcC92Yy9kaWZmLW1vZGUuZWwKaW5kZXggYmFkYTQ5Mi4uMDZkNDUwMiAxMDA2 NDQKLS0tIGEvbGlzcC92Yy9kaWZmLW1vZGUuZWwKKysrIGIvbGlzcC92Yy9kaWZmLW1vZGUuZWwK QEAgLTM3OSw4ICszNzksMTAgQEAgd2VsbC4iCiAKIChkZWZjb25zdCBkaWZmLWh1bmstaGVhZGVy LXJlLXVuaWZpZWQKICAgIl5AQCAtXFwoWzAtOV0rXFwpXFwoPzosXFwoWzAtOV0rXFwpXFwpPyBc XCtcXChbMC05XStcXClcXCg/OixcXChbMC05XStcXClcXCk/IEBAIikKKyhkZWZjb25zdCBkaWZm LWh1bmstaGVhZGVyLXJlLWNvbnRleHQKKyAgIlxcKlxcezE1XFx9XFwoPzogLipcXCk/XG5cXCpc XCpcXCogXFwoXFwoWzAtOV0rXFwpXFwoPzosXFwoLT9bMC05XStcXClcXCk/XFwpIFxcKlxcKlxc KlxcKiIpCiAoZGVmY29uc3QgZGlmZi1jb250ZXh0LW1pZC1odW5rLWhlYWRlci1yZQotICAiLS0t IFxcKFswLTldK1xcKVxcKD86LFxcKFswLTldK1xcKVxcKT8gLS0tLSQiKQorICAiXi0tLSBcXChb MC05XStcXClcXCg/OixcXChbMC05XStcXClcXCk/IC0tLS0kIikKIAogKGRlZnZhciBkaWZmLXVz ZS1jaGFuZ2VkLWZhY2UgKGFuZCAoZmFjZS1kaWZmZXJzLWZyb20tZGVmYXVsdC1wIGRpZmYtY2hh bmdlZC1mYWNlKQogCQkJCSAgIChub3QgKGZhY2UtZXF1YWwgZGlmZi1jaGFuZ2VkLWZhY2UgZGlm Zi1hZGRlZC1mYWNlKSkKQEAgLTQ1NSw3ICs0NTcsOSBAQCBlbXB0eSBsaW5lcy4gIFRoaXMgbWFr ZXMgdGhlIGZvcm1hdCBsZXNzIHJvYnVzdCwgYnV0IGlzIHRvbGVyYXRlZC4KIFNlZSBodHRwOi8v bGlzdHMuZ251Lm9yZy9hcmNoaXZlL2h0bWwvZW1hY3MtZGV2ZWwvMjAwNy0xMS9tc2cwMTk5MC5o dG1sIikKIAogKGRlZmNvbnN0IGRpZmYtaHVuay1oZWFkZXItcmUKLSAgKGNvbmNhdCAiXlxcKD86 IiBkaWZmLWh1bmstaGVhZGVyLXJlLXVuaWZpZWQgIi4qXFx8XFwqXFx7MTVcXH0uKlxuXFwqXFwq XFwqIC4rIFxcKlxcKlxcKlxcKlxcfFswLTldK1xcKCxbMC05XStcXCk/W2FjZF1bMC05XStcXCgs WzAtOV0rXFwpP1xcKSQiKSkKKyAgKGNvbmNhdCAiXlxcKD86IiBkaWZmLWh1bmstaGVhZGVyLXJl LXVuaWZpZWQgIi4qXFx8IgorICAgICAgICAgIGRpZmYtaHVuay1oZWFkZXItcmUtY29udGV4dAor ICAgICAgICAgICJcXHxbMC05XStcXCgsWzAtOV0rXFwpP1thY2RdWzAtOV0rXFwoLFswLTldK1xc KT9cXCkkIikpCiAoZGVmY29uc3QgZGlmZi1maWxlLWhlYWRlci1yZSAoY29uY2F0ICJeXFwoLS0t IC4rXG5cXCtcXCtcXCsgXFx8XFwqXFwqXFwqIC4rXG4tLS0gXFx8W14tKyE8PjAtOUAqIFxuXVxc KS4rXG4iIChzdWJzdHJpbmcgZGlmZi1odW5rLWhlYWRlci1yZSAxKSkpCiAoZGVmdmFyIGRpZmYt bmFycm93ZWQtdG8gbmlsKQogCkBAIC0xMDQ4LDcgKzEwNTIsMTEgQEAgV2l0aCBhIHByZWZpeCBh cmd1bWVudCwgY29udmVydCB1bmlmaWVkIGZvcm1hdCB0byBjb250ZXh0IGZvcm1hdC4iCiAgICAg ICAgICAgKGluaGliaXQtcmVhZC1vbmx5IHQpKQogICAgICAgKHNhdmUtZXhjdXJzaW9uCiAgICAg ICAgIChnb3RvLWNoYXIgc3RhcnQpCi0gICAgICAgICh3aGlsZSAoYW5kIChyZS1zZWFyY2gtZm9y d2FyZCAiXlxcKFxcKFxcKlxcKlxcKlxcKSAuK1xuXFwoLS0tXFwpIC4rXFx8XFwqXFx7MTVcXH0u KlxuXFwqXFwqXFwqIFxcKFswLTldK1xcKSxcXCgtP1swLTldK1xcKSBcXCpcXCpcXCpcXCpcXClc XCg/OiBcXCguKlxcKVxcfCRcXCkiIG5pbCB0KQorICAgICAgICAod2hpbGUgKGFuZCAocmUtc2Vh cmNoLWZvcndhcmQKKyAgICAgICAgICAgICAgICAgICAgIChjb25jYXQgIl5cXChcXChcXCpcXCpc XCpcXCkgLitcblxcKC0tLVxcKSAuK1xcfCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ZGlmZi1odW5rLWhlYWRlci1yZS1jb250ZXh0CisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICJcXClcXCg/OiBcXCguKlxcKVxcfCRcXCkiKQorICAgICAgICAgICAgICAgICAgICAgbmlsIHQp CiAgICAgICAgICAgICAgICAgICAgICg8IChwb2ludCkgZW5kKSkKICAgICAgICAgICAoY29tYmlu ZS1hZnRlci1jaGFuZ2UtY2FsbHMKICAgICAgICAgICAgIChpZiAobWF0Y2gtYmVnaW5uaW5nIDIp CkBAIC0xMDU4LDE1ICsxMDY2LDE1IEBAIFdpdGggYSBwcmVmaXggYXJndW1lbnQsIGNvbnZlcnQg dW5pZmllZCBmb3JtYXQgdG8gY29udGV4dCBmb3JtYXQuIgogICAgICAgICAgICAgICAgICAgKHJl cGxhY2UtbWF0Y2ggIisrKyIgdCB0IG5pbCAzKQogICAgICAgICAgICAgICAgICAgKHJlcGxhY2Ut bWF0Y2ggIi0tLSIgdCB0IG5pbCAyKSkKICAgICAgICAgICAgICAgOzsgd2UgbWF0Y2hlZCBhIGh1 bmsgaGVhZGVyCi0gICAgICAgICAgICAgIChsZXQgKChsaW5lMXMgKG1hdGNoLXN0cmluZyA0KSkK LSAgICAgICAgICAgICAgICAgICAgKGxpbmUxZSAobWF0Y2gtc3RyaW5nIDUpKQorICAgICAgICAg ICAgICAobGV0ICgobGluZTFzIChtYXRjaC1zdHJpbmcgNSkpCisgICAgICAgICAgICAgICAgICAg IChsaW5lMWUgKG1hdGNoLXN0cmluZyA2KSkKICAgICAgICAgICAgICAgICAgICAgKHB0MSAobWF0 Y2gtYmVnaW5uaW5nIDApKQogICAgICAgICAgICAgICAgICAgICA7OyBWYXJpYWJsZXMgdG8gdXNl IHRoZSBzcGVjaWFsIHVuZG8gZnVuY3Rpb24uCiAgICAgICAgICAgICAgICAgICAgIChvbGQtdW5k byBidWZmZXItdW5kby1saXN0KQogICAgICAgICAgICAgICAgICAgICAob2xkLWVuZCAobWFya2Vy LXBvc2l0aW9uIGVuZCkpCiAgICAgICAgICAgICAgICAgICAgIDs7IFdlIGN1cnJlbnRseSB0aHJv dyBhd2F5IHRoZSBjb21tZW50IHRoYXQgY2FuIGZvbGxvdwogICAgICAgICAgICAgICAgICAgICA7 OyB0aGUgaHVuayBoZWFkZXIuICBGSVhNRTogUHJlc2VydmUgaXQgaW5zdGVhZCEKLSAgICAgICAg ICAgICAgICAgICAgKHJldmVyc2libGUgKG5vdCAobWF0Y2gtZW5kIDYpKSkpCisgICAgICAgICAg ICAgICAgICAgIChyZXZlcnNpYmxlIChub3QgKG1hdGNoLWVuZCA3KSkpKQogICAgICAgICAgICAg ICAgIChyZXBsYWNlLW1hdGNoICIiKQogICAgICAgICAgICAgICAgICh1bmxlc3MgKHJlLXNlYXJj aC1mb3J3YXJkCiAgICAgICAgICAgICAgICAgICAgICAgICAgZGlmZi1jb250ZXh0LW1pZC1odW5r LWhlYWRlci1yZSBuaWwgdCkKQEAgLTExNDQsNyArMTE1MiwxMSBAQCBlbHNlIGNvdmVyIHRoZSB3 aG9sZSBidWZmZXIuIgogCShpbmhpYml0LXJlYWQtb25seSB0KSkKICAgICAoc2F2ZS1leGN1cnNp b24KICAgICAgIChnb3RvLWNoYXIgc3RhcnQpCi0gICAgICAod2hpbGUgKGFuZCAocmUtc2VhcmNo LWZvcndhcmQgIl5cXChcXChbLSpdWy0qXVstKl0gXFwpXFwoLitcXClcblxcKFstK11bLStdWy0r XSBcXClcXCguK1xcKVxcfFxcKlxcezE1XFx9LipcblxcKlxcKlxcKiBcXCguK1xcKSBcXCpcXCpc XCpcXCpcXHxAQCAtXFwoWzAtOSxdK1xcKSBcXCtcXChbMC05LF0rXFwpIEBALipcXCkkIiBuaWwg dCkKKyAgICAgICh3aGlsZSAoYW5kIChyZS1zZWFyY2gtZm9yd2FyZAorICAgICAgICAgICAgICAg ICAgIChjb25jYXQgIl5cXChcXChbLSpdWy0qXVstKl0gXFwpXFwoLitcXClcblxcKFstK11bLStd Wy0rXSBcXClcXCguK1xcKVxcfCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpZmYtaHVu ay1oZWFkZXItcmUtY29udGV4dAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIlxcfEBAIC1c XChbMC05LF0rXFwpIFxcK1xcKFswLTksXStcXCkgQEAuKlxcKSQiKQorICAgICAgICAgICAgICAg ICAgIG5pbCB0KQogCQkgICg8IChwb2ludCkgZW5kKSkKIAkoY29tYmluZS1hZnRlci1jaGFuZ2Ut Y2FsbHMKIAkgIChjb25kCkBAIC0xNDk3LDEzICsxNTA5LDEzIEBAIE9ubHkgd29ya3MgZm9yIHVu aWZpZWQgZGlmZnMuIgogCiAgICAgICAgOzsgQSBjb250ZXh0IGRpZmYuCiAgICAgICAgKChlcSAo Y2hhci1hZnRlcikgPyopCi0gICAgICAgIChpZiAobm90IChsb29raW5nLWF0ICJcXCpcXHsxNVxc fVxcKD86IC4qXFwpP1xuXFwqXFwqXFwqIFxcKFswLTldK1xcKVxcKD86LFxcKFswLTldK1xcKVxc KT8gXFwqXFwqXFwqXFwqIikpCisgICAgICAgIChpZiAobm90IChsb29raW5nLWF0IGRpZmYtaHVu ay1oZWFkZXItcmUtY29udGV4dCkpCiAgICAgICAgICAgICAoZXJyb3IgIlVucmVjb2duaXplZCBj b250ZXh0IGRpZmYgZmlyc3QgaHVuayBoZWFkZXIgZm9ybWF0IikKICAgICAgICAgICAoZm9yd2Fy ZC1saW5lIDIpCiAgICAgICAgICAgKGRpZmYtc2FuaXR5LWNoZWNrLWNvbnRleHQtaHVuay1oYWxm Ci0JICAgKGlmIChtYXRjaC1lbmQgMikKLQkgICAgICAgKDErICgtIChzdHJpbmctdG8tbnVtYmVy IChtYXRjaC1zdHJpbmcgMikpCi0JCSAgICAgIChzdHJpbmctdG8tbnVtYmVyIChtYXRjaC1zdHJp bmcgMSkpKSkKKyAgICAgICAgICAgKGlmIChtYXRjaC1lbmQgMykKKyAgICAgICAgICAgICAgICgx KyAoLSAoc3RyaW5nLXRvLW51bWJlciAobWF0Y2gtc3RyaW5nIDMpKQorICAgICAgICAgICAgICAg ICAgICAgIChzdHJpbmctdG8tbnVtYmVyIChtYXRjaC1zdHJpbmcgMikpKSkKIAkgICAgIDEpKQog ICAgICAgICAgIChpZiAobm90IChsb29raW5nLWF0IGRpZmYtY29udGV4dC1taWQtaHVuay1oZWFk ZXItcmUpKQogICAgICAgICAgICAgICAoZXJyb3IgIlVucmVjb2duaXplZCBjb250ZXh0IGRpZmYg c2Vjb25kIGh1bmsgaGVhZGVyIGZvcm1hdCIpCi0tIAoxLjYuNC40Cgo= --_003_B393F5AD12955C48A84FFB08032CD04F6C432C3CECSEXGPMB01winl_ Content-Type: application/octet-stream; name="0002-Set-vc-diff-point.patch" Content-Description: 0002-Set-vc-diff-point.patch Content-Disposition: attachment; filename="0002-Set-vc-diff-point.patch"; size=6249; creation-date="Fri, 19 Feb 2016 05:25:57 GMT"; modification-date="Fri, 19 Feb 2016 05:25:57 GMT" Content-Transfer-Encoding: base64 RnJvbSA2N2IzNjdhYjc1N2YwMTNkY2E4NjNiMzQ5NzU4ZjlhNzU3YjNmN2I5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEYXZpcyBIZXJyaW5nIDxoZXJyaW5nQGxhbmwuZ292PgpEYXRl OiBUaHUsIDE4IEZlYiAyMDE2IDA4OjEwOjUxIC0wNzAwClN1YmplY3Q6IFtQQVRDSCAyLzJdIFNl dCB2Yy1kaWZmIHBvaW50IHRvIGNvcnJlc3BvbmQgdG8gcG9pbnQgaW4gZmlsZQoKKiBsaXNwL3Zj L2RpZmYtbW9kZS5lbCAoZGlmZi1nb3RvLWxpbmUpOiBOZXcgZnVuY3Rpb24uCiogbGlzcC92Yy92 Yy5lbCAodmMtZGlmZi1maW5pc2gpOiBVc2UgaXQuCih2Yy1kaWZmLWludGVybmFsKTogTm90ZSBs b2NhdGlvbiBhbmQgcGFzcyBpdCB0byBgdmMtZGlmZi1maW5pc2gnLgotLS0KIGxpc3AvdmMvZGlm Zi1tb2RlLmVsIHwgICAzOSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysK IGxpc3AvdmMvdmMuZWwgICAgICAgIHwgICAyNCArKysrKysrKysrKysrKysrKysrKy0tLS0KIDIg ZmlsZXMgY2hhbmdlZCwgNTkgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9saXNwL3ZjL2RpZmYtbW9kZS5lbCBiL2xpc3AvdmMvZGlmZi1tb2RlLmVsCmluZGV4IDA2 ZDQ1MDIuLjdhZDNlZWUgMTAwNjQ0Ci0tLSBhL2xpc3AvdmMvZGlmZi1tb2RlLmVsCisrKyBiL2xp c3AvdmMvZGlmZi1tb2RlLmVsCkBAIC01OTYsNiArNTk2LDQ1IEBAIG5leHQgaHVuayBpZiBUUlkt SEFSREVSIGlzIG5vbi1uaWw7IG90aGVyd2lzZSBzaWduYWwgYW4gZXJyb3IuIgogKGVhc3ktbW1v ZGUtZGVmaW5lLW5hdmlnYXRpb24KICBkaWZmLWZpbGUgZGlmZi1maWxlLWhlYWRlci1yZSAiZmls ZSIgZGlmZi1lbmQtb2YtZmlsZSkKIAorKGRlZnVuIGRpZmYtZ290by1saW5lIChmaWxlIGxpbmUg Y29sdW1uKQorICAiR28gdG8gdGhlIHBsYWNlIGluIHRoaXMgZGlmZiBwcm9kdWNpbmcgTElORSBp biBGSUxFLgorSWYgTElORSAoaW4gdGhlIG5ldyB2ZXJzaW9uIG9mIEZJTEUpIGlzIGluY2x1ZGVk LCBtb3ZlIHRvIGl0IGFuZCB0aGVuCitDT0xVTU4gY2hhcmFjdGVycyBmb3J3YXJkLiAgSWYgaXQg aXMgYWJzZW50LCBnbyB0byB0aGUgZmlyc3QgaHVuaworc3RhcnRpbmcgYWZ0ZXIgTElORSwgb3Ig dG8gdGhlIGVuZCBpZiBub25lIGRvZXMuCitJZiBGSUxFIGlzbid0IG1lbnRpb25lZCwgZ28gdG8g dGhlIGJlZ2lubmluZyBvZiB0aGUgYnVmZmVyLiIKKyAgKGdvdG8tY2hhciAocG9pbnQtbWluKSkK KyAgKHdoaWxlIChhbmQgKHJlLXNlYXJjaC1mb3J3YXJkIGRpZmYtZmlsZS1oZWFkZXItcmUgbmls ICdtb3ZlKQorICAgICAgICAgICAgICAobm90IChzdHJpbmctZXF1YWwgKGRpZmYtZmluZC1maWxl LW5hbWUpIGZpbGUpKSkpCisgIChpZiAoZW9icCkgKGdvdG8tY2hhciAocG9pbnQtbWluKSkKKyAg ICAoZm9yd2FyZC1saW5lIC0xKQorICAgICh3aGlsZQorICAgICAgICAocHJvZ24KKyAgICAgICAg ICAoY29uZGl0aW9uLWNhc2UgbmlsIChkaWZmLWh1bmstbmV4dCkKKyAgICAgICAgICAgIChlcnJv ciAoZ290by1jaGFyIChwb2ludC1tYXgpKSkpCisgICAgICAgICAgKGNvbmQgKChlb2JwKSBuaWwp ICAgICAgICAgICAgOyBlbmQgb2YgdGhlIGxpbmUKKyAgICAgICAgICAgICAgICAoKGxvb2tpbmct YXQgZGlmZi1odW5rLWhlYWRlci1yZS11bmlmaWVkKQorICAgICAgICAgICAgICAgICAobGV0ICgo c3RhcnQgKHN0cmluZy10by1udW1iZXIgKG1hdGNoLXN0cmluZyAzKSkpCisgICAgICAgICAgICAg ICAgICAgICAgIDs7IEZJWE1FOiBhc3N1bWluZyB0aGF0IHdlIGhhdmUgdGhlIGxlbmd0aAorICAg ICAgICAgICAgICAgICAgICAgICAobGVuIChzdHJpbmctdG8tbnVtYmVyIChtYXRjaC1zdHJpbmcg NCkpKSkKKyAgICAgICAgICAgICAgICAgICAoY29uZCAoKDwgbGluZSBzdGFydCkgbmlsKSAgICA7 IG5vdGhpbmcgZm91bmQKKyAgICAgICAgICAgICAgICAgICAgICAgICAoKDwgbGluZSAoKyBzdGFy dCBsZW4pKSA7IHRoaXMgaXMgb3VyIHN0b3AKKyAgICAgICAgICAgICAgICAgICAgICAgICAgKGRv dGltZXMgKGkgKC0gbGluZSBzdGFydCAtMSkpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg KHdoaWxlIChwcm9nbiAoZm9yd2FyZC1saW5lIDEpCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAoZXEgKGNoYXItYWZ0ZXIpID8tKSkpKQorICAgICAgICAgICAgICAg ICAgICAgICAgICAoZm9yd2FyZC1jaGFyICgxKyBjb2x1bW4pKSkKKyAgICAgICAgICAgICAgICAg ICAgICAgICAodCkpKSkgICAgICAgICA7IGtlZXAgbG9va2luZworICAgICAgICAgICAgICAgICgo bG9va2luZy1hdCBkaWZmLWh1bmstaGVhZGVyLXJlLWNvbnRleHQpCisgICAgICAgICAgICAgICAg IChyZS1zZWFyY2gtZm9yd2FyZCBkaWZmLWNvbnRleHQtbWlkLWh1bmstaGVhZGVyLXJlKQorICAg ICAgICAgICAgICAgICAobGV0ICgoc3RhcnQgKHN0cmluZy10by1udW1iZXIgKG1hdGNoLXN0cmlu ZyAyKSkpCisgICAgICAgICAgICAgICAgICAgICAgIDs7IEZJWE1FOiBhc3N1bWluZyB0aGF0IHdl IGhhdmUgdGhlIGxlbmd0aAorICAgICAgICAgICAgICAgICAgICAgICAoZW5kIChzdHJpbmctdG8t bnVtYmVyIChtYXRjaC1zdHJpbmcgMykpKSkKKyAgICAgICAgICAgICAgICAgICAoY29uZCAoKDwg bGluZSBzdGFydCkgbmlsKSA7IG5vdGhpbmcgZm91bmQKKyAgICAgICAgICAgICAgICAgICAgICAg ICAoKDw9IGxpbmUgZW5kKSAgICAgICA7IHRoaXMgaXMgb3VyIHN0b3AKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgKGZvcndhcmQtbGluZSAoLSBsaW5lIHN0YXJ0IC0xKSkKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgKGZvcndhcmQtY2hhciAoKyBjb2x1bW4gMikpKQorICAgICAgICAgICAg ICAgICAgICAgICAgICh0KSkpKSAgICAgICAgIDsga2VlcCBsb29raW5nCisgICAgICAgICAgICAg ICAgKHQgKGVycm9yICJVbmlmaWVkIG9yIGNvbnRleHQgZGlmZnMgb25seSIpKSkpKSkpCisKIChk ZWZ1biBkaWZmLWJvdW5kcy1vZi1odW5rICgpCiAgICJSZXR1cm4gdGhlIGJvdW5kcyBvZiB0aGUg ZGlmZiBodW5rIGF0IHBvaW50LgogVGhlIHJldHVybiB2YWx1ZSBpcyBhIGxpc3QgKEJFRyBFTkQp LCB3aGljaCBhcmUgdGhlIGh1bmsncyBzdGFydApkaWZmIC0tZ2l0IGEvbGlzcC92Yy92Yy5lbCBi L2xpc3AvdmMvdmMuZWwKaW5kZXggMjViNDFlMy4uOTFlNTJmOCAxMDA2NDQKLS0tIGEvbGlzcC92 Yy92Yy5lbAorKysgYi9saXNwL3ZjL3ZjLmVsCkBAIC03MTAsNiArNzEwLDcgQEAKIChyZXF1aXJl ICdjbC1saWIpCiAKIChkZWNsYXJlLWZ1bmN0aW9uIGRpZmYtc2V0dXAtd2hpdGVzcGFjZSAiZGlm Zi1tb2RlIiAoKSkKKyhkZWNsYXJlLWZ1bmN0aW9uIGRpZmYtZ290by1saW5lICJkaWZmLW1vZGUi KQogCiAoZXZhbC13aGVuLWNvbXBpbGUKICAgKHJlcXVpcmUgJ2RpcmVkKSkKQEAgLTE2NTAsNyAr MTY1MSw3IEBAIHRvIG92ZXJyaWRlIHRoZSB2YWx1ZSBvZiBgdmMtZGlmZi1zd2l0Y2hlcycgYW5k IGBkaWZmLXN3aXRjaGVzJy4iCiAgIChkZWNsYXJlIChvYnNvbGV0ZSB2Yy1zd2l0Y2hlcyAiMjIu MSIpKQogICBgKHZjLXN3aXRjaGVzICcsYmFja2VuZCAnZGlmZikpCiAKLShkZWZ1biB2Yy1kaWZm LWZpbmlzaCAoYnVmZmVyIG1lc3NhZ2VzKQorKGRlZnVuIHZjLWRpZmYtZmluaXNoIChidWZmZXIg bWVzc2FnZXMgbG9jKQogICA7OyBUaGUgZW1wdHkgc3luYyBvdXRwdXQgY2FzZSBoYXMgYWxyZWFk eSBiZWVuIGhhbmRsZWQsIHNvIHRoZSBvbmx5CiAgIDs7IHBvc3NpYmlsaXR5IG9mIGFuIGVtcHR5 IG91dHB1dCBpcyBmb3IgYW4gYXN5bmMgcHJvY2Vzcy4KICAgKHdoZW4gKGJ1ZmZlci1saXZlLXAg YnVmZmVyKQpAQCAtMTY2NCw3ICsxNjY1LDggQEAgdG8gb3ZlcnJpZGUgdGhlIHZhbHVlIG9mIGB2 Yy1kaWZmLXN3aXRjaGVzJyBhbmQgYGRpZmYtc3dpdGNoZXMnLiIKIAkoZGlmZi1zZXR1cC13aGl0 ZXNwYWNlKQogCShnb3RvLWNoYXIgKHBvaW50LW1pbikpCiAJKHdoZW4gd2luZG93Ci0JICAoc2hy aW5rLXdpbmRvdy1pZi1sYXJnZXItdGhhbi1idWZmZXIgd2luZG93KSkpCisJICAoc2hyaW5rLXdp bmRvdy1pZi1sYXJnZXItdGhhbi1idWZmZXIgd2luZG93KSkKKyAgICAgICAgKHdoZW4gbG9jIChh cHBseSAjJ2RpZmYtZ290by1saW5lIGxvYykpKQogICAgICAgKHdoZW4gKGFuZCBtZXNzYWdlcyAo bm90IGVtcHR5cCkpCiAJKG1lc3NhZ2UgIiVzZG9uZSIgKGNhciBtZXNzYWdlcykpKSkpKQogCkBA IC0xNjg4LDcgKzE2OTAsOCBAQCBSZXR1cm4gdCBpZiB0aGUgYnVmZmVyIGhhZCBjaGFuZ2VzLCBu aWwgb3RoZXJ3aXNlLiIKIAkgOzsgYnV0IHRoZSBvbmx5IHdheSB0byBzZXQgaXQgZm9yIGVhY2gg ZmlsZSBpbmNsdWRlZCB3b3VsZAogCSA7OyBiZSB0byBjYWxsIHRoZSBiYWNrIGVuZCBzZXBhcmF0 ZWx5IGZvciBlYWNoIGZpbGUuCiAJIChjb2Rpbmctc3lzdGVtLWZvci1yZWFkCi0JICAoaWYgZmls ZXMgKHZjLWNvZGluZy1zeXN0ZW0tZm9yLWRpZmYgKGNhciBmaWxlcykpICd1bmRlY2lkZWQpKSkK KwkgIChpZiBmaWxlcyAodmMtY29kaW5nLXN5c3RlbS1mb3ItZGlmZiAoY2FyIGZpbGVzKSkgJ3Vu ZGVjaWRlZCkpCisJIGxvYykKICAgICA7OyBPbiBNUy1XaW5kb3dzIGFuZCBNUy1ET1MsIERpZmYg aXMgbGlrZWx5IHRvIHByb2R1Y2UgRE9TLXN0eWxlCiAgICAgOzsgRU9Mcywgd2hpY2ggd2lsbCBs b29rIHVnbHkgaWYgKGNhciBmaWxlcykgaGFwcGVucyB0byBoYXZlIFVuaXgKICAgICA7OyBFT0xz LgpAQCAtMTcyNSw2ICsxNzI4LDE5IEBAIFJldHVybiB0IGlmIHRoZSBidWZmZXIgaGFkIGNoYW5n ZXMsIG5pbCBvdGhlcndpc2UuIgogICAgICAgICAgICAgICAgICAgICAgKGlmIGFzeW5jICdhc3lu YyAxKSAiZGlmZiIgZmlsZQogICAgICAgICAgICAgICAgICAgICAgKGFwcGVuZCAodmMtc3dpdGNo ZXMgbmlsICdkaWZmKSAnKCIvZGV2L251bGwiKSkpKSkpCiAgICAgICAgIChzZXRxIGZpbGVzIChu cmV2ZXJzZSBmaWx0ZXJlZCkpKSkKKyAgICAodW5sZXNzIHJldjIgICAgOyByZW1lbWJlciB0aGUg cG9zaXRpb24gaW4gdGhlIG9yIGEgY3VycmVudCBidWZmZXIKKyAgICAgIChsZXQgKChmIGZpbGVz KSkKKyAgICAgICAgKHdoaWxlIGYKKyAgICAgICAgICAobGV0ICgoYnVmIChmaW5kLWJ1ZmZlci12 aXNpdGluZyAoY2FyIGYpKSkpCisgICAgICAgICAgICAod2hlbiBidWYKKyAgICAgICAgICAgICAg KHNldHEgbG9jCisgICAgICAgICAgICAgICAgICAgICh3aXRoLWN1cnJlbnQtYnVmZmVyIGJ1Zgor ICAgICAgICAgICAgICAgICAgICAgIChzYXZlLXJlc3RyaWN0aW9uCisgICAgICAgICAgICAgICAg ICAgICAgICAod2lkZW4pCisgICAgICAgICAgICAgICAgICAgICAgICAobGlzdCAoZmlsZS1yZWxh dGl2ZS1uYW1lIChjYXIgZikpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAobGluZS1u dW1iZXItYXQtcG9zKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKC0gKHBvaW50KSAo bGluZS1iZWdpbm5pbmctcG9zaXRpb24pKSkpKSkpCisgICAgICAgICAgICAoc2V0cSBmICh1bmxl c3MgKGVxIGJ1ZiAoY3VycmVudC1idWZmZXIpKSAoY2RyIGYpKSkpKSkpCiAgICAgKHZjLWNhbGwt YmFja2VuZCAoY2FyIHZjLWZpbGVzZXQpICdkaWZmIGZpbGVzIHJldjEgcmV2MiBidWZmZXIgYXN5 bmMpCiAgICAgKHNldC1idWZmZXIgYnVmZmVyKQogICAgIChkaWZmLW1vZGUpCkBAIC0xNzQ4LDcg KzE3NjQsNyBAQCBSZXR1cm4gdCBpZiB0aGUgYnVmZmVyIGhhZCBjaGFuZ2VzLCBuaWwgb3RoZXJ3 aXNlLiIKICAgICAgIDs7IGFmdGVyIGBwb3AtdG8tYnVmZmVyJzsgdGhlIGZvcm1lciBhc3N1bWVz IHRoZSBkaWZmIGJ1ZmZlciBpcwogICAgICAgOzsgc2hvd24gaW4gc29tZSB3aW5kb3cuCiAgICAg ICAobGV0ICgoYnVmIChjdXJyZW50LWJ1ZmZlcikpKQotICAgICAgICAodmMtcnVuLWRlbGF5ZWQg KHZjLWRpZmYtZmluaXNoIGJ1ZiAod2hlbiB2ZXJib3NlIG1lc3NhZ2VzKSkpKQorICAgICAgICAo dmMtcnVuLWRlbGF5ZWQgKHZjLWRpZmYtZmluaXNoIGJ1ZiAod2hlbiB2ZXJib3NlIG1lc3NhZ2Vz KSBsb2MpKSkKICAgICAgIDs7IEluIHRoZSBhc3luYyBjYXNlLCB3ZSByZXR1cm4gdCBldmVuIGlm IHRoZXJlIGFyZSBubyBkaWZmZXJlbmNlcwogICAgICAgOzsgYmVjYXVzZSB3ZSBkb24ndCBrbm93 IHRoYXQgeWV0LgogICAgICAgdCkpKQotLSAKMS42LjQuNAoK --_003_B393F5AD12955C48A84FFB08032CD04F6C432C3CECSEXGPMB01winl_--