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 14:07:40 -0400 Message-ID: <20170417140740.3139f46f@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> <83inm3dsp8.fsf@gnu.org> <20170417112401.6038ac13@jabberwock.cb.piermont.com> <83bmrvdp4u.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/9XJqB/4oNA27Vz5TOKGF0N7" X-Trace: blaine.gmane.org 1492452480 3904 195.159.176.226 (17 Apr 2017 18:08:00 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 17 Apr 2017 18:08:00 +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 20:07:56 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 1d0B47-0000wE-Rj for ged-emacs-devel@m.gmane.org; Mon, 17 Apr 2017 20:07:56 +0200 Original-Received: from localhost ([::1]:38149 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0B4A-0006jE-Kb for ged-emacs-devel@m.gmane.org; Mon, 17 Apr 2017 14:07:58 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50744) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d0B41-0006j4-EM for emacs-devel@gnu.org; Mon, 17 Apr 2017 14:07:50 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d0B3x-0000Mq-8c for emacs-devel@gnu.org; Mon, 17 Apr 2017 14:07:49 -0400 Original-Received: from hacklheber.piermont.com ([166.84.7.14]:40230) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d0B3t-0000Ji-Fl; Mon, 17 Apr 2017 14:07:41 -0400 Original-Received: from snark.cb.piermont.com (localhost [127.0.0.1]) by hacklheber.piermont.com (Postfix) with ESMTP id BAFF7A85; Mon, 17 Apr 2017 14:07: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 90F902DE040; Mon, 17 Apr 2017 14:07:40 -0400 (EDT) In-Reply-To: <83bmrvdp4u.fsf@gnu.org> 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:214086 Archived-At: --MP_/9XJqB/4oNA27Vz5TOKGF0N7 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline On Mon, 17 Apr 2017 18:34:25 +0300 Eli Zaretskii wrote: > The entry should be preceded by "+++", to indicate that the manuals > were updated. I vaguely remember that convention but I couldn't find it documented so I wasn't quite sure what "preceded" meant. I've put +++ in a leading location (just after the *s) in the attached. I also moved the customization variable to bindings.el, adjacent to where it is used, as you suggested. I've left the variable name alone as neither of us has a better idea. Let me know if there are any more changes you would like here. I don't have direct commit access but I do have a copyright assignment at FSF so feel free to commit to master if you are happy with this. Perry -- Perry E. Metzger perry@piermont.com --MP_/9XJqB/4oNA27Vz5TOKGF0N7 Content-Type: application/octet-stream; name=NEWS.new Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=NEWS.new KiogKysrIE5ldyB2YXJpYWJsZSAnY29sdW1uLW51bWJlci1pbmRpY2F0b3ItemVyby1iYXNlZCcK VHJhZGl0aW9uYWxseSwgaW4gQ29sdW1uIE51bWJlciBtb2RlLCB0aGUgZGlzcGxheWVkIGNvbHVt biBudW1iZXIKY291bnRzIGZyb20gemVybyBzdGFydGluZyBhdCB0aGUgbGVmdCBtYXJnaW4gb2Yg dGhlIHdpbmRvdy4gIFRoaXMKYmVoYXZpb3IgaXMgbm93IGNvbnRyb2xsZWQgYnkgJ2NvbHVtbi1u dW1iZXItaW5kaWNhdG9yLXplcm8tYmFzZWQnLgpJZiB5b3Ugd291bGQgcHJlZmVyIGZvciB0aGUg ZGlzcGxheWVkIGNvbHVtbiBudW1iZXIgdG8gY291bnQgZnJvbSBvbmUsCnlvdSBtYXkgc2V0IHRo aXMgdmFyaWFibGUgdG8gbmlsLiAgKEJlaGluZCB0aGUgc2NlbmVzLCB0aGVyZSBpcyBub3cgYQpu ZXcgbW9kZSBsaW5lIGNvbnN0cnVjdCwgJyVDJywgd2hpY2ggb3BlcmF0ZXMgZXhhY3RseSBhcyAn JWMnIGRvZXMKZXhjZXB0IHRoYXQgaXQgY291bnRzIGZyb20gb25lLikK --MP_/9XJqB/4oNA27Vz5TOKGF0N7 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 L2JpbmRpbmdzLmVsIGIvbGlzcC9iaW5kaW5ncy5lbAppbmRleCBmNjQxODY1YmEzLi44ZjlkYjM1 MGQ5IDEwMDY0NAotLS0gYS9saXNwL2JpbmRpbmdzLmVsCisrKyBiL2xpc3AvYmluZGluZ3MuZWwK QEAgLTM1MCw2ICszNTAsMTQgQEAgbW9kZS1saW5lLWNvbHVtbi1saW5lLW51bWJlci1tb2RlLW1h cAogICAgIG1hcCkgIlwKIEtleW1hcCB0byBkaXNwbGF5IG9uIGNvbHVtbiBhbmQgbGluZSBudW1i ZXJzLiIpCiAKKyhkZWZjdXN0b20gY29sdW1uLW51bWJlci1pbmRpY2F0b3ItemVyby1iYXNlZCB0 CisgICJXaGVuIHNldCB0byB0cnVlLCBDb2x1bW4gTnVtYmVyIG1vZGUgZGlzcGxheXMgY29sdW1u cyBzdGFydGluZworZnJvbSB6ZXJvIGF0IHRoZSBsZWZ0IG1hcmdpbiBvZiB0aGUgd2luZG93LiBP dGhlcndpc2UsIGRpc3BsYXllZAorY29sdW1uIG51bWJlcnMgc3RhcnQgZnJvbSBvbmUuIgorICA6 dHlwZSAnYm9vbGVhbgorICA6Z3JvdXAgJ21vZGUtbGluZQorICA6dmVyc2lvbiAiMjYuMSIpCisK IChkZWZ2YXIgbW9kZS1saW5lLXBvc2l0aW9uCiAgIGAoKC0zICwocHJvcGVydGl6ZQogCSAgIiVw IgpAQCAtMzY4LDEyICszNzYsMTkgQEAgbW9kZS1saW5lLXBvc2l0aW9uCiBtb3VzZS0xOiBEaXNw bGF5IExpbmUgYW5kIENvbHVtbiBNb2RlIE1lbnUiKSkpCiAgICAgKGxpbmUtbnVtYmVyLW1vZGUK ICAgICAgKChjb2x1bW4tbnVtYmVyLW1vZGUKLSAgICAgICAoMTAgLChwcm9wZXJ0aXplCi0JICAg ICAiICglbCwlYykiCi0JICAgICAnbG9jYWwtbWFwIG1vZGUtbGluZS1jb2x1bW4tbGluZS1udW1i ZXItbW9kZS1tYXAKLQkgICAgICdtb3VzZS1mYWNlICdtb2RlLWxpbmUtaGlnaGxpZ2h0Ci0JICAg ICAnaGVscC1lY2hvICJMaW5lIG51bWJlciBhbmQgQ29sdW1uIG51bWJlclxuXAorICAgICAgIChj b2x1bW4tbnVtYmVyLWluZGljYXRvci16ZXJvLWJhc2VkCisgICAgICAgICgxMCAsKHByb3BlcnRp emUKKyAgICAgICAgICAgICAgIiAoJWwsJWMpIgorICAgICAgICAgICAgICAnbG9jYWwtbWFwIG1v ZGUtbGluZS1jb2x1bW4tbGluZS1udW1iZXItbW9kZS1tYXAKKyAgICAgICAgICAgICAgJ21vdXNl LWZhY2UgJ21vZGUtbGluZS1oaWdobGlnaHQKKyAgICAgICAgICAgICAgJ2hlbHAtZWNobyAiTGlu ZSBudW1iZXIgYW5kIENvbHVtbiBudW1iZXJcblwKIG1vdXNlLTE6IERpc3BsYXkgTGluZSBhbmQg Q29sdW1uIE1vZGUgTWVudSIpKQorICAgICAgICAoMTAgLChwcm9wZXJ0aXplCisgICAgICAgICAg ICAgICIgKCVsLCVDKSIKKyAgICAgICAgICAgICAgJ2xvY2FsLW1hcCBtb2RlLWxpbmUtY29sdW1u LWxpbmUtbnVtYmVyLW1vZGUtbWFwCisgICAgICAgICAgICAgICdtb3VzZS1mYWNlICdtb2RlLWxp bmUtaGlnaGxpZ2h0CisgICAgICAgICAgICAgICdoZWxwLWVjaG8gIkxpbmUgbnVtYmVyIGFuZCBD b2x1bW4gbnVtYmVyXG5cCittb3VzZS0xOiBEaXNwbGF5IExpbmUgYW5kIENvbHVtbiBNb2RlIE1l bnUiKSkpCiAgICAgICAgKDYgLChwcm9wZXJ0aXplCiAJICAgICIgTCVsIgogCSAgICAnbG9jYWwt bWFwIG1vZGUtbGluZS1jb2x1bW4tbGluZS1udW1iZXItbW9kZS1tYXAKQEAgLTM4MSwxMiArMzk2 LDE5IEBAIG1vZGUtbGluZS1wb3NpdGlvbgogCSAgICAnaGVscC1lY2hvICJMaW5lIE51bWJlclxu XAogbW91c2UtMTogRGlzcGxheSBMaW5lIGFuZCBDb2x1bW4gTW9kZSBNZW51IikpKSkKICAgICAg KChjb2x1bW4tbnVtYmVyLW1vZGUKLSAgICAgICAoNSAsKHByb3BlcnRpemUKLQkgICAgIiBDJWMi Ci0JICAgICdsb2NhbC1tYXAgbW9kZS1saW5lLWNvbHVtbi1saW5lLW51bWJlci1tb2RlLW1hcAot CSAgICAnbW91c2UtZmFjZSAnbW9kZS1saW5lLWhpZ2hsaWdodAotCSAgICAnaGVscC1lY2hvICJD b2x1bW4gbnVtYmVyXG5cCi1tb3VzZS0xOiBEaXNwbGF5IExpbmUgYW5kIENvbHVtbiBNb2RlIE1l bnUiKSkpKSkpCisgICAgICAgKGNvbHVtbi1udW1iZXItaW5kaWNhdG9yLXplcm8tYmFzZWQKKyAg ICAgICAgKDUgLChwcm9wZXJ0aXplCisgICAgICAgICAgICAgIiBDJWMiCisgICAgICAgICAgICAg J2xvY2FsLW1hcCBtb2RlLWxpbmUtY29sdW1uLWxpbmUtbnVtYmVyLW1vZGUtbWFwCisgICAgICAg ICAgICAgJ21vdXNlLWZhY2UgJ21vZGUtbGluZS1oaWdobGlnaHQKKyAgICAgICAgICAgICAnaGVs cC1lY2hvICJDb2x1bW4gbnVtYmVyXG5cCittb3VzZS0xOiBEaXNwbGF5IExpbmUgYW5kIENvbHVt biBNb2RlIE1lbnUiKSkKKyAgICAgICAgKDUgLChwcm9wZXJ0aXplCisgICAgICAgICAgICAgIiBD JUMiCisgICAgICAgICAgICAgJ2xvY2FsLW1hcCBtb2RlLWxpbmUtY29sdW1uLWxpbmUtbnVtYmVy LW1vZGUtbWFwCisgICAgICAgICAgICAgJ21vdXNlLWZhY2UgJ21vZGUtbGluZS1oaWdobGlnaHQK KyAgICAgICAgICAgICAnaGVscC1lY2hvICJDb2x1bW4gbnVtYmVyXG5cCittb3VzZS0xOiBEaXNw bGF5IExpbmUgYW5kIENvbHVtbiBNb2RlIE1lbnUiKSkpKSkpKQogICAiTW9kZSBsaW5lIGNvbnN0 cnVjdCBmb3IgZGlzcGxheWluZyB0aGUgcG9zaXRpb24gaW4gdGhlIGJ1ZmZlci4KIE5vcm1hbGx5 IGRpc3BsYXlzIHRoZSBidWZmZXIgcGVyY2VudGFnZSBhbmQsIG9wdGlvbmFsbHksIHRoZQogYnVm ZmVyIHNpemUsIHRoZSBsaW5lIG51bWJlciBhbmQgdGhlIGNvbHVtbiBudW1iZXIuIikKZGlmZiAt LWdpdCBhL3NyYy9idWZmZXIuYyBiL3NyYy9idWZmZXIuYwppbmRleCA4ZWYyN2RlZTBmLi4yNjFj MGMxNWEzIDEwMDY0NAotLS0gYS9zcmMvYnVmZmVyLmMKKysrIGIvc3JjL2J1ZmZlci5jCkBAIC01 NjA4LDggKzU2MDgsMTEgQEAgQSBzdHJpbmcgaXMgcHJpbnRlZCB2ZXJiYXRpbSBpbiB0aGUgbW9k ZSBsaW5lIGV4Y2VwdCBmb3IgJS1jb25zdHJ1Y3RzOgogCUZvciBhIG1vZGlmaWVkIHJlYWQtb25s eSBidWZmZXIsICUqIGdpdmVzICUgYW5kICUrIGdpdmVzICouCiAgICVzIC0tIHByaW50IHByb2Nl c3Mgc3RhdHVzLiAgICVsIC0tIHByaW50IHRoZSBjdXJyZW50IGxpbmUgbnVtYmVyLgogICAlYyAt LSBwcmludCB0aGUgY3VycmVudCBjb2x1bW4gbnVtYmVyICh0aGlzIG1ha2VzIGVkaXRpbmcgc2xv d2VyKS4KKyAgICAgICAgQ29sdW1ucyBhcmUgbnVtYmVyZWQgc3RhcnRpbmcgZnJvbSB0aGUgbGVm dCBtYXJnaW4sIGFuZCB0aGUKKyAgICAgICAgbGVmdG1vc3QgY29sdW1uIGlzIGRpc3BsYXllZCBh cyB6ZXJvLgogICAgICAgICBUbyBtYWtlIHRoZSBjb2x1bW4gbnVtYmVyIHVwZGF0ZSBjb3JyZWN0 bHkgaW4gYWxsIGNhc2VzLAogCWBjb2x1bW4tbnVtYmVyLW1vZGUnIG11c3QgYmUgbm9uLW5pbC4K KyAgJUMgLS0gTGlrZSAlYywgYnV0IHRoZSBsZWZ0bW9zdCBjb2x1bW4gaXMgZGlzcGxheWVkIGFz IG9uZS4KICAgJWkgLS0gcHJpbnQgdGhlIHNpemUgb2YgdGhlIGJ1ZmZlci4KICAgJUkgLS0gbGlr ZSAlaSwgYnV0IHVzZSBrLCBNLCBHLCBldGMuLCB0byBhYmJyZXZpYXRlLgogICAlcCAtLSBwcmlu dCBwZXJjZW50IG9mIGJ1ZmZlciBhYm92ZSB0b3Agb2Ygd2luZG93LCBvciBUb3AsIEJvdCBvciBB bGwuCmRpZmYgLS1naXQgYS9zcmMveGRpc3AuYyBiL3NyYy94ZGlzcC5jCmluZGV4IGM2Zjg1NjY1 MjMuLmNhYjAxZWM3MDEgMTAwNjQ0Ci0tLSBhL3NyYy94ZGlzcC5jCisrKyBiL3NyYy94ZGlzcC5j CkBAIC00NzUsNyArNDc1LDcgQEAgaW50IHdpbmRvd3Nfb3JfYnVmZmVyc19jaGFuZ2VkOwogICAg dXNlZCB0byB0cmFjayBkb3duIHRoZSBjYXVzZSBmb3IgdGhpcyBmdWxsLXJlZGlzcGxheSkuCiAK ICAgIFNpbmNlIHRoZSBmcmFtZSB0aXRsZSB1c2VzIHRoZSBzYW1lICUtY29uc3RydWN0cyBhcyB0 aGUgbW9kZSBsaW5lCi0gICAoZXhjZXB0ICVjIGFuZCAlbCksIGlmIHRoaXMgdmFyaWFibGUgaXMg bm9uLXplcm8sIHdlIGFsc28gY29uc2lkZXIKKyAgIChleGNlcHQgJWMsICVDLCBhbmQgJWwpLCBp ZiB0aGlzIHZhcmlhYmxlIGlzIG5vbi16ZXJvLCB3ZSBhbHNvIGNvbnNpZGVyCiAgICByZWRpc3Bs YXlpbmcgdGhlIHRpdGxlIG9mIGVhY2ggZnJhbWUsIHNlZSB4X2NvbnNpZGVyX2ZyYW1lX3RpdGxl LgogCiAgICBUaGUgYHJlZGlzcGxheScgYml0cyBhcmUgdGhlIHNhbWUgYXMgdGhvc2UgdXNlZCBm b3IKQEAgLTExNDYyLDcgKzExNDYyLDcgQEAgd2luZG93X2J1ZmZlcl9jaGFuZ2VkIChzdHJ1Y3Qg d2luZG93ICp3KQogICByZXR1cm4gKEJVRl9TQVZFX01PRElGRiAoYikgPCBCVUZfTU9ESUZGIChi KSkgIT0gdy0+bGFzdF9oYWRfc3RhcjsKIH0KIAotLyogVHJ1ZSBpZiBXIGhhcyAlYyBpbiBpdHMg bW9kZSBsaW5lIGFuZCBtb2RlIGxpbmUgc2hvdWxkIGJlIHVwZGF0ZWQuICAqLworLyogVHJ1ZSBp ZiBXIGhhcyAlYyBvciAlQyBpbiBpdHMgbW9kZSBsaW5lIGFuZCBtb2RlIGxpbmUgc2hvdWxkIGJl IHVwZGF0ZWQuICAqLwogCiBzdGF0aWMgYm9vbAogbW9kZV9saW5lX3VwZGF0ZV9uZWVkZWQgKHN0 cnVjdCB3aW5kb3cgKncpCkBAIC0yMzUyMCw3ICsyMzUyMCw4IEBAIGRlY29kZV9tb2RlX3NwZWMg KHN0cnVjdCB3aW5kb3cgKncsIHJlZ2lzdGVyIGludCBjLCBpbnQgZmllbGRfd2lkdGgsCiAgICAg ICBicmVhazsKIAogICAgIGNhc2UgJ2MnOgotICAgICAgLyogJWMgYW5kICVsIGFyZSBpZ25vcmVk IGluIGBmcmFtZS10aXRsZS1mb3JtYXQnLgorICAgIGNhc2UgJ0MnOgorICAgICAgLyogJWMsICVD LCBhbmQgJWwgYXJlIGlnbm9yZWQgaW4gYGZyYW1lLXRpdGxlLWZvcm1hdCcuCiAgICAgICAgICAo SW4gcmVkaXNwbGF5X2ludGVybmFsLCB0aGUgZnJhbWUgdGl0bGUgaXMgZHJhd24gX2JlZm9yZV8g dGhlCiAgICAgICAgICB3aW5kb3dzIGFyZSB1cGRhdGVkLCBzbyB0aGUgc3R1ZmYgd2hpY2ggZGVw ZW5kcyBvbiBhY3R1YWwKICAgICAgICAgIHdpbmRvdyBjb250ZW50cyAoc3VjaCBhcyAlbCkgbWF5 IGZhaWwgdG8gcmVuZGVyIHByb3Blcmx5LCBvcgpAQCAtMjM1MzAsOCArMjM1MzEsOSBAQCBkZWNv ZGVfbW9kZV9zcGVjIChzdHJ1Y3Qgd2luZG93ICp3LCByZWdpc3RlciBpbnQgYywgaW50IGZpZWxk X3dpZHRoLAogICAgICAgZWxzZQogCXsKIAkgIHB0cmRpZmZfdCBjb2wgPSBjdXJyZW50X2NvbHVt biAoKTsKKwkgIGludCBkaXNwX2NvbCA9IChjID09ICdDJykgPyBjb2wgKyAxIDogY29sOwogCSAg dy0+Y29sdW1uX251bWJlcl9kaXNwbGF5ZWQgPSBjb2w7Ci0JICBwaW50MnN0ciAoZGVjb2RlX21v ZGVfc3BlY19idWYsIHdpZHRoLCBjb2wpOworCSAgcGludDJzdHIgKGRlY29kZV9tb2RlX3NwZWNf YnVmLCB3aWR0aCwgZGlzcF9jb2wpOwogCSAgcmV0dXJuIGRlY29kZV9tb2RlX3NwZWNfYnVmOwog CX0KIApAQCAtMjM1NzksNyArMjM1ODEsNyBAQCBkZWNvZGVfbW9kZV9zcGVjIChzdHJ1Y3Qgd2lu ZG93ICp3LCByZWdpc3RlciBpbnQgYywgaW50IGZpZWxkX3dpZHRoLAogCXB0cmRpZmZfdCB0b3Bs aW5lLCBubGluZXMsIGhlaWdodDsKIAlwdHJkaWZmX3QganVuazsKIAotCS8qICVjIGFuZCAlbCBh cmUgaWdub3JlZCBpbiBgZnJhbWUtdGl0bGUtZm9ybWF0Jy4gICovCisJLyogJWMsICVDLCBhbmQg JWwgYXJlIGlnbm9yZWQgaW4gYGZyYW1lLXRpdGxlLWZvcm1hdCcuICAqLwogCWlmIChtb2RlX2xp bmVfdGFyZ2V0ID09IE1PREVfTElORV9USVRMRSkKIAkgIHJldHVybiAiIjsKIApAQCAtMzE1MzAs NyArMzE1MzIsNyBAQCBUaGlzIHZhcmlhYmxlIGlzIG5vdCBndWFyYW50ZWVkIHRvIGJlIGFjY3Vy YXRlIGV4Y2VwdCB3aGlsZSBwcm9jZXNzaW5nCiBcKEFzc3VtaW5nIHRoZSB3aW5kb3cgbWFuYWdl ciBzdXBwb3J0cyB0aGlzIGZlYXR1cmUuKQogCiBUaGlzIHZhcmlhYmxlIGhhcyB0aGUgc2FtZSBz dHJ1Y3R1cmUgYXMgYG1vZGUtbGluZS1mb3JtYXQnLCBleGNlcHQgdGhhdAotdGhlICVjIGFuZCAl bCBjb25zdHJ1Y3RzIGFyZSBpZ25vcmVkLiAgSXQgaXMgdXNlZCBvbmx5IG9uIGZyYW1lcyBmb3IK K3RoZSAlYywgJUMsIGFuZCAlbCBjb25zdHJ1Y3RzIGFyZSBpZ25vcmVkLiAgSXQgaXMgdXNlZCBv bmx5IG9uIGZyYW1lcyBmb3IKIHdoaWNoIG5vIGV4cGxpY2l0IG5hbWUgaGFzIGJlZW4gc2V0IChz ZWUgYG1vZGlmeS1mcmFtZS1wYXJhbWV0ZXJzJykuICAqLyk7CiAKICAgREVGVkFSX0xJU1AgKCJp Y29uLXRpdGxlLWZvcm1hdCIsIFZpY29uX3RpdGxlX2Zvcm1hdCwK --MP_/9XJqB/4oNA27Vz5TOKGF0N7--