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: Mon, 17 Apr 2017 11:21:44 -0400 Message-ID: <20170417112144.7de5cc4f@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> <20170416185740.7d848393@jabberwock.cb.piermont.com> <83ziffefpj.fsf@gnu.org> <20170417085326.1e3c4b30@jabberwock.cb.piermont.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/29=NTrrTd3d2lEGggC0r93e" X-Trace: blaine.gmane.org 1492442552 22510 195.159.176.226 (17 Apr 2017 15:22:32 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 17 Apr 2017 15:22:32 +0000 (UTC) Cc: cpitclaudel@gmail.com, monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 17 17:22:28 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 1d08Tx-0005ez-U1 for ged-emacs-devel@m.gmane.org; Mon, 17 Apr 2017 17:22:26 +0200 Original-Received: from localhost ([::1]:37108 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d08U2-0003yx-6D for ged-emacs-devel@m.gmane.org; Mon, 17 Apr 2017 11:22:30 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58197) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d08TO-0003yX-S0 for emacs-devel@gnu.org; Mon, 17 Apr 2017 11:21:52 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d08TN-00079D-Lj for emacs-devel@gnu.org; Mon, 17 Apr 2017 11:21:50 -0400 Original-Received: from hacklheber.piermont.com ([166.84.7.14]:39762) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d08TJ-00074I-MB; Mon, 17 Apr 2017 11:21:45 -0400 Original-Received: from snark.cb.piermont.com (localhost [127.0.0.1]) by hacklheber.piermont.com (Postfix) with ESMTP id 14B0AA81; Mon, 17 Apr 2017 11:21:45 -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 E46E32DE040; Mon, 17 Apr 2017 11:21:44 -0400 (EDT) In-Reply-To: <20170417085326.1e3c4b30@jabberwock.cb.piermont.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 166.84.7.14 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:214063 Archived-At: --MP_/29=NTrrTd3d2lEGggC0r93e Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Attached find new patches. I've made most of the changes requested, with two small exceptions noted below: On Mon, 17 Apr 2017 08:53:26 -0400 "Perry E. Metzger" wrote: > > I also think that using digits 0 and 1 is better than using the > > words, but that's my personal preference, so if you feel strongly > > about using words, I won't object. > > I'm used to the usual rule in English classes that one uses the > written out words for small numbers, but this is technical > documentation and I think I'll change it to the way you prefer. So I read the surrounding documentation and docstrings, and it seems that there is a consistent style, both in docstrings and in the manuals, of saying "zero" and "one" rather than "0" and "1", so in order to keep to the apparent style I will be leaving it as "zero" and one". I have made all your other proposed changes to the documentation. I've renamed the variable column-number-indicator-zero-based as suggested, though I'm wondering if we should say "display" instead of "indicator" to match the documentation. > > > +(defvar column-number-mode-starts-from-zero t > > > + "When set to true, Column Number mode displays columns > > > starting from zero. +Otherwise, displayed column numbers start > > > from one.") > > > > This should be a defcustom, not defvar. > > Easily fixed. I've set it to :type 'boolean in :group 'mode-line (and have made all your other proposed changes with one exception): > > I think it's best to have > > it in xdisp.c, where the feature is implemented, in which case you > > should add the necessary stuff to cus-start.el to allow its > > customization by Custom. > > I thought that since the rest of the lisp side was done there > (including the minor mode) that it was better to have it in the .el > file. Do you have a strong opinion? Looking around, it seems that many such customization variables are in simple.el already, and that there is a bias now towards putting code into the lisp side and not the C side, so for now, my new patch leaves it there. Perry -- Perry E. Metzger perry@piermont.com --MP_/29=NTrrTd3d2lEGggC0r93e Content-Type: application/octet-stream; name=column.diff Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=column.diff ZGlmZiAtLWdpdCBhL2RvYy9lbWFjcy9kaXNwbGF5LnRleGkgYi9kb2MvZW1hY3MvZGlzcGxheS50 ZXhpCmluZGV4IDFhOWM2NWEwOGMuLjM4ZWY5MTczNzcgMTAwNjQ0Ci0tLSBhL2RvYy9lbWFjcy9k aXNwbGF5LnRleGkKKysrIGIvZG9jL2VtYWNzL2Rpc3BsYXkudGV4aQpAQCAtMTMyNywxMyArMTMy NywxOSBAQCBPcHRpb25hbCBNb2RlIExpbmUKIEBjaW5kZXggbW9kZSwgQ29sdW1uIE51bWJlcgog QGZpbmRleCBjb2x1bW4tbnVtYmVyLW1vZGUKICAgU2ltaWxhcmx5LCB5b3UgY2FuIGRpc3BsYXkg dGhlIGN1cnJlbnQgY29sdW1uIG51bWJlciBieSB0dXJuaW5nIG9uCi1Db2x1bW4gbnVtYmVyIG1v ZGUgd2l0aCBAa2Jke00teCBjb2x1bW4tbnVtYmVyLW1vZGV9LiAgVGhlIGNvbHVtbgorQ29sdW1u IE51bWJlciBtb2RlIHdpdGggQGtiZHtNLXggY29sdW1uLW51bWJlci1tb2RlfS4gIFRoZSBjb2x1 bW4KIG51bWJlciBpcyBpbmRpY2F0ZWQgYnkgdGhlIGxldHRlciBAc2FtcHtDfS4gIEhvd2V2ZXIs IHdoZW4gYm90aCBvZgogdGhlc2UgbW9kZXMgYXJlIGVuYWJsZWQsIHRoZSBsaW5lIGFuZCBjb2x1 bW4gbnVtYmVycyBhcmUgZGlzcGxheWVkIGluCiBwYXJlbnRoZXNlcywgdGhlIGxpbmUgbnVtYmVy IGZpcnN0LCByYXRoZXIgdGhhbiB3aXRoIEBzYW1we0x9IGFuZAogQHNhbXB7Q30uICBGb3IgZXhh bXBsZTogQHNhbXB7KDU2MSwyKX0uICBAeHJlZntNaW5vciBNb2Rlc30sIGZvciBtb3JlCiBpbmZv cm1hdGlvbiBhYm91dCBtaW5vciBtb2RlcyBhbmQgYWJvdXQgaG93IHRvIHVzZSB0aGVzZSBjb21t YW5kcy4KIAorQHZpbmRleCBjb2x1bW4tbnVtYmVyLWluZGljYXRvci16ZXJvLWJhc2VkCisgIElu IENvbHVtbiBOdW1iZXIgbW9kZSwgdGhlIGRpc3BsYXllZCBjb2x1bW4gbnVtYmVyIGNvdW50cyBm cm9tIHplcm8KK3N0YXJ0aW5nIGF0IHRoZSBsZWZ0IG1hcmdpbiBvZiB0aGUgd2luZG93LiAgSWYg eW91IHdvdWxkIHByZWZlciBmb3IKK3RoZSBkaXNwbGF5ZWQgY29sdW1uIG51bWJlciB0byBjb3Vu dCBmcm9tIG9uZSwgeW91IG1heSBzZXQKK0Bjb2Rle2NvbHVtbi1udW1iZXItaW5kaWNhdG9yLXpl cm8tYmFzZWR9IHRvIEBjb2Rle25pbH0uCisKIEBjaW5kZXggbmFycm93aW5nLCBhbmQgbGluZSBu dW1iZXIgZGlzcGxheQogICBJZiB5b3UgaGF2ZSBuYXJyb3dlZCB0aGUgYnVmZmVyIChAcHhyZWZ7 TmFycm93aW5nfSksIHRoZSBkaXNwbGF5ZWQKIGxpbmUgbnVtYmVyIGlzIHJlbGF0aXZlIHRvIHRo ZSBhY2Nlc3NpYmxlIHBvcnRpb24gb2YgdGhlIGJ1ZmZlci4KZGlmZiAtLWdpdCBhL2RvYy9saXNw cmVmL2ZyYW1lcy50ZXhpIGIvZG9jL2xpc3ByZWYvZnJhbWVzLnRleGkKaW5kZXggZDZmMDE0ZmFk YS4uYmQyYmFjYzczOSAxMDA2NDQKLS0tIGEvZG9jL2xpc3ByZWYvZnJhbWVzLnRleGkKKysrIGIv ZG9jL2xpc3ByZWYvZnJhbWVzLnRleGkKQEAgLTE4NzEsNyArMTg3MSw3IEBAIEZyYW1lIFRpdGxl cwogVGhpcyB2YXJpYWJsZSBzcGVjaWZpZXMgaG93IHRvIGNvbXB1dGUgYSBuYW1lIGZvciBhIGZy YW1lIHdoZW4geW91IGhhdmUKIG5vdCBleHBsaWNpdGx5IHNwZWNpZmllZCBvbmUuICBUaGUgdmFy aWFibGUncyB2YWx1ZSBpcyBhY3R1YWxseSBhIG1vZGUKIGxpbmUgY29uc3RydWN0LCBqdXN0IGxp a2UgQGNvZGV7bW9kZS1saW5lLWZvcm1hdH0sIGV4Y2VwdCB0aGF0IHRoZQotQHNhbXB7JWN9IGFu ZCBAc2FtcHslbH0gY29uc3RydWN0cyBhcmUgaWdub3JlZC4gIEB4cmVme01vZGUgTGluZQorQHNh bXB7JWN9LCBAc2FtcHslQ30sIGFuZCBAc2FtcHslbH0gY29uc3RydWN0cyBhcmUgaWdub3JlZC4g IEB4cmVme01vZGUgTGluZQogRGF0YX0uCiBAZW5kIGRlZnZhcgogCmRpZmYgLS1naXQgYS9kb2Mv bGlzcHJlZi9tb2Rlcy50ZXhpIGIvZG9jL2xpc3ByZWYvbW9kZXMudGV4aQppbmRleCAxMzJkZGEz ZmM2Li4xMzAzY2I2Y2FmIDEwMDY0NAotLS0gYS9kb2MvbGlzcHJlZi9tb2Rlcy50ZXhpCisrKyBi L2RvYy9saXNwcmVmL21vZGVzLnRleGkKQEAgLTIwOTMsNyArMjA5MywxMiBAQCAlLUNvbnN0cnVj dHMKIEB4cmVme0J1ZmZlciBOYW1lc30uCiAKIEBpdGVtICVjCi1UaGUgY3VycmVudCBjb2x1bW4g bnVtYmVyIG9mIHBvaW50LgorVGhlIGN1cnJlbnQgY29sdW1uIG51bWJlciBvZiBwb2ludCwgY291 bnRpbmcgZnJvbSB6ZXJvIHN0YXJ0aW5nIGF0IHRoZQorbGVmdCBtYXJnaW4gb2YgdGhlIHdpbmRv dy4KKworQGl0ZW0gJUMKK1RoZSBjdXJyZW50IGNvbHVtbiBudW1iZXIgb2YgcG9pbnQsIGNvdW50 aW5nIGZyb20gb25lIHN0YXJ0aW5nIGF0IHRoZQorbGVmdCBtYXJnaW4gb2YgdGhlIHdpbmRvdy4K IAogQGl0ZW0gJWUKIFdoZW4gRW1hY3MgaXMgbmVhcmx5IG91dCBvZiBtZW1vcnkgZm9yIExpc3Ag b2JqZWN0cywgYSBicmllZiBtZXNzYWdlCmRpZmYgLS1naXQgYS9ldGMvcmVmY2FyZHMvZ251cy1s b2dvLnBkZiBiL2V0Yy9yZWZjYXJkcy9nbnVzLWxvZ28ucGRmCmRlbGV0ZWQgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAzNjI5YTYwNWU2Li4wMDAwMDAwMDAwCkJpbmFyeSBmaWxlcyBhL2V0Yy9yZWZj YXJkcy9nbnVzLWxvZ28ucGRmIGFuZCAvZGV2L251bGwgZGlmZmVyCmRpZmYgLS1naXQgYS9saXNw L2JpbmRpbmdzLmVsIGIvbGlzcC9iaW5kaW5ncy5lbAppbmRleCBmNjQxODY1YmEzLi5kYTkwMTY1 YWUxIDEwMDY0NAotLS0gYS9saXNwL2JpbmRpbmdzLmVsCisrKyBiL2xpc3AvYmluZGluZ3MuZWwK QEAgLTM2OCwxMiArMzY4LDE5IEBAIG1vZGUtbGluZS1wb3NpdGlvbgogbW91c2UtMTogRGlzcGxh eSBMaW5lIGFuZCBDb2x1bW4gTW9kZSBNZW51IikpKQogICAgIChsaW5lLW51bWJlci1tb2RlCiAg ICAgICgoY29sdW1uLW51bWJlci1tb2RlCi0gICAgICAgKDEwICwocHJvcGVydGl6ZQotCSAgICAg IiAoJWwsJWMpIgotCSAgICAgJ2xvY2FsLW1hcCBtb2RlLWxpbmUtY29sdW1uLWxpbmUtbnVtYmVy LW1vZGUtbWFwCi0JICAgICAnbW91c2UtZmFjZSAnbW9kZS1saW5lLWhpZ2hsaWdodAotCSAgICAg J2hlbHAtZWNobyAiTGluZSBudW1iZXIgYW5kIENvbHVtbiBudW1iZXJcblwKKyAgICAgICAoY29s dW1uLW51bWJlci1pbmRpY2F0b3ItemVyby1iYXNlZAorICAgICAgICAoMTAgLChwcm9wZXJ0aXpl CisgICAgICAgICAgICAgICIgKCVsLCVjKSIKKyAgICAgICAgICAgICAgJ2xvY2FsLW1hcCBtb2Rl LWxpbmUtY29sdW1uLWxpbmUtbnVtYmVyLW1vZGUtbWFwCisgICAgICAgICAgICAgICdtb3VzZS1m YWNlICdtb2RlLWxpbmUtaGlnaGxpZ2h0CisgICAgICAgICAgICAgICdoZWxwLWVjaG8gIkxpbmUg bnVtYmVyIGFuZCBDb2x1bW4gbnVtYmVyXG5cCiBtb3VzZS0xOiBEaXNwbGF5IExpbmUgYW5kIENv bHVtbiBNb2RlIE1lbnUiKSkKKyAgICAgICAgKDEwICwocHJvcGVydGl6ZQorICAgICAgICAgICAg ICAiICglbCwlQykiCisgICAgICAgICAgICAgICdsb2NhbC1tYXAgbW9kZS1saW5lLWNvbHVtbi1s aW5lLW51bWJlci1tb2RlLW1hcAorICAgICAgICAgICAgICAnbW91c2UtZmFjZSAnbW9kZS1saW5l LWhpZ2hsaWdodAorICAgICAgICAgICAgICAnaGVscC1lY2hvICJMaW5lIG51bWJlciBhbmQgQ29s dW1uIG51bWJlclxuXAorbW91c2UtMTogRGlzcGxheSBMaW5lIGFuZCBDb2x1bW4gTW9kZSBNZW51 IikpKQogICAgICAgICg2ICwocHJvcGVydGl6ZQogCSAgICAiIEwlbCIKIAkgICAgJ2xvY2FsLW1h cCBtb2RlLWxpbmUtY29sdW1uLWxpbmUtbnVtYmVyLW1vZGUtbWFwCkBAIC0zODEsMTIgKzM4OCwx OSBAQCBtb2RlLWxpbmUtcG9zaXRpb24KIAkgICAgJ2hlbHAtZWNobyAiTGluZSBOdW1iZXJcblwK IG1vdXNlLTE6IERpc3BsYXkgTGluZSBhbmQgQ29sdW1uIE1vZGUgTWVudSIpKSkpCiAgICAgICgo Y29sdW1uLW51bWJlci1tb2RlCi0gICAgICAgKDUgLChwcm9wZXJ0aXplCi0JICAgICIgQyVjIgot CSAgICAnbG9jYWwtbWFwIG1vZGUtbGluZS1jb2x1bW4tbGluZS1udW1iZXItbW9kZS1tYXAKLQkg ICAgJ21vdXNlLWZhY2UgJ21vZGUtbGluZS1oaWdobGlnaHQKLQkgICAgJ2hlbHAtZWNobyAiQ29s dW1uIG51bWJlclxuXAotbW91c2UtMTogRGlzcGxheSBMaW5lIGFuZCBDb2x1bW4gTW9kZSBNZW51 IikpKSkpKQorICAgICAgIChjb2x1bW4tbnVtYmVyLWluZGljYXRvci16ZXJvLWJhc2VkCisgICAg ICAgICg1ICwocHJvcGVydGl6ZQorICAgICAgICAgICAgICIgQyVjIgorICAgICAgICAgICAgICds b2NhbC1tYXAgbW9kZS1saW5lLWNvbHVtbi1saW5lLW51bWJlci1tb2RlLW1hcAorICAgICAgICAg ICAgICdtb3VzZS1mYWNlICdtb2RlLWxpbmUtaGlnaGxpZ2h0CisgICAgICAgICAgICAgJ2hlbHAt ZWNobyAiQ29sdW1uIG51bWJlclxuXAorbW91c2UtMTogRGlzcGxheSBMaW5lIGFuZCBDb2x1bW4g TW9kZSBNZW51IikpCisgICAgICAgICg1ICwocHJvcGVydGl6ZQorICAgICAgICAgICAgICIgQyVD IgorICAgICAgICAgICAgICdsb2NhbC1tYXAgbW9kZS1saW5lLWNvbHVtbi1saW5lLW51bWJlci1t b2RlLW1hcAorICAgICAgICAgICAgICdtb3VzZS1mYWNlICdtb2RlLWxpbmUtaGlnaGxpZ2h0Cisg ICAgICAgICAgICAgJ2hlbHAtZWNobyAiQ29sdW1uIG51bWJlclxuXAorbW91c2UtMTogRGlzcGxh eSBMaW5lIGFuZCBDb2x1bW4gTW9kZSBNZW51IikpKSkpKSkKICAgIk1vZGUgbGluZSBjb25zdHJ1 Y3QgZm9yIGRpc3BsYXlpbmcgdGhlIHBvc2l0aW9uIGluIHRoZSBidWZmZXIuCiBOb3JtYWxseSBk aXNwbGF5cyB0aGUgYnVmZmVyIHBlcmNlbnRhZ2UgYW5kLCBvcHRpb25hbGx5LCB0aGUKIGJ1ZmZl ciBzaXplLCB0aGUgbGluZSBudW1iZXIgYW5kIHRoZSBjb2x1bW4gbnVtYmVyLiIpCmRpZmYgLS1n aXQgYS9saXNwL3NpbXBsZS5lbCBiL2xpc3Avc2ltcGxlLmVsCmluZGV4IDVmNzBhZGVkYzQuLjBh OGRiZDE2OTYgMTAwNjQ0Ci0tLSBhL2xpc3Avc2ltcGxlLmVsCisrKyBiL2xpc3Avc2ltcGxlLmVs CkBAIC03MTk4LDYgKzcxOTgsMTMgQEAgY29sdW1uLW51bWJlci1tb2RlCiBJZiBjYWxsZWQgZnJv bSBMaXNwLCBlbmFibGUgdGhlIG1vZGUgaWYgQVJHIGlzIG9taXR0ZWQgb3IgbmlsLiIKICAgOmds b2JhbCB0IDpncm91cCAnbW9kZS1saW5lKQogCisoZGVmY3VzdG9tIGNvbHVtbi1udW1iZXItaW5k aWNhdG9yLXplcm8tYmFzZWQgdAorICAiV2hlbiBzZXQgdG8gdHJ1ZSwgQ29sdW1uIE51bWJlciBt b2RlIGRpc3BsYXlzIGNvbHVtbnMgc3RhcnRpbmcKK2Zyb20gemVybyBhdCB0aGUgbGVmdCBtYXJn aW4gb2YgdGhlIHdpbmRvdy4gT3RoZXJ3aXNlLCBkaXNwbGF5ZWQKK2NvbHVtbiBudW1iZXJzIHN0 YXJ0IGZyb20gb25lLiIKKyAgOnR5cGUgJ2Jvb2xlYW4KKyAgOmdyb3VwICdtb2RlLWxpbmUpCisK IChkZWZpbmUtbWlub3ItbW9kZSBzaXplLWluZGljYXRpb24tbW9kZQogICAiVG9nZ2xlIGJ1ZmZl ciBzaXplIGRpc3BsYXkgaW4gdGhlIG1vZGUgbGluZSAoU2l6ZSBJbmRpY2F0aW9uIG1vZGUpLgog V2l0aCBhIHByZWZpeCBhcmd1bWVudCBBUkcsIGVuYWJsZSBTaXplIEluZGljYXRpb24gbW9kZSBp ZiBBUkcgaXMKZGlmZiAtLWdpdCBhL3NyYy9idWZmZXIuYyBiL3NyYy9idWZmZXIuYwppbmRleCA4 ZWYyN2RlZTBmLi4yNjFjMGMxNWEzIDEwMDY0NAotLS0gYS9zcmMvYnVmZmVyLmMKKysrIGIvc3Jj L2J1ZmZlci5jCkBAIC01NjA4LDggKzU2MDgsMTEgQEAgQSBzdHJpbmcgaXMgcHJpbnRlZCB2ZXJi YXRpbSBpbiB0aGUgbW9kZSBsaW5lIGV4Y2VwdCBmb3IgJS1jb25zdHJ1Y3RzOgogCUZvciBhIG1v ZGlmaWVkIHJlYWQtb25seSBidWZmZXIsICUqIGdpdmVzICUgYW5kICUrIGdpdmVzICouCiAgICVz IC0tIHByaW50IHByb2Nlc3Mgc3RhdHVzLiAgICVsIC0tIHByaW50IHRoZSBjdXJyZW50IGxpbmUg bnVtYmVyLgogICAlYyAtLSBwcmludCB0aGUgY3VycmVudCBjb2x1bW4gbnVtYmVyICh0aGlzIG1h a2VzIGVkaXRpbmcgc2xvd2VyKS4KKyAgICAgICAgQ29sdW1ucyBhcmUgbnVtYmVyZWQgc3RhcnRp bmcgZnJvbSB0aGUgbGVmdCBtYXJnaW4sIGFuZCB0aGUKKyAgICAgICAgbGVmdG1vc3QgY29sdW1u IGlzIGRpc3BsYXllZCBhcyB6ZXJvLgogICAgICAgICBUbyBtYWtlIHRoZSBjb2x1bW4gbnVtYmVy IHVwZGF0ZSBjb3JyZWN0bHkgaW4gYWxsIGNhc2VzLAogCWBjb2x1bW4tbnVtYmVyLW1vZGUnIG11 c3QgYmUgbm9uLW5pbC4KKyAgJUMgLS0gTGlrZSAlYywgYnV0IHRoZSBsZWZ0bW9zdCBjb2x1bW4g aXMgZGlzcGxheWVkIGFzIG9uZS4KICAgJWkgLS0gcHJpbnQgdGhlIHNpemUgb2YgdGhlIGJ1ZmZl ci4KICAgJUkgLS0gbGlrZSAlaSwgYnV0IHVzZSBrLCBNLCBHLCBldGMuLCB0byBhYmJyZXZpYXRl LgogICAlcCAtLSBwcmludCBwZXJjZW50IG9mIGJ1ZmZlciBhYm92ZSB0b3Agb2Ygd2luZG93LCBv ciBUb3AsIEJvdCBvciBBbGwuCmRpZmYgLS1naXQgYS9zcmMveGRpc3AuYyBiL3NyYy94ZGlzcC5j CmluZGV4IGM2Zjg1NjY1MjMuLmNhYjAxZWM3MDEgMTAwNjQ0Ci0tLSBhL3NyYy94ZGlzcC5jCisr KyBiL3NyYy94ZGlzcC5jCkBAIC00NzUsNyArNDc1LDcgQEAgaW50IHdpbmRvd3Nfb3JfYnVmZmVy c19jaGFuZ2VkOwogICAgdXNlZCB0byB0cmFjayBkb3duIHRoZSBjYXVzZSBmb3IgdGhpcyBmdWxs LXJlZGlzcGxheSkuCiAKICAgIFNpbmNlIHRoZSBmcmFtZSB0aXRsZSB1c2VzIHRoZSBzYW1lICUt Y29uc3RydWN0cyBhcyB0aGUgbW9kZSBsaW5lCi0gICAoZXhjZXB0ICVjIGFuZCAlbCksIGlmIHRo aXMgdmFyaWFibGUgaXMgbm9uLXplcm8sIHdlIGFsc28gY29uc2lkZXIKKyAgIChleGNlcHQgJWMs ICVDLCBhbmQgJWwpLCBpZiB0aGlzIHZhcmlhYmxlIGlzIG5vbi16ZXJvLCB3ZSBhbHNvIGNvbnNp ZGVyCiAgICByZWRpc3BsYXlpbmcgdGhlIHRpdGxlIG9mIGVhY2ggZnJhbWUsIHNlZSB4X2NvbnNp ZGVyX2ZyYW1lX3RpdGxlLgogCiAgICBUaGUgYHJlZGlzcGxheScgYml0cyBhcmUgdGhlIHNhbWUg YXMgdGhvc2UgdXNlZCBmb3IKQEAgLTExNDYyLDcgKzExNDYyLDcgQEAgd2luZG93X2J1ZmZlcl9j aGFuZ2VkIChzdHJ1Y3Qgd2luZG93ICp3KQogICByZXR1cm4gKEJVRl9TQVZFX01PRElGRiAoYikg PCBCVUZfTU9ESUZGIChiKSkgIT0gdy0+bGFzdF9oYWRfc3RhcjsKIH0KIAotLyogVHJ1ZSBpZiBX IGhhcyAlYyBpbiBpdHMgbW9kZSBsaW5lIGFuZCBtb2RlIGxpbmUgc2hvdWxkIGJlIHVwZGF0ZWQu ICAqLworLyogVHJ1ZSBpZiBXIGhhcyAlYyBvciAlQyBpbiBpdHMgbW9kZSBsaW5lIGFuZCBtb2Rl IGxpbmUgc2hvdWxkIGJlIHVwZGF0ZWQuICAqLwogCiBzdGF0aWMgYm9vbAogbW9kZV9saW5lX3Vw ZGF0ZV9uZWVkZWQgKHN0cnVjdCB3aW5kb3cgKncpCkBAIC0yMzUyMCw3ICsyMzUyMCw4IEBAIGRl Y29kZV9tb2RlX3NwZWMgKHN0cnVjdCB3aW5kb3cgKncsIHJlZ2lzdGVyIGludCBjLCBpbnQgZmll bGRfd2lkdGgsCiAgICAgICBicmVhazsKIAogICAgIGNhc2UgJ2MnOgotICAgICAgLyogJWMgYW5k ICVsIGFyZSBpZ25vcmVkIGluIGBmcmFtZS10aXRsZS1mb3JtYXQnLgorICAgIGNhc2UgJ0MnOgor ICAgICAgLyogJWMsICVDLCBhbmQgJWwgYXJlIGlnbm9yZWQgaW4gYGZyYW1lLXRpdGxlLWZvcm1h dCcuCiAgICAgICAgICAoSW4gcmVkaXNwbGF5X2ludGVybmFsLCB0aGUgZnJhbWUgdGl0bGUgaXMg ZHJhd24gX2JlZm9yZV8gdGhlCiAgICAgICAgICB3aW5kb3dzIGFyZSB1cGRhdGVkLCBzbyB0aGUg c3R1ZmYgd2hpY2ggZGVwZW5kcyBvbiBhY3R1YWwKICAgICAgICAgIHdpbmRvdyBjb250ZW50cyAo c3VjaCBhcyAlbCkgbWF5IGZhaWwgdG8gcmVuZGVyIHByb3Blcmx5LCBvcgpAQCAtMjM1MzAsOCAr MjM1MzEsOSBAQCBkZWNvZGVfbW9kZV9zcGVjIChzdHJ1Y3Qgd2luZG93ICp3LCByZWdpc3RlciBp bnQgYywgaW50IGZpZWxkX3dpZHRoLAogICAgICAgZWxzZQogCXsKIAkgIHB0cmRpZmZfdCBjb2wg PSBjdXJyZW50X2NvbHVtbiAoKTsKKwkgIGludCBkaXNwX2NvbCA9IChjID09ICdDJykgPyBjb2wg KyAxIDogY29sOwogCSAgdy0+Y29sdW1uX251bWJlcl9kaXNwbGF5ZWQgPSBjb2w7Ci0JICBwaW50 MnN0ciAoZGVjb2RlX21vZGVfc3BlY19idWYsIHdpZHRoLCBjb2wpOworCSAgcGludDJzdHIgKGRl Y29kZV9tb2RlX3NwZWNfYnVmLCB3aWR0aCwgZGlzcF9jb2wpOwogCSAgcmV0dXJuIGRlY29kZV9t b2RlX3NwZWNfYnVmOwogCX0KIApAQCAtMjM1NzksNyArMjM1ODEsNyBAQCBkZWNvZGVfbW9kZV9z cGVjIChzdHJ1Y3Qgd2luZG93ICp3LCByZWdpc3RlciBpbnQgYywgaW50IGZpZWxkX3dpZHRoLAog CXB0cmRpZmZfdCB0b3BsaW5lLCBubGluZXMsIGhlaWdodDsKIAlwdHJkaWZmX3QganVuazsKIAot CS8qICVjIGFuZCAlbCBhcmUgaWdub3JlZCBpbiBgZnJhbWUtdGl0bGUtZm9ybWF0Jy4gICovCisJ LyogJWMsICVDLCBhbmQgJWwgYXJlIGlnbm9yZWQgaW4gYGZyYW1lLXRpdGxlLWZvcm1hdCcuICAq LwogCWlmIChtb2RlX2xpbmVfdGFyZ2V0ID09IE1PREVfTElORV9USVRMRSkKIAkgIHJldHVybiAi IjsKIApAQCAtMzE1MzAsNyArMzE1MzIsNyBAQCBUaGlzIHZhcmlhYmxlIGlzIG5vdCBndWFyYW50 ZWVkIHRvIGJlIGFjY3VyYXRlIGV4Y2VwdCB3aGlsZSBwcm9jZXNzaW5nCiBcKEFzc3VtaW5nIHRo ZSB3aW5kb3cgbWFuYWdlciBzdXBwb3J0cyB0aGlzIGZlYXR1cmUuKQogCiBUaGlzIHZhcmlhYmxl IGhhcyB0aGUgc2FtZSBzdHJ1Y3R1cmUgYXMgYG1vZGUtbGluZS1mb3JtYXQnLCBleGNlcHQgdGhh dAotdGhlICVjIGFuZCAlbCBjb25zdHJ1Y3RzIGFyZSBpZ25vcmVkLiAgSXQgaXMgdXNlZCBvbmx5 IG9uIGZyYW1lcyBmb3IKK3RoZSAlYywgJUMsIGFuZCAlbCBjb25zdHJ1Y3RzIGFyZSBpZ25vcmVk LiAgSXQgaXMgdXNlZCBvbmx5IG9uIGZyYW1lcyBmb3IKIHdoaWNoIG5vIGV4cGxpY2l0IG5hbWUg aGFzIGJlZW4gc2V0IChzZWUgYG1vZGlmeS1mcmFtZS1wYXJhbWV0ZXJzJykuICAqLyk7CiAKICAg REVGVkFSX0xJU1AgKCJpY29uLXRpdGxlLWZvcm1hdCIsIFZpY29uX3RpdGxlX2Zvcm1hdCwK --MP_/29=NTrrTd3d2lEGggC0r93e--