From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: "Perry E. Metzger" Newsgroups: gmane.emacs.devel Subject: Re: Advice needed on modeline customization hack... Date: Sun, 16 Apr 2017 18:57:40 -0400 Message-ID: <20170416185740.7d848393@jabberwock.cb.piermont.com> References: <20170415212800.5be89037@jabberwock.cb.piermont.com> <20170416094929.51e94c82@jabberwock.cb.piermont.com> <20170416104633.1768bbb6@jabberwock.cb.piermont.com> <20170416120942.36af8967@jabberwock.cb.piermont.com> <20170416180620.3615b4b6@jabberwock.cb.piermont.com> <20170416181607.4ca1971e@jabberwock.cb.piermont.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/_A5QjvKFk+LNHvTyUFPSfrY" X-Trace: blaine.gmane.org 1492383473 17815 195.159.176.226 (16 Apr 2017 22:57:53 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 16 Apr 2017 22:57:53 +0000 (UTC) Cc: Stefan Monnier , emacs-devel@gnu.org To: =?ISO-8859-1?Q?Cl=E9ment?= Pit-Claudel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 17 00:57:46 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1czt74-0004VV-Az for ged-emacs-devel@m.gmane.org; Mon, 17 Apr 2017 00:57:46 +0200 Original-Received: from localhost ([::1]:33849 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1czt7A-0000Bo-0U for ged-emacs-devel@m.gmane.org; Sun, 16 Apr 2017 18:57:52 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34287) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1czt71-0000Ar-2u for emacs-devel@gnu.org; Sun, 16 Apr 2017 18:57:44 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1czt70-00076A-4f for emacs-devel@gnu.org; Sun, 16 Apr 2017 18:57:43 -0400 Original-Received: from hacklheber.piermont.com ([2001:470:30:84:e276:63ff:fe62:3400]:52421) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1czt70-00075O-0L for emacs-devel@gnu.org; Sun, 16 Apr 2017 18:57:42 -0400 Original-Received: from snark.cb.piermont.com (localhost [127.0.0.1]) by hacklheber.piermont.com (Postfix) with ESMTP id A49E2A85; Sun, 16 Apr 2017 18:57:40 -0400 (EDT) Original-Received: from jabberwock.cb.piermont.com (jabberwock.cb.piermont.com [10.160.2.107]) by snark.cb.piermont.com (Postfix) with ESMTP id 51B182DE021; Sun, 16 Apr 2017 18:57:40 -0400 (EDT) In-Reply-To: <20170416181607.4ca1971e@jabberwock.cb.piermont.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:470:30:84:e276:63ff:fe62:3400 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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:214032 Archived-At: --MP_/_A5QjvKFk+LNHvTyUFPSfrY Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline On Sun, 16 Apr 2017 18:16:07 -0400 "Perry E. Metzger" wrote: > New patch, including documentation fixes, in a bit. Attached is an improved patch, including documentation changes. For those who haven't been following, the patches allow the user to customize the column number in column-number-mode to start from one instead of from zero. They: 1) Make the mode line element "%C" behave just like "%c" except "%C" displays the column starting at 1 and not 0. 2) Add a variable named "column-number-mode-starts-from-zero", which defaults to "t". If it is set to "t", "%c" is used for column-number-mode, and if it is "nil", "%C" is used. 3) Document (1) and (2). Comments solicited. I'm not fond of the name "column-number-mode-starts-from-zero" by the way. Perry -- Perry E. Metzger perry@piermont.com --MP_/_A5QjvKFk+LNHvTyUFPSfrY Content-Type: application/octet-stream; name=column.diff Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=column.diff ZGlmZiAtLWdpdCBhL2RvYy9lbWFjcy9kaXNwbGF5LnRleGkgYi9kb2MvZW1hY3MvZGlzcGxheS50 ZXhpCmluZGV4IDFhOWM2NWEwOGMuLjdiMjhiYTBjOTcgMTAwNjQ0Ci0tLSBhL2RvYy9lbWFjcy9k aXNwbGF5LnRleGkKKysrIGIvZG9jL2VtYWNzL2Rpc3BsYXkudGV4aQpAQCAtMTMyNywxMyArMTMy NywxOSBAQCBPcHRpb25hbCBNb2RlIExpbmUKIEBjaW5kZXggbW9kZSwgQ29sdW1uIE51bWJlcgog QGZpbmRleCBjb2x1bW4tbnVtYmVyLW1vZGUKICAgU2ltaWxhcmx5LCB5b3UgY2FuIGRpc3BsYXkg dGhlIGN1cnJlbnQgY29sdW1uIG51bWJlciBieSB0dXJuaW5nIG9uCi1Db2x1bW4gbnVtYmVyIG1v ZGUgd2l0aCBAa2Jke00teCBjb2x1bW4tbnVtYmVyLW1vZGV9LiAgVGhlIGNvbHVtbgorQ29sdW1u IE51bWJlciBtb2RlIHdpdGggQGtiZHtNLXggY29sdW1uLW51bWJlci1tb2RlfS4gIFRoZSBjb2x1 bW4KIG51bWJlciBpcyBpbmRpY2F0ZWQgYnkgdGhlIGxldHRlciBAc2FtcHtDfS4gIEhvd2V2ZXIs IHdoZW4gYm90aCBvZgogdGhlc2UgbW9kZXMgYXJlIGVuYWJsZWQsIHRoZSBsaW5lIGFuZCBjb2x1 bW4gbnVtYmVycyBhcmUgZGlzcGxheWVkIGluCiBwYXJlbnRoZXNlcywgdGhlIGxpbmUgbnVtYmVy IGZpcnN0LCByYXRoZXIgdGhhbiB3aXRoIEBzYW1we0x9IGFuZAogQHNhbXB7Q30uICBGb3IgZXhh bXBsZTogQHNhbXB7KDU2MSwyKX0uICBAeHJlZntNaW5vciBNb2Rlc30sIGZvciBtb3JlCiBpbmZv cm1hdGlvbiBhYm91dCBtaW5vciBtb2RlcyBhbmQgYWJvdXQgaG93IHRvIHVzZSB0aGVzZSBjb21t YW5kcy4KIAorQHZpbmRleCBjb2x1bW4tbnVtYmVyLW1vZGUtc3RhcnRzLWZyb20temVybworICBJ biBDb2x1bW4gTnVtYmVyIG1vZGUsIHRoZSBkaXNwbGF5ZWQgY29sdW1uIG51bWJlciBiZWdpbnMg YXQgemVybyBhdAordGhlIHN0YXJ0IG9mIGEgbGluZS4gSWYgeW91IHdvdWxkIHByZWZlciBmb3Ig dGhlIGRpc3BsYXllZCBjb2x1bW4KK251bWJlciB0byBiZWdpbiBhdCBvbmUsIHlvdSBtYXkgc2V0 CitAY29kZXtjb2x1bW4tbnVtYmVyLW1vZGUtc3RhcnRzLWZyb20temVyb30gdG8gQGNvZGV7bmls fS4KKwogQGNpbmRleCBuYXJyb3dpbmcsIGFuZCBsaW5lIG51bWJlciBkaXNwbGF5CiAgIElmIHlv dSBoYXZlIG5hcnJvd2VkIHRoZSBidWZmZXIgKEBweHJlZntOYXJyb3dpbmd9KSwgdGhlIGRpc3Bs YXllZAogbGluZSBudW1iZXIgaXMgcmVsYXRpdmUgdG8gdGhlIGFjY2Vzc2libGUgcG9ydGlvbiBv ZiB0aGUgYnVmZmVyLgpkaWZmIC0tZ2l0IGEvZG9jL2xpc3ByZWYvZnJhbWVzLnRleGkgYi9kb2Mv bGlzcHJlZi9mcmFtZXMudGV4aQppbmRleCBkNmYwMTRmYWRhLi5iZDJiYWNjNzM5IDEwMDY0NAot LS0gYS9kb2MvbGlzcHJlZi9mcmFtZXMudGV4aQorKysgYi9kb2MvbGlzcHJlZi9mcmFtZXMudGV4 aQpAQCAtMTg3MSw3ICsxODcxLDcgQEAgRnJhbWUgVGl0bGVzCiBUaGlzIHZhcmlhYmxlIHNwZWNp ZmllcyBob3cgdG8gY29tcHV0ZSBhIG5hbWUgZm9yIGEgZnJhbWUgd2hlbiB5b3UgaGF2ZQogbm90 IGV4cGxpY2l0bHkgc3BlY2lmaWVkIG9uZS4gIFRoZSB2YXJpYWJsZSdzIHZhbHVlIGlzIGFjdHVh bGx5IGEgbW9kZQogbGluZSBjb25zdHJ1Y3QsIGp1c3QgbGlrZSBAY29kZXttb2RlLWxpbmUtZm9y bWF0fSwgZXhjZXB0IHRoYXQgdGhlCi1Ac2FtcHslY30gYW5kIEBzYW1weyVsfSBjb25zdHJ1Y3Rz IGFyZSBpZ25vcmVkLiAgQHhyZWZ7TW9kZSBMaW5lCitAc2FtcHslY30sIEBzYW1weyVDfSwgYW5k IEBzYW1weyVsfSBjb25zdHJ1Y3RzIGFyZSBpZ25vcmVkLiAgQHhyZWZ7TW9kZSBMaW5lCiBEYXRh fS4KIEBlbmQgZGVmdmFyCiAKZGlmZiAtLWdpdCBhL2RvYy9saXNwcmVmL21vZGVzLnRleGkgYi9k b2MvbGlzcHJlZi9tb2Rlcy50ZXhpCmluZGV4IDEzMmRkYTNmYzYuLjYyM2I0YzUyYjcgMTAwNjQ0 Ci0tLSBhL2RvYy9saXNwcmVmL21vZGVzLnRleGkKKysrIGIvZG9jL2xpc3ByZWYvbW9kZXMudGV4 aQpAQCAtMjA5Myw3ICsyMDkzLDEwIEBAICUtQ29uc3RydWN0cwogQHhyZWZ7QnVmZmVyIE5hbWVz fS4KIAogQGl0ZW0gJWMKLVRoZSBjdXJyZW50IGNvbHVtbiBudW1iZXIgb2YgcG9pbnQuCitUaGUg Y3VycmVudCBjb2x1bW4gbnVtYmVyIG9mIHBvaW50LCBzdGFydGluZyBmcm9tIHplcm8uCisKK0Bp dGVtICVDCitUaGUgY3VycmVudCBjb2x1bW4gbnVtYmVyIG9mIHBvaW50LCBzdGFydGluZyBmcm9t IG9uZS4KIAogQGl0ZW0gJWUKIFdoZW4gRW1hY3MgaXMgbmVhcmx5IG91dCBvZiBtZW1vcnkgZm9y IExpc3Agb2JqZWN0cywgYSBicmllZiBtZXNzYWdlCmRpZmYgLS1naXQgYS9ldGMvcmVmY2FyZHMv Z251cy1sb2dvLnBkZiBiL2V0Yy9yZWZjYXJkcy9nbnVzLWxvZ28ucGRmCmRlbGV0ZWQgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAzNjI5YTYwNWU2Li4wMDAwMDAwMDAwCkJpbmFyeSBmaWxlcyBhL2V0 Yy9yZWZjYXJkcy9nbnVzLWxvZ28ucGRmIGFuZCAvZGV2L251bGwgZGlmZmVyCmRpZmYgLS1naXQg YS9saXNwL2JpbmRpbmdzLmVsIGIvbGlzcC9iaW5kaW5ncy5lbAppbmRleCBmNjQxODY1YmEzLi40 N2Q5NTk2MTc2IDEwMDY0NAotLS0gYS9saXNwL2JpbmRpbmdzLmVsCisrKyBiL2xpc3AvYmluZGlu Z3MuZWwKQEAgLTM2OCwxMiArMzY4LDE5IEBAIG1vZGUtbGluZS1wb3NpdGlvbgogbW91c2UtMTog RGlzcGxheSBMaW5lIGFuZCBDb2x1bW4gTW9kZSBNZW51IikpKQogICAgIChsaW5lLW51bWJlci1t b2RlCiAgICAgICgoY29sdW1uLW51bWJlci1tb2RlCi0gICAgICAgKDEwICwocHJvcGVydGl6ZQot CSAgICAgIiAoJWwsJWMpIgotCSAgICAgJ2xvY2FsLW1hcCBtb2RlLWxpbmUtY29sdW1uLWxpbmUt bnVtYmVyLW1vZGUtbWFwCi0JICAgICAnbW91c2UtZmFjZSAnbW9kZS1saW5lLWhpZ2hsaWdodAot CSAgICAgJ2hlbHAtZWNobyAiTGluZSBudW1iZXIgYW5kIENvbHVtbiBudW1iZXJcblwKKyAgICAg ICAoY29sdW1uLW51bWJlci1tb2RlLXN0YXJ0cy1mcm9tLXplcm8KKyAgICAgICAgKDEwICwocHJv cGVydGl6ZQorICAgICAgICAgICAgICAiICglbCwlYykiCisgICAgICAgICAgICAgICdsb2NhbC1t YXAgbW9kZS1saW5lLWNvbHVtbi1saW5lLW51bWJlci1tb2RlLW1hcAorICAgICAgICAgICAgICAn bW91c2UtZmFjZSAnbW9kZS1saW5lLWhpZ2hsaWdodAorICAgICAgICAgICAgICAnaGVscC1lY2hv ICJMaW5lIG51bWJlciBhbmQgQ29sdW1uIG51bWJlclxuXAogbW91c2UtMTogRGlzcGxheSBMaW5l IGFuZCBDb2x1bW4gTW9kZSBNZW51IikpCisgICAgICAgICgxMCAsKHByb3BlcnRpemUKKyAgICAg ICAgICAgICAgIiAoJWwsJUMpIgorICAgICAgICAgICAgICAnbG9jYWwtbWFwIG1vZGUtbGluZS1j b2x1bW4tbGluZS1udW1iZXItbW9kZS1tYXAKKyAgICAgICAgICAgICAgJ21vdXNlLWZhY2UgJ21v ZGUtbGluZS1oaWdobGlnaHQKKyAgICAgICAgICAgICAgJ2hlbHAtZWNobyAiTGluZSBudW1iZXIg YW5kIENvbHVtbiBudW1iZXJcblwKK21vdXNlLTE6IERpc3BsYXkgTGluZSBhbmQgQ29sdW1uIE1v ZGUgTWVudSIpKSkKICAgICAgICAoNiAsKHByb3BlcnRpemUKIAkgICAgIiBMJWwiCiAJICAgICds b2NhbC1tYXAgbW9kZS1saW5lLWNvbHVtbi1saW5lLW51bWJlci1tb2RlLW1hcApAQCAtMzgxLDEy ICszODgsMTkgQEAgbW9kZS1saW5lLXBvc2l0aW9uCiAJICAgICdoZWxwLWVjaG8gIkxpbmUgTnVt YmVyXG5cCiBtb3VzZS0xOiBEaXNwbGF5IExpbmUgYW5kIENvbHVtbiBNb2RlIE1lbnUiKSkpKQog ICAgICAoKGNvbHVtbi1udW1iZXItbW9kZQotICAgICAgICg1ICwocHJvcGVydGl6ZQotCSAgICAi IEMlYyIKLQkgICAgJ2xvY2FsLW1hcCBtb2RlLWxpbmUtY29sdW1uLWxpbmUtbnVtYmVyLW1vZGUt bWFwCi0JICAgICdtb3VzZS1mYWNlICdtb2RlLWxpbmUtaGlnaGxpZ2h0Ci0JICAgICdoZWxwLWVj aG8gIkNvbHVtbiBudW1iZXJcblwKLW1vdXNlLTE6IERpc3BsYXkgTGluZSBhbmQgQ29sdW1uIE1v ZGUgTWVudSIpKSkpKSkKKyAgICAgICAoY29sdW1uLW51bWJlci1tb2RlLXN0YXJ0cy1mcm9tLXpl cm8KKyAgICAgICAgKDUgLChwcm9wZXJ0aXplCisgICAgICAgICAgICAgIiBDJWMiCisgICAgICAg ICAgICAgJ2xvY2FsLW1hcCBtb2RlLWxpbmUtY29sdW1uLWxpbmUtbnVtYmVyLW1vZGUtbWFwCisg ICAgICAgICAgICAgJ21vdXNlLWZhY2UgJ21vZGUtbGluZS1oaWdobGlnaHQKKyAgICAgICAgICAg ICAnaGVscC1lY2hvICJDb2x1bW4gbnVtYmVyXG5cCittb3VzZS0xOiBEaXNwbGF5IExpbmUgYW5k IENvbHVtbiBNb2RlIE1lbnUiKSkKKyAgICAgICAgKDUgLChwcm9wZXJ0aXplCisgICAgICAgICAg ICAgIiBDJUMiCisgICAgICAgICAgICAgJ2xvY2FsLW1hcCBtb2RlLWxpbmUtY29sdW1uLWxpbmUt bnVtYmVyLW1vZGUtbWFwCisgICAgICAgICAgICAgJ21vdXNlLWZhY2UgJ21vZGUtbGluZS1oaWdo bGlnaHQKKyAgICAgICAgICAgICAnaGVscC1lY2hvICJDb2x1bW4gbnVtYmVyXG5cCittb3VzZS0x OiBEaXNwbGF5IExpbmUgYW5kIENvbHVtbiBNb2RlIE1lbnUiKSkpKSkpKQogICAiTW9kZSBsaW5l IGNvbnN0cnVjdCBmb3IgZGlzcGxheWluZyB0aGUgcG9zaXRpb24gaW4gdGhlIGJ1ZmZlci4KIE5v cm1hbGx5IGRpc3BsYXlzIHRoZSBidWZmZXIgcGVyY2VudGFnZSBhbmQsIG9wdGlvbmFsbHksIHRo ZQogYnVmZmVyIHNpemUsIHRoZSBsaW5lIG51bWJlciBhbmQgdGhlIGNvbHVtbiBudW1iZXIuIikK ZGlmZiAtLWdpdCBhL2xpc3Avc2ltcGxlLmVsIGIvbGlzcC9zaW1wbGUuZWwKaW5kZXggNWY3MGFk ZWRjNC4uODIxODgwYjFmMyAxMDA2NDQKLS0tIGEvbGlzcC9zaW1wbGUuZWwKKysrIGIvbGlzcC9z aW1wbGUuZWwKQEAgLTcxOTgsNiArNzE5OCwxMCBAQCBjb2x1bW4tbnVtYmVyLW1vZGUKIElmIGNh bGxlZCBmcm9tIExpc3AsIGVuYWJsZSB0aGUgbW9kZSBpZiBBUkcgaXMgb21pdHRlZCBvciBuaWwu IgogICA6Z2xvYmFsIHQgOmdyb3VwICdtb2RlLWxpbmUpCiAKKyhkZWZ2YXIgY29sdW1uLW51bWJl ci1tb2RlLXN0YXJ0cy1mcm9tLXplcm8gdAorICAiV2hlbiBzZXQgdG8gdHJ1ZSwgQ29sdW1uIE51 bWJlciBtb2RlIGRpc3BsYXlzIGNvbHVtbnMgc3RhcnRpbmcgZnJvbSB6ZXJvLgorT3RoZXJ3aXNl LCBkaXNwbGF5ZWQgY29sdW1uIG51bWJlcnMgc3RhcnQgZnJvbSBvbmUuIikKKwogKGRlZmluZS1t aW5vci1tb2RlIHNpemUtaW5kaWNhdGlvbi1tb2RlCiAgICJUb2dnbGUgYnVmZmVyIHNpemUgZGlz cGxheSBpbiB0aGUgbW9kZSBsaW5lIChTaXplIEluZGljYXRpb24gbW9kZSkuCiBXaXRoIGEgcHJl Zml4IGFyZ3VtZW50IEFSRywgZW5hYmxlIFNpemUgSW5kaWNhdGlvbiBtb2RlIGlmIEFSRyBpcwpk aWZmIC0tZ2l0IGEvc3JjL2J1ZmZlci5jIGIvc3JjL2J1ZmZlci5jCmluZGV4IDhlZjI3ZGVlMGYu Ljc2NjFlMTM2MjMgMTAwNjQ0Ci0tLSBhL3NyYy9idWZmZXIuYworKysgYi9zcmMvYnVmZmVyLmMK QEAgLTU2MDgsOCArNTYwOCwxMCBAQCBBIHN0cmluZyBpcyBwcmludGVkIHZlcmJhdGltIGluIHRo ZSBtb2RlIGxpbmUgZXhjZXB0IGZvciAlLWNvbnN0cnVjdHM6CiAJRm9yIGEgbW9kaWZpZWQgcmVh ZC1vbmx5IGJ1ZmZlciwgJSogZ2l2ZXMgJSBhbmQgJSsgZ2l2ZXMgKi4KICAgJXMgLS0gcHJpbnQg cHJvY2VzcyBzdGF0dXMuICAgJWwgLS0gcHJpbnQgdGhlIGN1cnJlbnQgbGluZSBudW1iZXIuCiAg ICVjIC0tIHByaW50IHRoZSBjdXJyZW50IGNvbHVtbiBudW1iZXIgKHRoaXMgbWFrZXMgZWRpdGlu ZyBzbG93ZXIpLgorICAgICAgICBUaGUgbGVmdG1vc3QgY29sdW1uIGlzIGRpc3BsYXllZCBhcyAw LgogICAgICAgICBUbyBtYWtlIHRoZSBjb2x1bW4gbnVtYmVyIHVwZGF0ZSBjb3JyZWN0bHkgaW4g YWxsIGNhc2VzLAogCWBjb2x1bW4tbnVtYmVyLW1vZGUnIG11c3QgYmUgbm9uLW5pbC4KKyAgJUMg LS0gTGlrZSAlYywgYnV0IHRoZSBsZWZ0bW9zdCBjb2x1bW4gaXMgZGlzcGxheWVkIGFzIDEuCiAg ICVpIC0tIHByaW50IHRoZSBzaXplIG9mIHRoZSBidWZmZXIuCiAgICVJIC0tIGxpa2UgJWksIGJ1 dCB1c2UgaywgTSwgRywgZXRjLiwgdG8gYWJicmV2aWF0ZS4KICAgJXAgLS0gcHJpbnQgcGVyY2Vu dCBvZiBidWZmZXIgYWJvdmUgdG9wIG9mIHdpbmRvdywgb3IgVG9wLCBCb3Qgb3IgQWxsLgpkaWZm IC0tZ2l0IGEvc3JjL3hkaXNwLmMgYi9zcmMveGRpc3AuYwppbmRleCBjNmY4NTY2NTIzLi5jYWIw MWVjNzAxIDEwMDY0NAotLS0gYS9zcmMveGRpc3AuYworKysgYi9zcmMveGRpc3AuYwpAQCAtNDc1 LDcgKzQ3NSw3IEBAIGludCB3aW5kb3dzX29yX2J1ZmZlcnNfY2hhbmdlZDsKICAgIHVzZWQgdG8g dHJhY2sgZG93biB0aGUgY2F1c2UgZm9yIHRoaXMgZnVsbC1yZWRpc3BsYXkpLgogCiAgICBTaW5j ZSB0aGUgZnJhbWUgdGl0bGUgdXNlcyB0aGUgc2FtZSAlLWNvbnN0cnVjdHMgYXMgdGhlIG1vZGUg bGluZQotICAgKGV4Y2VwdCAlYyBhbmQgJWwpLCBpZiB0aGlzIHZhcmlhYmxlIGlzIG5vbi16ZXJv LCB3ZSBhbHNvIGNvbnNpZGVyCisgICAoZXhjZXB0ICVjLCAlQywgYW5kICVsKSwgaWYgdGhpcyB2 YXJpYWJsZSBpcyBub24temVybywgd2UgYWxzbyBjb25zaWRlcgogICAgcmVkaXNwbGF5aW5nIHRo ZSB0aXRsZSBvZiBlYWNoIGZyYW1lLCBzZWUgeF9jb25zaWRlcl9mcmFtZV90aXRsZS4KIAogICAg VGhlIGByZWRpc3BsYXknIGJpdHMgYXJlIHRoZSBzYW1lIGFzIHRob3NlIHVzZWQgZm9yCkBAIC0x MTQ2Miw3ICsxMTQ2Miw3IEBAIHdpbmRvd19idWZmZXJfY2hhbmdlZCAoc3RydWN0IHdpbmRvdyAq dykKICAgcmV0dXJuIChCVUZfU0FWRV9NT0RJRkYgKGIpIDwgQlVGX01PRElGRiAoYikpICE9IHct Pmxhc3RfaGFkX3N0YXI7CiB9CiAKLS8qIFRydWUgaWYgVyBoYXMgJWMgaW4gaXRzIG1vZGUgbGlu ZSBhbmQgbW9kZSBsaW5lIHNob3VsZCBiZSB1cGRhdGVkLiAgKi8KKy8qIFRydWUgaWYgVyBoYXMg JWMgb3IgJUMgaW4gaXRzIG1vZGUgbGluZSBhbmQgbW9kZSBsaW5lIHNob3VsZCBiZSB1cGRhdGVk LiAgKi8KIAogc3RhdGljIGJvb2wKIG1vZGVfbGluZV91cGRhdGVfbmVlZGVkIChzdHJ1Y3Qgd2lu ZG93ICp3KQpAQCAtMjM1MjAsNyArMjM1MjAsOCBAQCBkZWNvZGVfbW9kZV9zcGVjIChzdHJ1Y3Qg d2luZG93ICp3LCByZWdpc3RlciBpbnQgYywgaW50IGZpZWxkX3dpZHRoLAogICAgICAgYnJlYWs7 CiAKICAgICBjYXNlICdjJzoKLSAgICAgIC8qICVjIGFuZCAlbCBhcmUgaWdub3JlZCBpbiBgZnJh bWUtdGl0bGUtZm9ybWF0Jy4KKyAgICBjYXNlICdDJzoKKyAgICAgIC8qICVjLCAlQywgYW5kICVs IGFyZSBpZ25vcmVkIGluIGBmcmFtZS10aXRsZS1mb3JtYXQnLgogICAgICAgICAgKEluIHJlZGlz cGxheV9pbnRlcm5hbCwgdGhlIGZyYW1lIHRpdGxlIGlzIGRyYXduIF9iZWZvcmVfIHRoZQogICAg ICAgICAgd2luZG93cyBhcmUgdXBkYXRlZCwgc28gdGhlIHN0dWZmIHdoaWNoIGRlcGVuZHMgb24g YWN0dWFsCiAgICAgICAgICB3aW5kb3cgY29udGVudHMgKHN1Y2ggYXMgJWwpIG1heSBmYWlsIHRv IHJlbmRlciBwcm9wZXJseSwgb3IKQEAgLTIzNTMwLDggKzIzNTMxLDkgQEAgZGVjb2RlX21vZGVf c3BlYyAoc3RydWN0IHdpbmRvdyAqdywgcmVnaXN0ZXIgaW50IGMsIGludCBmaWVsZF93aWR0aCwK ICAgICAgIGVsc2UKIAl7CiAJICBwdHJkaWZmX3QgY29sID0gY3VycmVudF9jb2x1bW4gKCk7CisJ ICBpbnQgZGlzcF9jb2wgPSAoYyA9PSAnQycpID8gY29sICsgMSA6IGNvbDsKIAkgIHctPmNvbHVt bl9udW1iZXJfZGlzcGxheWVkID0gY29sOwotCSAgcGludDJzdHIgKGRlY29kZV9tb2RlX3NwZWNf YnVmLCB3aWR0aCwgY29sKTsKKwkgIHBpbnQyc3RyIChkZWNvZGVfbW9kZV9zcGVjX2J1Ziwgd2lk dGgsIGRpc3BfY29sKTsKIAkgIHJldHVybiBkZWNvZGVfbW9kZV9zcGVjX2J1ZjsKIAl9CiAKQEAg LTIzNTc5LDcgKzIzNTgxLDcgQEAgZGVjb2RlX21vZGVfc3BlYyAoc3RydWN0IHdpbmRvdyAqdywg cmVnaXN0ZXIgaW50IGMsIGludCBmaWVsZF93aWR0aCwKIAlwdHJkaWZmX3QgdG9wbGluZSwgbmxp bmVzLCBoZWlnaHQ7CiAJcHRyZGlmZl90IGp1bms7CiAKLQkvKiAlYyBhbmQgJWwgYXJlIGlnbm9y ZWQgaW4gYGZyYW1lLXRpdGxlLWZvcm1hdCcuICAqLworCS8qICVjLCAlQywgYW5kICVsIGFyZSBp Z25vcmVkIGluIGBmcmFtZS10aXRsZS1mb3JtYXQnLiAgKi8KIAlpZiAobW9kZV9saW5lX3Rhcmdl dCA9PSBNT0RFX0xJTkVfVElUTEUpCiAJICByZXR1cm4gIiI7CiAKQEAgLTMxNTMwLDcgKzMxNTMy LDcgQEAgVGhpcyB2YXJpYWJsZSBpcyBub3QgZ3VhcmFudGVlZCB0byBiZSBhY2N1cmF0ZSBleGNl cHQgd2hpbGUgcHJvY2Vzc2luZwogXChBc3N1bWluZyB0aGUgd2luZG93IG1hbmFnZXIgc3VwcG9y dHMgdGhpcyBmZWF0dXJlLikKIAogVGhpcyB2YXJpYWJsZSBoYXMgdGhlIHNhbWUgc3RydWN0dXJl IGFzIGBtb2RlLWxpbmUtZm9ybWF0JywgZXhjZXB0IHRoYXQKLXRoZSAlYyBhbmQgJWwgY29uc3Ry dWN0cyBhcmUgaWdub3JlZC4gIEl0IGlzIHVzZWQgb25seSBvbiBmcmFtZXMgZm9yCit0aGUgJWMs ICVDLCBhbmQgJWwgY29uc3RydWN0cyBhcmUgaWdub3JlZC4gIEl0IGlzIHVzZWQgb25seSBvbiBm cmFtZXMgZm9yCiB3aGljaCBubyBleHBsaWNpdCBuYW1lIGhhcyBiZWVuIHNldCAoc2VlIGBtb2Rp ZnktZnJhbWUtcGFyYW1ldGVycycpLiAgKi8pOwogCiAgIERFRlZBUl9MSVNQICgiaWNvbi10aXRs ZS1mb3JtYXQiLCBWaWNvbl90aXRsZV9mb3JtYXQsCg== --MP_/_A5QjvKFk+LNHvTyUFPSfrY--