From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Roland Winkler Newsgroups: gmane.emacs.devel Subject: Re: bibtex.el bug? Date: Sat, 1 May 2004 13:02:54 +0200 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: <16531.33758.627497.132252@tfkp07.physik.uni-erlangen.de> References: NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="SwpkivQnVc" Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1083409600 14186 80.91.224.253 (1 May 2004 11:06:40 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sat, 1 May 2004 11:06:40 +0000 (UTC) Cc: rms@gnu.org Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Sat May 01 13:06:31 2004 Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1BJsKF-0005YQ-00 for ; Sat, 01 May 2004 13:06:31 +0200 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian)) id 1BJsKE-0000xE-00 for ; Sat, 01 May 2004 13:06:30 +0200 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.30) id 1BJsJr-0003Yl-Gh for emacs-devel@quimby.gnus.org; Sat, 01 May 2004 07:06:07 -0400 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30) id 1BJsHU-0003Nc-M0 for emacs-devel@gnu.org; Sat, 01 May 2004 07:03:40 -0400 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30) id 1BJsGv-0003Hl-Q8 for emacs-devel@gnu.org; Sat, 01 May 2004 07:03:38 -0400 Original-Received: from [131.188.3.181] (helo=max71.rrze.uni-erlangen.de) by monty-python.gnu.org with esmtp (Exim 4.30) id 1BJsGu-0003GS-1L; Sat, 01 May 2004 07:03:04 -0400 Original-Received: from tfkp07.physik.uni-erlangen.de (tfkp07.physik.uni-erlangen.de [131.188.164.207]) by max71.rrze.uni-erlangen.de with ESMTP; Sat, 1 May 2004 13:03:00 +0200 Original-To: emacs-devel@gnu.org In-Reply-To: X-Mailer: VM 7.17 under Emacs 21.3.50.4 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.4 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:22492 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:22492 --SwpkivQnVc Content-Type: text/plain; charset=us-ascii Content-Description: message body text Content-Transfer-Encoding: 7bit On Tue Apr 13 2004 Richard Stallman wrote: > Would you please DTRT, then ack this message? Could someone please install the two patches below in the emacs cvs tree? The first patch is an extended fix for a bug in bibtex.el reported recently by John Owens . Thank you very much. Roland 2004-04-24 Roland Winkler * textmodes/bibtex.el (bibtex-sort-buffer): Remove error message. Fix docstring. (bibtex-clean-entry): Disentangle code. (bibtex-realign): New function. (bibtex-reformat): Use mapcar and bibtex-realign. Do not use bibtex-beginning-of-first-entry and bibtex-skip-to-valid-entry. Remove undocumented optional arg called-by-convert-alien. (bibtex-convert-alien): Use bibtex-realign. Use bibtex-reformat for sorting instead of bibtex-sort-buffer. --SwpkivQnVc Content-Type: application/octet-stream Content-Disposition: attachment; filename="dif3" Content-Transfer-Encoding: base64 LS0tIGJpYnRleC5lbAkyMDAzLTEwLTIzIDE1OjI4OjI5ICswMjAwCTEuMjgKKysrIGJpYnRleC5l bAkyMDA0LTA0LTI0IDE4OjMxOjE3ICswMjAwICAgICAgIDEuMjkKQEAgLTMwMTcsMTIgKzMwMTcs MTAgQEAKIChkZWZ1biBiaWJ0ZXgtc29ydC1idWZmZXIgKCkKICAgIlNvcnQgQmliVGVYIGJ1ZmZl ciBhbHBoYWJldGljYWxseSBieSBrZXkuCiBUaGUgcHJlZGljYXRlIGZvciBzb3J0aW5nIGlzIGRl ZmluZWQgdmlhIGBiaWJ0ZXgtbWFpbnRhaW4tc29ydGVkLWVudHJpZXMnLgotVGV4dCBvdXRzaWRl IG9mIEJpYlRlWCBlbnRyaWVzIGlzIG5vdCBhZmZlY3RlZC4gIElmCi1gYmlidGV4LXNvcnQtaWdu b3JlLXN0cmluZy1lbnRyaWVzJyBpcyBub24tbmlsLCBAU3RyaW5nIGVudHJpZXMgd2lsbCBiZQot aWdub3JlZC4iCitJZiBpdHMgdmFsdWUgaXMgbmlsIHVzZSBwbGFpbiBzb3J0aW5nLiBUZXh0IG91 dHNpZGUgb2YgQmliVGVYIGVudHJpZXMgaXMgbm90CithZmZlY3RlZC4gSWYgYGJpYnRleC1zb3J0 LWlnbm9yZS1zdHJpbmctZW50cmllcycgaXMgbm9uLW5pbCwgQFN0cmluZyBlbnRyaWVzCit3aWxs IGJlIGlnbm9yZWQuIgogICAoaW50ZXJhY3RpdmUpCi0gICh1bmxlc3MgYmlidGV4LW1haW50YWlu LXNvcnRlZC1lbnRyaWVzCi0gICAgKGVycm9yICJZb3UgbXVzdCBjaG9vc2UgYSBzb3J0aW5nIHNj aGVtZSIpKQogICAoc2F2ZS1yZXN0cmljdGlvbgogICAgIChuYXJyb3ctdG8tcmVnaW9uIChiaWJ0 ZXgtYmVnaW5uaW5nLW9mLWZpcnN0LWVudHJ5KQogICAgICAgICAgICAgICAgICAgICAgIChzYXZl LWV4Y3Vyc2lvbiAoZ290by1jaGFyIChwb2ludC1tYXgpKQpAQCAtMzUyMywyNyArMzUyMSwzMCBA QAogICAgICAgICAgICAgICAgICAgICAgICAgIChtYXRjaC1lbmQgYmlidGV4LWtleS1pbi1oZWFk KSkpCiAgICAgICAoaW5zZXJ0IGtleSkpCiAgICAgOzsgc29ydGluZwotICAgIChsZXQqICgoc3Rh cnQgKGJpYnRleC1iZWdpbm5pbmctb2YtZW50cnkpKQotICAgICAgICAgICAoZW5kIChwcm9nbiAo YmlidGV4LWVuZC1vZi1lbnRyeSkKLSAgICAgICAgICAgICAgICAgICAgICAgKGlmIChyZS1zZWFy Y2gtZm9yd2FyZAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJpYnRleC1lbnRyeS1tYXli ZS1lbXB0eS1oZWFkIG5pbCAnbW92ZSkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgIChnb3Rv LWNoYXIgKG1hdGNoLWJlZ2lubmluZyAwKSkpCi0gICAgICAgICAgICAgICAgICAgICAgIChwb2lu dCkpKQotICAgICAgICAgICAoZW50cnkgKGJ1ZmZlci1zdWJzdHJpbmcgc3RhcnQgZW5kKSkKLSAg ICAgICAgICAgKGluZGV4IChwcm9nbiAoZ290by1jaGFyIHN0YXJ0KQotICAgICAgICAgICAgICAg ICAgICAgICAgIChiaWJ0ZXgtZW50cnktaW5kZXgpKSkpCi0gICAgICAoZGVsZXRlLXJlZ2lvbiBz dGFydCBlbmQpCi0gICAgICAodW5sZXNzIChwcm9nMSAob3IgY2FsbGVkLWJ5LXJlZm9ybWF0Ci0g ICAgICAgICAgICAgICAgICAgICAgICAgKGlmIChhbmQgYmlidGV4LW1haW50YWluLXNvcnRlZC1l bnRyaWVzCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKG5vdCAoYW5kIGJpYnRl eC1zb3J0LWlnbm9yZS1zdHJpbmctZW50cmllcwotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAoZXF1YWwgZW50cnktdHlwZSAic3RyaW5nIikpKSkKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgKGJpYnRleC1wcmVwYXJlLW5ldy1lbnRyeSBpbmRleCkKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgIChub3QgKGJpYnRleC1maW5kLWVudHJ5IChjYXIgaW5k ZXgpKSkpKQotICAgICAgICAgICAgICAgIChpbnNlcnQgZW50cnkpCi0gICAgICAgICAgICAgICAg KGZvcndhcmQtY2hhciAtMSkKLSAgICAgICAgICAgICAgICAoYmlidGV4LWJlZ2lubmluZy1vZi1l bnRyeSkgOyBtb3ZlcyBiYWNrd2FyZAotICAgICAgICAgICAgICAgIChyZS1zZWFyY2gtZm9yd2Fy ZCBiaWJ0ZXgtZW50cnktaGVhZCkpCi0gICAgICAgIChlcnJvciAiTmV3IGluc2VydGVkIGVudHJ5 IHlpZWxkcyBkdXBsaWNhdGUga2V5IikpKQorICAgICh1bmxlc3MgY2FsbGVkLWJ5LXJlZm9ybWF0 CisgICAgICAobGV0KiAoKHN0YXJ0IChiaWJ0ZXgtYmVnaW5uaW5nLW9mLWVudHJ5KSkKKyAgICAg ICAgICAgICAoZW5kIChwcm9nbiAoYmlidGV4LWVuZC1vZi1lbnRyeSkKKyAgICAgICAgICAgICAg ICAgICAgICAgICAoaWYgKHJlLXNlYXJjaC1mb3J3YXJkCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBiaWJ0ZXgtZW50cnktbWF5YmUtZW1wdHktaGVhZCBuaWwgJ21vdmUpCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIChnb3RvLWNoYXIgKG1hdGNoLWJlZ2lubmluZyAwKSkpCisg ICAgICAgICAgICAgICAgICAgICAgICAgKHBvaW50KSkpCisgICAgICAgICAgICAgKGVudHJ5IChi dWZmZXItc3Vic3RyaW5nIHN0YXJ0IGVuZCkpCisgICAgICAgICAgICAgKGluZGV4IChwcm9nbiAo Z290by1jaGFyIHN0YXJ0KQorICAgICAgICAgICAgICAgICAgICAgICAgICAgKGJpYnRleC1lbnRy eS1pbmRleCkpKQorICAgICAgICAgICAgIG5vLWVycm9yKQorICAgICAgICAoaWYgKGFuZCBiaWJ0 ZXgtbWFpbnRhaW4tc29ydGVkLWVudHJpZXMKKyAgICAgICAgICAgICAgICAgKG5vdCAoYW5kIGJp YnRleC1zb3J0LWlnbm9yZS1zdHJpbmctZW50cmllcworICAgICAgICAgICAgICAgICAgICAgICAg ICAgKGVxdWFsIGVudHJ5LXR5cGUgInN0cmluZyIpKSkpCisgICAgICAgICAgICAocHJvZ24KKyAg ICAgICAgICAgICAgKGRlbGV0ZS1yZWdpb24gc3RhcnQgZW5kKQorICAgICAgICAgICAgICAoc2V0 cSBuby1lcnJvciAoYmlidGV4LXByZXBhcmUtbmV3LWVudHJ5IGluZGV4KSkKKyAgICAgICAgICAg ICAgKGluc2VydCBlbnRyeSkKKyAgICAgICAgICAgICAgKGZvcndhcmQtY2hhciAtMSkKKyAgICAg ICAgICAgICAgKGJpYnRleC1iZWdpbm5pbmctb2YtZW50cnkpIDsgbW92ZXMgYmFja3dhcmQKKyAg ICAgICAgICAgICAgKHJlLXNlYXJjaC1mb3J3YXJkIGJpYnRleC1lbnRyeS1oZWFkKSkKKyAgICAg ICAgICAoc2V0cSBuby1lcnJvciAoYmlidGV4LWZpbmQtZW50cnkgKGNhciBpbmRleCkpKSkKKyAg ICAgICAgKHVubGVzcyBuby1lcnJvcgorICAgICAgICAgIChlcnJvciAiTmV3IGluc2VydGVkIGVu dHJ5IHlpZWxkcyBkdXBsaWNhdGUga2V5IikpKSkKICAgICA7OyBmaW5hbCBjbGVhbiB1cAogICAg ICh1bmxlc3MgY2FsbGVkLWJ5LXJlZm9ybWF0CiAgICAgICAoc2F2ZS1leGN1cnNpb24KQEAgLTM2 MjEsOTEgKzM2MjIsODkgQEAKICAgICAoaW5kZW50LXRvLWNvbHVtbiBiaWJ0ZXgtZW50cnktb2Zm c2V0KQogICAgIChnb3RvLWNoYXIgcG50KSkpCiAKLShkZWZ1biBiaWJ0ZXgtcmVmb3JtYXQgKCZv cHRpb25hbCBhZGRpdGlvbmFsLW9wdGlvbnMgY2FsbGVkLWJ5LWNvbnZlcnQtYWxpZW4pCisoZGVm dW4gYmlidGV4LXJlYWxpZ24gKCkKKyAgIlJlYWxpZ24gQmliVGVYIGVudHJpZXMgc3VjaCB0aGF0 IHRoZXkgYXJlIHNlcGFyYXRlZCBieSBvbmUgYmxhbmsgbGluZS4iCisgIChnb3RvLWNoYXIgKHBv aW50LW1pbikpCisgIChsZXQgKChjYXNlLWZvbGQtc2VhcmNoIHQpKQorICAgICh3aGVuIChsb29r aW5nLWF0IGJpYnRleC12YWxpZC1lbnRyeS13aGl0ZXNwYWNlLXJlKQorICAgICAgKHJlcGxhY2Ut bWF0Y2ggIlxcMSIpKQorICAgICh3aGlsZSAocmUtc2VhcmNoLWZvcndhcmQgYmlidGV4LXZhbGlk LWVudHJ5LXdoaXRlc3BhY2UtcmUgbmlsIHQpCisgICAgICAocmVwbGFjZS1tYXRjaCAiXG5cblxc MSIpKSkpCisKKyhkZWZ1biBiaWJ0ZXgtcmVmb3JtYXQgKCZvcHRpb25hbCByZWFkLW9wdGlvbnMp CiAgICJSZWZvcm1hdCBhbGwgQmliVGVYIGVudHJpZXMgaW4gYnVmZmVyIG9yIHJlZ2lvbi4KIFdp dGggcHJlZml4IGFyZ3VtZW50LCByZWFkIG9wdGlvbnMgZm9yIHJlZm9ybWF0dGluZyBmcm9tIG1p bmlidWZmZXIuCiBXaXRoIFxcW3VuaXZlcnNhbC1hcmd1bWVudF0gXFxbdW5pdmVyc2FsLWFyZ3Vt ZW50XSBwcmVmaXggYXJndW1lbnQsIHJldXNlIHByZXZpb3VzIGFuc3dlcnMgKGlmIGFueSkgYWdh aW4uCi1JZiBtYXJrIGlzIGFjdGl2ZSBpdCByZWZvcm1hdHMgZW50cmllcyBpbiByZWdpb24sIGlm IG5vdCBpbiB3aG9sZSBidWZmZXIuIgorSWYgbWFyayBpcyBhY3RpdmUgcmVmb3JtYXQgZW50cmll cyBpbiByZWdpb24sIGlmIG5vdCBpbiB3aG9sZSBidWZmZXIuIgogICAoaW50ZXJhY3RpdmUgIipQ IikKICAgKGxldCogKChwbnQgKHBvaW50KSkKICAgICAgICAgICh1c2UtcHJldmlvdXMtb3B0aW9u cwotICAgICAgICAgIChhbmQgKGVxdWFsIChwcmVmaXgtbnVtZXJpYy12YWx1ZSBhZGRpdGlvbmFs LW9wdGlvbnMpIDE2KQorICAgICAgICAgIChhbmQgKGVxdWFsIChwcmVmaXgtbnVtZXJpYy12YWx1 ZSByZWFkLW9wdGlvbnMpIDE2KQogICAgICAgICAgICAgICAgKG9yIGJpYnRleC1yZWZvcm1hdC1w cmV2aW91cy1vcHRpb25zCiAgICAgICAgICAgICAgICAgICAgYmlidGV4LXJlZm9ybWF0LXByZXZp b3VzLXJlZmVyZW5jZS1rZXlzKSkpCiAgICAgICAgICAoYmlidGV4LWVudHJ5LWZvcm1hdAotICAg ICAgICAgIChpZiBhZGRpdGlvbmFsLW9wdGlvbnMKKyAgICAgICAgICAoaWYgcmVhZC1vcHRpb25z CiAgICAgICAgICAgICAgIChpZiB1c2UtcHJldmlvdXMtb3B0aW9ucwogICAgICAgICAgICAgICAg ICAgYmlidGV4LXJlZm9ybWF0LXByZXZpb3VzLW9wdGlvbnMKICAgICAgICAgICAgICAgICAoc2V0 cSBiaWJ0ZXgtcmVmb3JtYXQtcHJldmlvdXMtb3B0aW9ucwotICAgICAgICAgICAgICAgICAgICAg IChkZWxxIG5pbCAobGlzdAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGlmIChv ciBjYWxsZWQtYnktY29udmVydC1hbGllbgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAoeS1vci1uLXAgIlJlYWxpZ24gZW50cmllcyAocmVjb21tZW5kZWQpPyAiKSkK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAncmVhbGlnbikKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIChpZiAoeS1vci1uLXAgIlJlbW92ZSBlbXB0eSBvcHRp b25hbCBhbmQgYWx0ZXJuYXRpdmUgZmllbGRzPyAiKQotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICdvcHRzLW9yLWFsdHMpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAoaWYgKHktb3Itbi1wICJSZW1vdmUgZGVsaW1pdGVycyBhcm91bmQgcHVyZSBudW1lcmlj YWwgZmllbGRzPyAiKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdudW1l cmljYWwtZmllbGRzKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGlmICh5LW9y LW4tcCAoY29uY2F0IChpZiBiaWJ0ZXgtY29tbWEtYWZ0ZXItbGFzdC1maWVsZCAiSW5zZXJ0IiAi UmVtb3ZlIikKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAiIGNvbW1hIGF0IGVuZCBvZiBlbnRyeT8gIikpCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgJ2xhc3QtY29tbWEpCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAoaWYgKHktb3Itbi1wICJSZXBsYWNlIGRvdWJsZSBwYWdlIGRhc2hlcyBieSBzaW5n bGUgb25lcz8gIikKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAncGFnZS1k YXNoZXMpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoaWYgKHktb3Itbi1wICJG b3JjZSBkZWxpbWl0ZXJzPyAiKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICdkZWxpbWl0ZXJzKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGlmICh5LW9y LW4tcCAiVW5pZnkgY2FzZSBvZiBlbnRyeSB0eXBlcyBhbmQgZmllbGQgbmFtZXM/ICIpCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ3VuaWZ5LWNhc2UpKSkpKQorICAgICAg ICAgICAgICAgICAgICAgIChtYXBjYXIgKGxhbWJkYSAob3B0aW9uKQorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAoaWYgKHktb3Itbi1wIChjYXIgb3B0aW9uKSkgKGNkciBvcHRpb24p KSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGAoKCJSZWFsaWduIGVudHJpZXMgKHJl Y29tbWVuZGVkKT8gIiAuICdyZWFsaWduKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAoIlJlbW92ZSBlbXB0eSBvcHRpb25hbCBhbmQgYWx0ZXJuYXRpdmUgZmllbGRzPyAiIC4gJ29w dHMtb3ItYWx0cykKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKCJSZW1vdmUgZGVs aW1pdGVycyBhcm91bmQgcHVyZSBudW1lcmljYWwgZmllbGRzPyAiIC4gJ251bWVyaWNhbC1maWVs ZHMpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICgsKGNvbmNhdCAoaWYgYmlidGV4 LWNvbW1hLWFmdGVyLWxhc3QtZmllbGQgIkluc2VydCIgIlJlbW92ZSIpCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICIgY29tbWEgYXQgZW5kIG9mIGVudHJ5PyAiKSAu ICdsYXN0LWNvbW1hKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoIlJlcGxhY2Ug ZG91YmxlIHBhZ2UgZGFzaGVzIGJ5IHNpbmdsZSBvbmVzPyAiIC4gJ3BhZ2UtZGFzaGVzKQorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoIkZvcmNlIGRlbGltaXRlcnM/ICIgLiAnZGVs aW1pdGVycykKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKCJVbmlmeSBjYXNlIG9m IGVudHJ5IHR5cGVzIGFuZCBmaWVsZCBuYW1lcz8gIiAuICd1bmlmeS1jYXNlKSkpKSkKICAgICAg ICAgICAgICcocmVhbGlnbikpKQotICAgICAgICAgKHJlZm9ybWF0LXJlZmVyZW5jZS1rZXlzIChp ZiBhZGRpdGlvbmFsLW9wdGlvbnMKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgKGlmIHVzZS1wcmV2aW91cy1vcHRpb25zCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBiaWJ0ZXgtcmVmb3JtYXQtcHJldmlvdXMtcmVmZXJlbmNlLWtleXMKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoc2V0cSBiaWJ0ZXgtcmVmb3Jt YXQtcHJldmlvdXMtcmVmZXJlbmNlLWtleXMKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAoeS1vci1uLXAgIkdlbmVyYXRlIG5ldyByZWZlcmVuY2Uga2V5cyBh dXRvbWF0aWNhbGx5PyAiKSkpKSkKLSAgICAgICAgIGJpYnRleC1hdXRva2V5LWVkaXQtYmVmb3Jl LXVzZQotICAgICAgICAgKGJpYnRleC1zb3J0LWlnbm9yZS1zdHJpbmctZW50cmllcyB0KQorICAg ICAgICAgKHJlZm9ybWF0LXJlZmVyZW5jZS1rZXlzCisgICAgICAgICAgKGlmIHJlYWQtb3B0aW9u cworICAgICAgICAgICAgICAoaWYgdXNlLXByZXZpb3VzLW9wdGlvbnMKKyAgICAgICAgICAgICAg ICAgIGJpYnRleC1yZWZvcm1hdC1wcmV2aW91cy1yZWZlcmVuY2Uta2V5cworICAgICAgICAgICAg ICAgIChzZXRxIGJpYnRleC1yZWZvcm1hdC1wcmV2aW91cy1yZWZlcmVuY2Uta2V5cworICAgICAg ICAgICAgICAgICAgICAgICh5LW9yLW4tcCAiR2VuZXJhdGUgbmV3IHJlZmVyZW5jZSBrZXlzIGF1 dG9tYXRpY2FsbHk/ICIpKSkpKQogICAgICAgICAgKHN0YXJ0LXBvaW50IChpZiAoYmlidGV4LW1h cmstYWN0aXZlKQogICAgICAgICAgICAgICAgICAgICAgICAgICAocmVnaW9uLWJlZ2lubmluZykK LSAgICAgICAgICAgICAgICAgICAgICAgIChiaWJ0ZXgtYmVnaW5uaW5nLW9mLWZpcnN0LWVudHJ5 KQotICAgICAgICAgICAgICAgICAgICAgICAgKGJpYnRleC1za2lwLXRvLXZhbGlkLWVudHJ5KQot ICAgICAgICAgICAgICAgICAgICAgICAgKHBvaW50KSkpCisgICAgICAgICAgICAgICAgICAgICAg ICAocG9pbnQtbWluKSkpCiAgICAgICAgICAoZW5kLXBvaW50IChpZiAoYmlidGV4LW1hcmstYWN0 aXZlKQogICAgICAgICAgICAgICAgICAgICAgICAgKHJlZ2lvbi1lbmQpCi0gICAgICAgICAgICAg ICAgICAgICAgKHBvaW50LW1heCkpKSkKKyAgICAgICAgICAgICAgICAgICAgICAocG9pbnQtbWF4 KSkpCisgICAgICAgICAoYmlidGV4LXNvcnQtaWdub3JlLXN0cmluZy1lbnRyaWVzIHQpCisgICAg ICAgICBiaWJ0ZXgtYXV0b2tleS1lZGl0LWJlZm9yZS11c2UpCisKICAgICAoc2F2ZS1yZXN0cmlj dGlvbgogICAgICAgKG5hcnJvdy10by1yZWdpb24gc3RhcnQtcG9pbnQgZW5kLXBvaW50KQotICAg ICAgKHdoZW4gKG1lbXEgJ3JlYWxpZ24gYmlidGV4LWVudHJ5LWZvcm1hdCkKLSAgICAgICAgKGdv dG8tY2hhciAocG9pbnQtbWluKSkKLSAgICAgICAgKHdoaWxlIChyZS1zZWFyY2gtZm9yd2FyZCBi aWJ0ZXgtdmFsaWQtZW50cnktd2hpdGVzcGFjZS1yZSBuaWwgdCkKLSAgICAgICAgICAocmVwbGFj ZS1tYXRjaCAiXG5cXDEiKSkpCisgICAgICAoaWYgKG1lbXEgJ3JlYWxpZ24gYmlidGV4LWVudHJ5 LWZvcm1hdCkKKyAgICAgICAgKGJpYnRleC1yZWFsaWduKSkKICAgICAgIChnb3RvLWNoYXIgc3Rh cnQtcG9pbnQpCiAgICAgICAoYmlidGV4LXByb2dyZXNzLW1lc3NhZ2UgIkZvcm1hdHRpbmciIDEp CiAgICAgICAoYmlidGV4LW1hcC1lbnRyaWVzIChsYW1iZGEgKGtleSBiZWcgZW5kKQogICAgICAg ICAgICAgICAgICAgICAgICAgICAgIChiaWJ0ZXgtcHJvZ3Jlc3MtbWVzc2FnZSkKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAoYmlidGV4LWNsZWFuLWVudHJ5IHJlZm9ybWF0LXJlZmVyZW5j ZS1rZXlzIHQpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgKHdoZW4gKG1lbXEgJ3JlYWxp Z24gYmlidGV4LWVudHJ5LWZvcm1hdCkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChn b3RvLWNoYXIgZW5kKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGJpYnRleC1kZWxl dGUtd2hpdGVzcGFjZSkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChvcGVuLWxpbmUg MikpKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAoYmlidGV4LWNsZWFuLWVudHJ5IHJl Zm9ybWF0LXJlZmVyZW5jZS1rZXlzIHQpKSkKKyAgICAgICh3aGVuIChtZW1xICdyZWFsaWduIGJp YnRleC1lbnRyeS1mb3JtYXQpCisgICAgICAgIChiaWJ0ZXgtZGVsZXRlLXdoaXRlc3BhY2UpCisg ICAgICAgIChvcGVuLWxpbmUgKGlmIChlb2JwKSAxIDIpKSkKICAgICAgIChiaWJ0ZXgtcHJvZ3Jl c3MtbWVzc2FnZSAnZG9uZSkpCiAgICAgKHdoZW4gKGFuZCByZWZvcm1hdC1yZWZlcmVuY2Uta2V5 cwotICAgICAgICAgICAgICAgYmlidGV4LW1haW50YWluLXNvcnRlZC1lbnRyaWVzCi0gICAgICAg ICAgICAgICAobm90IGNhbGxlZC1ieS1jb252ZXJ0LWFsaWVuKSkKKyAgICAgICAgICAgICAgIGJp YnRleC1tYWludGFpbi1zb3J0ZWQtZW50cmllcykKKyAgICAgIChiaWJ0ZXgtcHJvZ3Jlc3MtbWVz c2FnZSAiU29ydGluZyIgMSkKICAgICAgIChiaWJ0ZXgtc29ydC1idWZmZXIpCi0gICAgICAoa2ls bC1sb2NhbC12YXJpYWJsZSAnYmlidGV4LXJlZmVyZW5jZS1rZXlzKSkKKyAgICAgIChraWxsLWxv Y2FsLXZhcmlhYmxlICdiaWJ0ZXgtcmVmZXJlbmNlLWtleXMpCisgICAgICAoYmlidGV4LXByb2dy ZXNzLW1lc3NhZ2UgJ2RvbmUpKQogICAgIChnb3RvLWNoYXIgcG50KSkpCiAKLShkZWZ1biBiaWJ0 ZXgtY29udmVydC1hbGllbiAoJm9wdGlvbmFsIGRvLWFkZGl0aW9uYWwtcmVmb3JtYXR0aW5nKQor KGRlZnVuIGJpYnRleC1jb252ZXJ0LWFsaWVuICgmb3B0aW9uYWwgcmVhZC1vcHRpb25zKQogICAi Q29udmVydCBhbiBhbGllbiBCaWJUZVggYnVmZmVyIHRvIGJlIGZ1bGx5IHVzYWJsZSBieSBCaWJU ZVggbW9kZS4KLUlmIGEgZmlsZSBkb2VzIG5vdCBjb25mb3JtIHdpdGggc29tZSBzdGFuZGFyZHMg dXNlZCBieSBCaWJUZVggbW9kZSwKK0lmIGEgZmlsZSBkb2VzIG5vdCBjb25mb3JtIHdpdGggYWxs IHN0YW5kYXJkcyB1c2VkIGJ5IEJpYlRlWCBtb2RlLAogc29tZSBvZiB0aGUgaGlnaC1sZXZlbCBm ZWF0dXJlcyBvZiBCaWJUZVggbW9kZSB3aWxsIG5vdCBiZSBhdmFpbGFibGUuCiBUaGlzIGZ1bmN0 aW9uIHRyaWVzIHRvIGNvbnZlcnQgY3VycmVudCBidWZmZXIgdG8gY29uZm9ybSB3aXRoIHRoZXNl IHN0YW5kYXJkcy4KLVdpdGggcHJlZml4IGFyZ3VtZW50IERPLUFERElUSU9OQUwtUkVGT1JNQVRU SU5HCi1ub24tbmlsLCByZWFkIG9wdGlvbnMgZm9yIHJlZm9ybWF0dGluZyBlbnRyaWVzIGZyb20g bWluaWJ1ZmZlci4iCitXaXRoIHByZWZpeCBhcmd1bWVudCBSRUFELU9QVElPTlMgbm9uLW5pbCwg cmVhZCBvcHRpb25zIGZvciByZWZvcm1hdHRpbmcKK2VudHJpZXMgZnJvbSBtaW5pYnVmZmVyLiIK ICAgKGludGVyYWN0aXZlICIqUCIpCiAgIChtZXNzYWdlICJTdGFydGluZyB0byB2YWxpZGF0ZSBi dWZmZXIuLi4iKQogICAoc2l0LWZvciAxIG5pbCB0KQotICAoZ290by1jaGFyIChwb2ludC1taW4p KQotICAod2hpbGUgKHJlLXNlYXJjaC1mb3J3YXJkICJbIFx0XG5dK0AiIG5pbCB0KQotICAgIChy ZXBsYWNlLW1hdGNoICJcbkAiKSkKKyAgKGJpYnRleC1yZWFsaWduKQogICAobWVzc2FnZQogICAg IklmIGVycm9ycyBvY2N1ciwgY29ycmVjdCB0aGVtIGFuZCBjYWxsIGBiaWJ0ZXgtY29udmVydC1h bGllbicgYWdhaW4iKQogICAoc2l0LWZvciA1IG5pbCB0KQpAQCAtMzcxNCwxMCArMzcxMyw3IEBA CiAgICAgICAgICAgKGJpYnRleC12YWxpZGF0ZSkpCiAgICAgKG1lc3NhZ2UgIlN0YXJ0aW5nIHRv IHJlZm9ybWF0IGVudHJpZXMuLi4iKQogICAgIChzaXQtZm9yIDIgbmlsIHQpCi0gICAgKGJpYnRl eC1yZWZvcm1hdCBkby1hZGRpdGlvbmFsLXJlZm9ybWF0dGluZyB0KQotICAgICh3aGVuIGJpYnRl eC1tYWludGFpbi1zb3J0ZWQtZW50cmllcwotICAgICAgKG1lc3NhZ2UgIlN0YXJ0aW5nIHRvIHNv cnQgYnVmZmVyLi4uIikKLSAgICAgIChiaWJ0ZXgtc29ydC1idWZmZXIpKQorICAgIChiaWJ0ZXgt cmVmb3JtYXQgcmVhZC1vcHRpb25zKQogICAgIChnb3RvLWNoYXIgKHBvaW50LW1heCkpCiAgICAg KG1lc3NhZ2UgIkJ1ZmZlciBpcyBub3cgcGFyc2FibGUuIFBsZWFzZSBzYXZlIGl0LiIpKSkKIAo= --SwpkivQnVc Content-Type: text/plain; charset=us-ascii Content-Description: message body text Content-Transfer-Encoding: 7bit 2004-05-01 Roland Winkler * textmodes/bibtex.el (bibtex-progress-message): Fix docstring. (bibtex-entry-update): New command bound to C-c C-u. (bibtex-text-in-string): Fix regexp. (bibtex-assoc-of-regexp): Removed. (bibtex-progress-message): Fix docstring. (bibtex-inside-field): Use if. (bibtex-assoc-regexp): New function. (bibtex-format-entry): Make code more robust so that it formats also old entries. (bibtex-autokey-demangle-title): Merged with obsolete function bibtex-assoc-of-regexp. (bibtex-field-list): New function. (bibtex-entry): Use bibtex-field-list. (bibtex-parse-entry): Fix docstring. (bibtex-print-help-message): Use bibtex-field-list. (bibtex-make-field): Use bibtex-field-list. (bibtex-entry-index): Bugfix. Return crossref key if required. (bibtex-lessp): Fix docstring. *** The new command bibtex-entry-update (bound to C-c C-u) updates an existing BibTeX entry. --SwpkivQnVc Content-Type: application/octet-stream Content-Disposition: attachment; filename="dif4" Content-Transfer-Encoding: base64 LS0tIGJpYnRleC5lbAkyMDA0LTA0LTI0IDE4OjMxOjE3ICswMjAwICAgICAgIDEuMjkKKysrIGJp YnRleC5lbAkyMDA0LTA1LTAxIDEyOjI5OjA0ICswMjAwCkBAIC04MTEsNiArODExLDcgQEAKICAg ICAoZGVmaW5lLWtleSBrbSAiXEMtY1xNLXkiICdiaWJ0ZXgteWFuay1wb3ApCiAgICAgKGRlZmlu ZS1rZXkga20gIlxDLWNcQy1kIiAnYmlidGV4LWVtcHR5LWZpZWxkKQogICAgIChkZWZpbmUta2V5 IGttICJcQy1jXEMtZiIgJ2JpYnRleC1tYWtlLWZpZWxkKQorICAgIChkZWZpbmUta2V5IGttICJc Qy1jXEMtdSIgJ2JpYnRleC1lbnRyeS11cGRhdGUpCiAgICAgKGRlZmluZS1rZXkga20gIlxDLWMk IiAnYmlidGV4LWlzcGVsbC1hYnN0cmFjdCkKICAgICAoZGVmaW5lLWtleSBrbSAiXE0tXEMtYSIg J2JpYnRleC1iZWdpbm5pbmctb2YtZW50cnkpCiAgICAgKGRlZmluZS1rZXkga20gIlxNLVxDLWUi ICdiaWJ0ZXgtZW5kLW9mLWVudHJ5KQpAQCAtMTEyMiw0NCArMTEyMyw2IEBACiAgJyhiaWJ0ZXgt bW9kZSAiQFxcUygqXFxzKCIgIlxccykiIG5pbCBiaWJ0ZXgtaHMtZm9yd2FyZC1zZXhwIG5pbCkp CiAKIAwKLShkZWZjb25zdCBiaWJ0ZXgtYnJhY2VkLXN0cmluZy1zeW50YXgtdGFibGUKLSAgKGxl dCAoKHN0IChtYWtlLXN5bnRheC10YWJsZSkpKQotICAgIChtb2RpZnktc3ludGF4LWVudHJ5ID9c eyAiKH0iIHN0KQotICAgIChtb2RpZnktc3ludGF4LWVudHJ5ID9cfSAiKXsiIHN0KQotICAgICht b2RpZnktc3ludGF4LWVudHJ5ID9cWyAiLiIgc3QpCi0gICAgKG1vZGlmeS1zeW50YXgtZW50cnkg P1xdICIuIiBzdCkKLSAgICAobW9kaWZ5LXN5bnRheC1lbnRyeSA/XCggIi4iIHN0KQotICAgICht b2RpZnktc3ludGF4LWVudHJ5ID9cKSAiLiIgc3QpCi0gICAgKG1vZGlmeS1zeW50YXgtZW50cnkg P1xcICIuIiBzdCkKLSAgICAobW9kaWZ5LXN5bnRheC1lbnRyeSA/XCIgIi4iIHN0KQotICAgIHN0 KQotICAiU3ludGF4LXRhYmxlIHRvIHBhcnNlIG1hdGNoZWQgYnJhY2VzLiIpCi0KLShkZWZjb25z dCBiaWJ0ZXgtcXVvdGVkLXN0cmluZy1zeW50YXgtdGFibGUKLSAgKGxldCAoKHN0IChtYWtlLXN5 bnRheC10YWJsZSkpKQotICAgIChtb2RpZnktc3ludGF4LWVudHJ5ID9cXCAiXFwiIHN0KQotICAg IChtb2RpZnktc3ludGF4LWVudHJ5ID9cIiAiXCIiIHN0KQotICAgIHN0KQotICAiU3ludGF4LXRh YmxlIHRvIHBhcnNlIG1hdGNoZWQgcXVvdGVzLiIpCi0KLShkZWZ1biBiaWJ0ZXgtcGFyc2UtZmll bGQtc3RyaW5nICgpCi0gICJQYXJzZSBhIGZpZWxkIHN0cmluZyBlbmNsb3NlZCBieSBicmFjZXMg b3IgcXVvdGVzLgotSWYgYSBzeW50YWN0aWNhbGx5IGNvcnJlY3Qgc3RyaW5nIGlzIGZvdW5kLCBh IHBhaXIgY29udGFpbmluZyB0aGUgc3RhcnQgYW5kCi1lbmQgcG9zaXRpb24gb2YgdGhlIGZpZWxk IHN0cmluZyBpcyByZXR1cm5lZCwgbmlsIG90aGVyd2lzZS4iCi0gIChsZXQgKChlbmQtcG9pbnQK LSAgICAgICAgIChvciAoYW5kIChlcSAoZm9sbG93aW5nLWNoYXIpID9cIikKLSAgICAgICAgICAg ICAgICAgIChzYXZlLWV4Y3Vyc2lvbgotICAgICAgICAgICAgICAgICAgICAod2l0aC1zeW50YXgt dGFibGUgYmlidGV4LXF1b3RlZC1zdHJpbmctc3ludGF4LXRhYmxlCi0gICAgICAgICAgICAgICAg ICAgICAgKGZvcndhcmQtc2V4cCAxKSkKLSAgICAgICAgICAgICAgICAgICAgKHBvaW50KSkpCi0g ICAgICAgICAgICAgKGFuZCAoZXEgKGZvbGxvd2luZy1jaGFyKSA/XHspCi0gICAgICAgICAgICAg ICAgICAoc2F2ZS1leGN1cnNpb24KLSAgICAgICAgICAgICAgICAgICAgKHdpdGgtc3ludGF4LXRh YmxlIGJpYnRleC1icmFjZWQtc3RyaW5nLXN5bnRheC10YWJsZQotICAgICAgICAgICAgICAgICAg ICAgIChmb3J3YXJkLXNleHAgMSkpCi0gICAgICAgICAgICAgICAgICAgIChwb2ludCkpKSkpKQot ICAgIChpZiBlbmQtcG9pbnQKLSAgICAgICAgKGNvbnMgKHBvaW50KSBlbmQtcG9pbnQpKSkpCi0K IChkZWZ1biBiaWJ0ZXgtcGFyc2UtYXNzb2NpYXRpb24gKHBhcnNlLWxocyBwYXJzZS1yaHMpCiAg ICJQYXJzZSBhIHN0cmluZyBvZiB0aGUgZm9ybWF0IDxsZWZ0LWhhbmQtc2lkZSA9IHJpZ2h0LWhh bmQtc2lkZT4uCiBUaGUgZnVuY3Rpb25zIFBBUlNFLUxIUyBhbmQgUEFSU0UtUkhTIGFyZSB1c2Vk IHRvIHBhcnNlIHRoZSBjb3JyZXNwb25kaW5nCkBAIC0xMTk5LDYgKzExNjIsNDQgQEAKICAgICAg ICAgIDs7IE5vdyB0cnkgYWdhaW4uCiAgICAgICAgICAoYmlidGV4LXBhcnNlLWZpZWxkLW5hbWUp KSkpCiAKKyhkZWZjb25zdCBiaWJ0ZXgtYnJhY2VkLXN0cmluZy1zeW50YXgtdGFibGUKKyAgKGxl dCAoKHN0IChtYWtlLXN5bnRheC10YWJsZSkpKQorICAgIChtb2RpZnktc3ludGF4LWVudHJ5ID9c eyAiKH0iIHN0KQorICAgIChtb2RpZnktc3ludGF4LWVudHJ5ID9cfSAiKXsiIHN0KQorICAgICht b2RpZnktc3ludGF4LWVudHJ5ID9cWyAiLiIgc3QpCisgICAgKG1vZGlmeS1zeW50YXgtZW50cnkg P1xdICIuIiBzdCkKKyAgICAobW9kaWZ5LXN5bnRheC1lbnRyeSA/XCggIi4iIHN0KQorICAgICht b2RpZnktc3ludGF4LWVudHJ5ID9cKSAiLiIgc3QpCisgICAgKG1vZGlmeS1zeW50YXgtZW50cnkg P1xcICIuIiBzdCkKKyAgICAobW9kaWZ5LXN5bnRheC1lbnRyeSA/XCIgIi4iIHN0KQorICAgIHN0 KQorICAiU3ludGF4LXRhYmxlIHRvIHBhcnNlIG1hdGNoZWQgYnJhY2VzLiIpCisKKyhkZWZjb25z dCBiaWJ0ZXgtcXVvdGVkLXN0cmluZy1zeW50YXgtdGFibGUKKyAgKGxldCAoKHN0IChtYWtlLXN5 bnRheC10YWJsZSkpKQorICAgIChtb2RpZnktc3ludGF4LWVudHJ5ID9cXCAiXFwiIHN0KQorICAg IChtb2RpZnktc3ludGF4LWVudHJ5ID9cIiAiXCIiIHN0KQorICAgIHN0KQorICAiU3ludGF4LXRh YmxlIHRvIHBhcnNlIG1hdGNoZWQgcXVvdGVzLiIpCisKKyhkZWZ1biBiaWJ0ZXgtcGFyc2UtZmll bGQtc3RyaW5nICgpCisgICJQYXJzZSBhIGZpZWxkIHN0cmluZyBlbmNsb3NlZCBieSBicmFjZXMg b3IgcXVvdGVzLgorSWYgYSBzeW50YWN0aWNhbGx5IGNvcnJlY3Qgc3RyaW5nIGlzIGZvdW5kLCBh IHBhaXIgY29udGFpbmluZyB0aGUgc3RhcnQgYW5kCitlbmQgcG9zaXRpb24gb2YgdGhlIGZpZWxk IHN0cmluZyBpcyByZXR1cm5lZCwgbmlsIG90aGVyd2lzZS4iCisgIChsZXQgKChlbmQtcG9pbnQK KyAgICAgICAgIChvciAoYW5kIChlcSAoZm9sbG93aW5nLWNoYXIpID9cIikKKyAgICAgICAgICAg ICAgICAgIChzYXZlLWV4Y3Vyc2lvbgorICAgICAgICAgICAgICAgICAgICAod2l0aC1zeW50YXgt dGFibGUgYmlidGV4LXF1b3RlZC1zdHJpbmctc3ludGF4LXRhYmxlCisgICAgICAgICAgICAgICAg ICAgICAgKGZvcndhcmQtc2V4cCAxKSkKKyAgICAgICAgICAgICAgICAgICAgKHBvaW50KSkpCisg ICAgICAgICAgICAgKGFuZCAoZXEgKGZvbGxvd2luZy1jaGFyKSA/XHspCisgICAgICAgICAgICAg ICAgICAoc2F2ZS1leGN1cnNpb24KKyAgICAgICAgICAgICAgICAgICAgKHdpdGgtc3ludGF4LXRh YmxlIGJpYnRleC1icmFjZWQtc3RyaW5nLXN5bnRheC10YWJsZQorICAgICAgICAgICAgICAgICAg ICAgIChmb3J3YXJkLXNleHAgMSkpCisgICAgICAgICAgICAgICAgICAgIChwb2ludCkpKSkpKQor ICAgIChpZiBlbmQtcG9pbnQKKyAgICAgICAgKGNvbnMgKHBvaW50KSBlbmQtcG9pbnQpKSkpCisK IChkZWZ1biBiaWJ0ZXgtcGFyc2UtZmllbGQtdGV4dCAoKQogICAiUGFyc2UgdGhlIHRleHQgcGFy dCBvZiBhIEJpYlRlWCBmaWVsZC4KIFRoZSB0ZXh0IHBhcnQgaXMgZWl0aGVyIGEgc3RyaW5nLCBv ciBhbiBlbXB0eSBzdHJpbmcsIG9yIGEgY29uc3RhbnQgZm9sbG93ZWQKQEAgLTE0MTAsNyArMTQx MSw3IEBACiAgIChsZXQgKChjb250ZW50IChidWZmZXItc3Vic3RyaW5nLW5vLXByb3BlcnRpZXMg KG50aCAwIChjZHIgYm91bmRzKSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAobnRoIDEgKGNkciBib3VuZHMpKSkpKQogICAgIChpZiAoYW5kIHJlbW92 ZS1kZWxpbQotICAgICAgICAgICAgIChzdHJpbmctbWF0Y2ggIlxcYHtcXCguKlxcKX1cXCciIGNv bnRlbnQpKQorICAgICAgICAgICAgIChzdHJpbmctbWF0Y2ggIlxcYFt7XCJdXFwoLipcXClbfVwi XVxcJyIgY29udGVudCkpCiAgICAgICAgIChzdWJzdHJpbmcgY29udGVudCAobWF0Y2gtYmVnaW5u aW5nIDEpIChtYXRjaC1lbmQgMSkpCiAgICAgICBjb250ZW50KSkpCiAKQEAgLTE0NTUsMTYgKzE0 NTYsNiBAQAogICAgICAgKHNldHEgbGlzdCAoY2RyIGxpc3QpKSkKICAgICBsaXN0KSkKIAotKGRl ZnVuIGJpYnRleC1hc3NvYy1vZi1yZWdleHAgKHN0cmluZyBhbGlzdCkKLSAgIlJldHVybiBub24t bmlsIGlmIFNUUklORyBpcyBleGFjdGx5IG1hdGNoZWQgYnkgdGhlIGNhciBvZiBhbgotZWxlbWVu dCBvZiBBTElTVCAoY2FzZSBpZ25vcmVkKS4gVGhlIHZhbHVlIGlzIGFjdHVhbGx5IHRoZSBlbGVt ZW50Ci1vZiBMSVNUIHdob3NlIGNhciBtYXRjaGVzIFNUUklORy4iCi0gIChsZXQgKChjYXNlLWZv bGQtc2VhcmNoIHQpKQotICAgICh3aGlsZSAoYW5kIGFsaXN0Ci0gICAgICAgICAgICAgICAgKG5v dCAoc3RyaW5nLW1hdGNoIChjb25jYXQgIlxcYFxcKD86IiAoY2FhciBhbGlzdCkgIlxcKVxcJyIp IHN0cmluZykpKQotICAgICAgKHNldHEgYWxpc3QgKGNkciBhbGlzdCkpKQotICAgIChjYXIgYWxp c3QpKSkKLQogKGRlZnVuIGJpYnRleC1za2lwLXRvLXZhbGlkLWVudHJ5ICgmb3B0aW9uYWwgYmFj a3dhcmQpCiAgICJVbmxlc3MgYXQgYmVnaW5uaW5nIG9mIGEgdmFsaWQgQmliVGVYIGVudHJ5LCBt b3ZlIHBvaW50IHRvIGJlZ2lubmluZyBvZiB0aGUKIG5leHQgdmFsaWQgb25lLiBXaXRoIG9wdGlv bmFsIGFyZ3VtZW50IEJBQ0tXQVJEIG5vbi1uaWwsIG1vdmUgYmFja3dhcmQgdG8KQEAgLTE1MTks OCArMTUxMCw4IEBACiBJZiBGTEFHIGlzIGEgc3RyaW5nLCB0aGUgbWVzc2FnZSBpcyBpbml0aWFs aXplZCAoaW4gdGhpcyBjYXNlIGEKIHZhbHVlIGZvciBJTlRFUlZBTCBtYXkgYmUgZ2l2ZW4gYXMg d2VsbCAoaWYgbm90IHRoaXMgaXMgc2V0IHRvIDUpKS4KIElmIEZMQUcgaXMgZG9uZSwgdGhlIG1l c3NhZ2UgaXMgZGVpbml0aWFsaXplZC4KLUlmIEZMQUcgaXMgYWJzZW50LCBhIG1lc3NhZ2UgaXMg ZWNob2VkIGlmIHBvaW50IHdhcyBpbmNyZW1lbnRlZAotYXQgbGVhc3QgSU5URVJWQUwgcGVyY2Vu dCBzaW5jZSBsYXN0IG1lc3NhZ2Ugd2FzIGVjaG9lZC4iCitJZiBGTEFHIGlzIG5pbCwgYSBtZXNz YWdlIGlzIGVjaG9lZCBpZiBwb2ludCB3YXMgaW5jcmVtZW50ZWQgYXQgbGVhc3QKK2BiaWJ0ZXgt cHJvZ3Jlc3MtaW50ZXJ2YWwnIHBlcmNlbnQgc2luY2UgbGFzdCBtZXNzYWdlIHdhcyBlY2hvZWQu IgogICAoY29uZCAoKHN0cmluZ3AgZmxhZykKICAgICAgICAgIChzZXRxIGJpYnRleC1wcm9ncmVz cy1sYXN0bWVzIGZsYWcpCiAgICAgICAgICAoc2V0cSBiaWJ0ZXgtcHJvZ3Jlc3MtaW50ZXJ2YWwg KG9yIGludGVydmFsIDUpCkBAIC0xNjg1LDExICsxNjc2LDExIEBACiAgICJUcnkgdG8gYXZvaWQg cG9pbnQgYmVpbmcgYXQgZW5kIG9mIGEgQmliVGVYIGZpZWxkLiIKICAgKGVuZC1vZi1saW5lKQog ICAoc2tpcC1jaGFycy1iYWNrd2FyZCAiIFx0IikKLSAgKGNvbmQgKCg9IChwcmVjZWRpbmctY2hh cikgPywpCi0gICAgICAgICAoZm9yd2FyZC1jaGFyIC0yKSkpCi0gIChjb25kICgob3IgKD0gKHBy ZWNlZGluZy1jaGFyKSA/fSkKLSAgICAgICAgICAgICAoPSAocHJlY2VkaW5nLWNoYXIpID9cIikp Ci0gICAgICAgICAoZm9yd2FyZC1jaGFyIC0xKSkpKQorICAoaWYgKD0gKHByZWNlZGluZy1jaGFy KSA/LCkKKyAgICAgIChmb3J3YXJkLWNoYXIgLTIpKQorICAoaWYgKG9yICg9IChwcmVjZWRpbmct Y2hhcikgP30pCisgICAgICAgICAgKD0gKHByZWNlZGluZy1jaGFyKSA/XCIpKQorICAgICAgKGZv cndhcmQtY2hhciAtMSkpKQogCiAoZGVmdW4gYmlidGV4LWVuY2xvc2luZy1maWVsZCAoJm9wdGlv bmFsIG5vZXJyKQogICAiU2VhcmNoIGZvciBCaWJUZVggZmllbGQgZW5jbG9zaW5nIHBvaW50LiBQ b2ludCBtb3ZlcyB0byBlbmQgb2YgZmllbGQuCkBAIC0xNzQ5LDYgKzE3NDAsMTUgQEAKICAgICAg ICAgKGVycm9yICJVbmtub3duIHRhZyBmaWVsZDogJXMuICBQbGVhc2Ugc3VibWl0IGEgYnVnIHJl cG9ydCIKICAgICAgICAgICAgICAgIGJpYnRleC1sYXN0LWtpbGwtY29tbWFuZCkpKSkpKQogCiso ZGVmdW4gYmlidGV4LWFzc29jLXJlZ2V4cCAocmVnZXhwIGFsaXN0KQorICAiUmV0dXJuIG5vbi1u aWwgaWYgUkVHRVhQIG1hdGNoZXMgdGhlIGNhciBvZiBhbiBlbGVtZW50IG9mIEFMSVNULgorVGhl IHZhbHVlIGlzIGFjdHVhbGx5IHRoZSBlbGVtZW50IG9mIEFMSVNUIG1hdGNoZWQgYnkgUkVHRVhQ LgorQ2FzZSBpcyBpZ25vcmVkIGlmIGBjYXNlLWZvbGQtc2VhcmNoJyBpcyBub24tbmlsIGluIHRo ZSBjdXJyZW50IGJ1ZmZlci4iCisgICh3aGlsZSAoYW5kIGFsaXN0CisgICAgICAgICAgICAgIChu b3QgKHN0cmluZy1tYXRjaCByZWdleHAgKGNhYXIgYWxpc3QpKSkpCisgICAgKHNldHEgYWxpc3Qg KGNkciBhbGlzdCkpKQorICAoY2FyIGFsaXN0KSkKKwogKGRlZnVuIGJpYnRleC1mb3JtYXQtZW50 cnkgKCkKICAgIkhlbHBlciBmdW5jdGlvbiBmb3IgYGJpYnRleC1jbGVhbi1lbnRyeScuCiBGb3Jt YXRzIGN1cnJlbnQgZW50cnkgYWNjb3JkaW5nIHRvIHZhcmlhYmxlIGBiaWJ0ZXgtZW50cnktZm9y bWF0Jy4iCkBAIC0xNzYzLDcgKzE3NjMsNyBAQAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHVuaWZ5LWNhc2UgaW5oZXJpdC1ib29rdGl0bGUpCiAgICAgICAgICAgICAgICAgICAg ICAgYmlidGV4LWVudHJ5LWZvcm1hdCkpCiAgICAgICAgICAgICBjcm9zc3JlZi1rZXkgYm91bmRz IGFsdGVybmF0aXZlcy10aGVyZSBub24tZW1wdHktYWx0ZXJuYXRpdmUKLSAgICAgICAgICAgIGVu dHJ5LWxpc3QgcmVxIGNyZXEgZmllbGQtZG9uZSBmaWVsZC1saXN0KQorICAgICAgICAgICAgZW50 cnktbGlzdCByZXEtZmllbGQtbGlzdCBmaWVsZC1kb25lIGZpZWxkLWxpc3QpCiAKICAgICAgICAg OzsgaWRlbnRpZnkgZW50cnkgdHlwZQogICAgICAgICAoZ290by1jaGFyIChwb2ludC1taW4pKQpA QCAtMTc3Miw5ICsxNzcyLDcgQEAKICAgICAgICAgICAgICAgKGVuZC10eXBlIChtYXRjaC1lbmQg MCkpKQogICAgICAgICAgIChzZXRxIGVudHJ5LWxpc3QgKGFzc29jLWlnbm9yZS1jYXNlIChidWZm ZXItc3Vic3RyaW5nLW5vLXByb3BlcnRpZXMKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgYmVnLXR5cGUgZW5kLXR5cGUpCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgYmlidGV4LWVudHJ5LWZpZWxkLWFsaXN0KQotICAg ICAgICAgICAgICAgIHJlcSAgKG50aCAwIChudGggMSBlbnRyeS1saXN0KSkgIDsgcmVxdWlyZWQg cGFydAotICAgICAgICAgICAgICAgIGNyZXEgKG50aCAwIChudGggMiBlbnRyeS1saXN0KSkpIDsg Y3Jvc3NyZWYgcGFydAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGJpYnRleC1lbnRyeS1maWVsZC1hbGlzdCkpCiAKICAgICAgICAgICA7OyB1bmlmeSBjYXNl IG9mIGVudHJ5IG5hbWUKICAgICAgICAgICAod2hlbiAobWVtcSAndW5pZnktY2FzZSBmb3JtYXQp CkBAIC0xNzkxLDIwICsxNzg5LDMyIEBACiAgICAgICAgIDs7IGRldGVybWluZSBpZiBlbnRyeSBo YXMgY3Jvc3NyZWYgZmllbGQgYW5kIGlmIGF0IGxlYXN0CiAgICAgICAgIDs7IG9uZSBhbHRlcm5h dGl2ZSBpcyBub24tZW1wdHkKICAgICAgICAgKGdvdG8tY2hhciAocG9pbnQtbWluKSkKLSAgICAg ICAgKHdoaWxlIChzZXRxIGJvdW5kcyAoYmlidGV4LXNlYXJjaC1mb3J3YXJkLWZpZWxkCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGJpYnRleC1maWVsZC1uYW1lKSkKLSAgICAgICAgICAo Z290by1jaGFyIChiaWJ0ZXgtc3RhcnQtb2YtbmFtZS1pbi1maWVsZCBib3VuZHMpKQotICAgICAg ICAgIChjb25kICgobG9va2luZy1hdCAiQUxUIikKLSAgICAgICAgICAgICAgICAgKHNldHEgYWx0 ZXJuYXRpdmVzLXRoZXJlIHQpCi0gICAgICAgICAgICAgICAgIChnb3RvLWNoYXIgKGJpYnRleC1z dGFydC1vZi10ZXh0LWluLWZpZWxkIGJvdW5kcykpCi0gICAgICAgICAgICAgICAgIChpZiAobm90 IChsb29raW5nLWF0IGJpYnRleC1lbXB0eS1maWVsZC1yZSkpCi0gICAgICAgICAgICAgICAgICAg ICAoc2V0cSBub24tZW1wdHktYWx0ZXJuYXRpdmUgdCkpKQotICAgICAgICAgICAgICAgICgoYW5k IChsb29raW5nLWF0ICJcXChPUFRcXCk/Y3Jvc3NyZWZcXD4iKQotICAgICAgICAgICAgICAgICAg ICAgIChwcm9nbiAoZ290by1jaGFyIChiaWJ0ZXgtc3RhcnQtb2YtdGV4dC1pbi1maWVsZCBib3Vu ZHMpKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAobm90IChsb29raW5nLWF0IGJpYnRl eC1lbXB0eS1maWVsZC1yZSkpKSkKLSAgICAgICAgICAgICAgICAgKHNldHEgY3Jvc3NyZWYta2V5 Ci0gICAgICAgICAgICAgICAgICAgICAgIChiaWJ0ZXgtdGV4dC1pbi1maWVsZC1ib3VuZHMgYm91 bmRzIHQpKSkpCi0gICAgICAgICAgKGdvdG8tY2hhciAoYmlidGV4LWVuZC1vZi1maWVsZCBib3Vu ZHMpKSkKKyAgICAgICAgKGxldCogKChmaWVsZHMtYWxpc3QgKGJpYnRleC1wYXJzZS1lbnRyeSkp CisgICAgICAgICAgICAgICAoY2FzZS1mb2xkLXNlYXJjaCB0KQorICAgICAgICAgICAgICAgKGZp ZWxkIChiaWJ0ZXgtYXNzb2MtcmVnZXhwICJcXChPUFRcXCk/Y3Jvc3NyZWZcXD4iCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZmllbGRzLWFsaXN0KSkpCisgICAg ICAgICAgKHNldHEgY3Jvc3NyZWYta2V5IChhbmQgZmllbGQKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAobm90IChzdHJpbmctbWF0Y2ggYmlidGV4LWVtcHR5LWZpZWxkLXJlCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChjZHIg ZmllbGQpKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoY2RyIGZpZWxkKSkK KyAgICAgICAgICAgICAgICByZXEtZmllbGQtbGlzdCAoaWYgY3Jvc3NyZWYta2V5CisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIChudGggMCAobnRoIDIgZW50cnktbGlzdCkpICA7 IGNyb3NzcmVmIHBhcnQKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChudGggMCAo bnRoIDEgZW50cnktbGlzdCkpKSkgIDsgcmVxdWlyZWQgcGFydAorCisgICAgICAgICAgKGRvbGlz dCAocmZpZWxkIHJlcS1maWVsZC1saXN0KQorICAgICAgICAgICAgKHdoZW4gKG50aCAzIHJmaWVs ZCkgOyB3ZSBzaG91bGQgaGF2ZSBhbiBhbHRlcm5hdGl2ZQorICAgICAgICAgICAgICAoc2V0cSBh bHRlcm5hdGl2ZXMtdGhlcmUgdAorICAgICAgICAgICAgICAgICAgICBmaWVsZCAoYmlidGV4LWFz c29jLXJlZ2V4cAorICAgICAgICAgICAgICAgICAgICAgICAgICAgKGNvbmNhdCAiXFwoQUxUXFwp PyIgKGNhciByZmllbGQpICJcXD4iKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgZmllbGRz LWFsaXN0KSkKKyAgICAgICAgICAgICAgKGlmIChhbmQgZmllbGQKKyAgICAgICAgICAgICAgICAg ICAgICAgKG5vdCAoc3RyaW5nLW1hdGNoIGJpYnRleC1lbXB0eS1maWVsZC1yZQorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGNkciBmaWVsZCkpKSkKKyAgICAgICAg ICAgICAgICAgIChjb25kICgobm90IG5vbi1lbXB0eS1hbHRlcm5hdGl2ZSkKKyAgICAgICAgICAg ICAgICAgICAgICAgICAoc2V0cSBub24tZW1wdHktYWx0ZXJuYXRpdmUgdCkpCisgICAgICAgICAg ICAgICAgICAgICAgICAoKG1lbXEgJ3JlcXVpcmVkLWZpZWxkcyBmb3JtYXQpCisgICAgICAgICAg ICAgICAgICAgICAgICAgKGVycm9yICJNb3JlIHRoYW4gb25lIG5vbi1lbXB0eSBhbHRlcm5hdGl2 ZS4iKSkpKSkpKQorCiAgICAgICAgIChpZiAoYW5kIGFsdGVybmF0aXZlcy10aGVyZQogICAgICAg ICAgICAgICAgICAobm90IG5vbi1lbXB0eS1hbHRlcm5hdGl2ZSkKICAgICAgICAgICAgICAgICAg KG1lbXEgJ3JlcXVpcmVkLWZpZWxkcyBmb3JtYXQpKQpAQCAtMTgzMiwxOCArMTg0MiwyMyBAQAog ICAgICAgICAgICAgOzsgcXVpdGUgc29tZSByZWR1bmRhbmN5IGNvbXBhcmVkIHdpdGggd2hhdCB3 ZSBuZWVkIHRvIGRvCiAgICAgICAgICAgICA7OyBhbnl3YXkuIFNvIGZvciBzcGVlZC11cCB3ZSBh dm9pZCB1c2luZyB0aGVtLgogCi0gICAgICAgICAgICAod2hlbiAoYW5kIG9wdC1hbHQKLSAgICAg ICAgICAgICAgICAgICAgICAgKG1lbXEgJ29wdHMtb3ItYWx0cyBmb3JtYXQpKQotICAgICAgICAg ICAgICAoaWYgZW1wdHktZmllbGQKLSAgICAgICAgICAgICAgICAgIDs7IEVpdGhlciBpdCBpcyBh biBlbXB0eSBBTFQgZmllbGQuIFRoZW4gd2UgaGF2ZSBjaGVja2VkCi0gICAgICAgICAgICAgICAg ICA7OyBhbHJlYWR5IHRoYXQgd2UgaGF2ZSBvbmUgbm9uLWVtcHR5IGFsdGVybmF0aXZlLgotICAg ICAgICAgICAgICAgICAgOzsgT3IgaXQgaXMgYW4gZW1wdHkgT1BUIGZpZWxkIHRoYXQgd2UgZG8g bm90IG1pc3MgYW55d2F5LgotICAgICAgICAgICAgICAgICAgOzsgU28gd2UgY2FuIHNhZmVseSBk ZWxldGUgdGhpcyBmaWVsZC4KLSAgICAgICAgICAgICAgICAgIChwcm9nbiAoZGVsZXRlLXJlZ2lv biBiZWctZmllbGQgZW5kLWZpZWxkKQotICAgICAgICAgICAgICAgICAgICAgICAgIChzZXRxIGRl bGV0ZWQgdCkpCi0gICAgICAgICAgICAgICAgOzsgb3RoZXJ3aXNlOiBub3QgZW1wdHksIGRlbGV0 ZSAiT1BUIiBvciAiQUxUIgotICAgICAgICAgICAgICAgIChnb3RvLWNoYXIgYmVnLW5hbWUpCi0g ICAgICAgICAgICAgICAgKGRlbGV0ZS1jaGFyIDMpKSkKKyAgICAgICAgICAgIChpZiAobWVtcSAn b3B0cy1vci1hbHRzIGZvcm1hdCkKKyAgICAgICAgICAgICAgICAoY29uZCAoKGFuZCBlbXB0eS1m aWVsZAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIChvciBvcHQtYWx0CisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIChsZXQgKChmaWVsZCAoYXNzb2MtaWdub3JlLWNhc2UKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmaWVsZC1uYW1lIHJl cS1maWVsZC1saXN0KSkpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKG9yIChu b3QgZmllbGQpICAgICAgIDsgT1BUIGZpZWxkCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIChudGggMyBmaWVsZCkpKSkpIDsgQUxUIGZpZWxkCisgICAgICAgICAgICAgICAg ICAgICAgIDs7IEVpdGhlciBpdCBpcyBhbiBlbXB0eSBBTFQgZmllbGQuIFRoZW4gd2UgaGF2ZSBj aGVja2VkCisgICAgICAgICAgICAgICAgICAgICAgIDs7IGFscmVhZHkgdGhhdCB3ZSBoYXZlIG9u ZSBub24tZW1wdHkgYWx0ZXJuYXRpdmUuIE9yIGl0CisgICAgICAgICAgICAgICAgICAgICAgIDs7 IGlzIGFuIGVtcHR5IE9QVCBmaWVsZCB0aGF0IHdlIGRvIG5vdCBtaXNzIGFueXdheS4KKyAgICAg ICAgICAgICAgICAgICAgICAgOzsgU28gd2UgY2FuIHNhZmVseSBkZWxldGUgdGhpcyBmaWVsZC4K KyAgICAgICAgICAgICAgICAgICAgICAgKGRlbGV0ZS1yZWdpb24gYmVnLWZpZWxkIGVuZC1maWVs ZCkKKyAgICAgICAgICAgICAgICAgICAgICAgKHNldHEgZGVsZXRlZCB0KSkKKyAgICAgICAgICAg ICAgICAgICAgICA7OyBvdGhlcndpc2U6IG5vdCBlbXB0eSwgZGVsZXRlICJPUFQiIG9yICJBTFQi CisgICAgICAgICAgICAgICAgICAgICAgKG9wdC1hbHQKKyAgICAgICAgICAgICAgICAgICAgICAg KGdvdG8tY2hhciBiZWctbmFtZSkKKyAgICAgICAgICAgICAgICAgICAgICAgKGRlbGV0ZS1jaGFy IDMpKSkpCiAKICAgICAgICAgICAgICh1bmxlc3MgZGVsZXRlZAogICAgICAgICAgICAgICAocHVz aCBmaWVsZC1uYW1lIGZpZWxkLWxpc3QpCkBAIC0xOTAyLDggKzE5MTcsNyBAQAogICAgICAgICAg ICAgICA7OyBpZiBlbXB0eSBmaWVsZCwgY29tcGxhaW4KICAgICAgICAgICAgICAgKGlmIChhbmQg ZW1wdHktZmllbGQKICAgICAgICAgICAgICAgICAgICAgICAgKG1lbXEgJ3JlcXVpcmVkLWZpZWxk cyBmb3JtYXQpCi0gICAgICAgICAgICAgICAgICAgICAgIChhc3NvYy1pZ25vcmUtY2FzZSBmaWVs ZC1uYW1lCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoaWYgY3Jv c3NyZWYta2V5IGNyZXEgcmVxKSkpCisgICAgICAgICAgICAgICAgICAgICAgIChhc3NvYy1pZ25v cmUtY2FzZSBmaWVsZC1uYW1lIHJlcS1maWVsZC1saXN0KSkKICAgICAgICAgICAgICAgICAgIChl cnJvciAiTWFuZGF0b3J5IGZpZWxkIGAlcycgaXMgZW1wdHkiIGZpZWxkLW5hbWUpKQogCiAgICAg ICAgICAgICAgIDs7IHVuaWZ5IGNhc2Ugb2YgZmllbGQgbmFtZQpAQCAtMTkyNSw4ICsxOTM5LDgg QEAKIAogICAgICAgICA7OyBjaGVjayB3aGV0aGVyIGFsbCByZXF1aXJlZCBmaWVsZHMgYXJlIHBy ZXNlbnQKICAgICAgICAgKGlmIChtZW1xICdyZXF1aXJlZC1maWVsZHMgZm9ybWF0KQotICAgICAg ICAgICAgKGxldCAoYWx0bGlzdCAoZm91bmQgMCkpCi0gICAgICAgICAgICAgIChkb2xpc3QgKGZu YW1lIChpZiBjcm9zc3JlZi1rZXkgY3JlcSByZXEpKQorICAgICAgICAgICAgKGxldCAoKGZvdW5k IDApIGFsdGxpc3QpCisgICAgICAgICAgICAgIChkb2xpc3QgKGZuYW1lIHJlcS1maWVsZC1saXN0 KQogICAgICAgICAgICAgICAgIChpZiAobnRoIDMgZm5hbWUpCiAgICAgICAgICAgICAgICAgICAg IChwdXNoIChjYXIgZm5hbWUpIGFsdGxpc3QpKQogICAgICAgICAgICAgICAgICh1bmxlc3MgKG9y IChtZW1iZXIgKGNhciBmbmFtZSkgZmllbGQtbGlzdCkKQEAgLTE5NDAsNyArMTk1NCw3IEBACiAg ICAgICAgICAgICAgICAgICAgICAgIChlcnJvciAiQWx0ZXJuYXRpdmUgbWFuZGF0b3J5IGZpZWxk IGAlcycgaXMgbWlzc2luZyIKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFsdGxpc3Qp KQogICAgICAgICAgICAgICAgICAgICAgICgoPiBmb3VuZCAxKQotICAgICAgICAgICAgICAgICAg ICAgICAoZXJyb3IgIkFsdGVybmF0aXZlIGZpZWxkcyBgJXMnIGlzIGRlZmluZWQgJXMgdGltZXMi CisgICAgICAgICAgICAgICAgICAgICAgIChlcnJvciAiQWx0ZXJuYXRpdmUgZmllbGRzIGAlcycg YXJlIGRlZmluZWQgJXMgdGltZXMiCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhbHRs aXN0IGZvdW5kKSkpKSkpCiAKICAgICAgICAgOzsgdXBkYXRlIHBvaW50CkBAIC0yMDUxLDggKzIw NjUsOCBAQAogICAgICAgICAgICAgKHNldHEgdGl0bGVzdHJpbmcgKHN1YnN0cmluZyB0aXRsZXN0 cmluZyAwIChtYXRjaC1iZWdpbm5pbmcgMCkpKSkpKQogICAgIDs7IGdhdGhlciB3b3JkcyBmcm9t IHRpdGxlc3RyaW5nIGludG8gYSBsaXN0LiBJZ25vcmUKICAgICA7OyBzcGVjaWZpYyB3b3JkcyBh bmQgdXNlIG9ubHkgYSBzcGVjaWZpYyBhbW91bnQgb2Ygd29yZHMuCi0gICAgKGxldCAoY2FzZS1m b2xkLXNlYXJjaCB0aXRsZXdvcmRzIHRpdGxld29yZHMtZXh0cmEgdGl0bGV3b3JkIGVuZC1tYXRj aAotICAgICAgICAgICAgICAgICAgICAgICAgICAgKGNvdW50ZXIgMCkpCisgICAgKGxldCAoKGNv dW50ZXIgMCkKKyAgICAgICAgICBjYXNlLWZvbGQtc2VhcmNoIHRpdGxld29yZHMgdGl0bGV3b3Jk cy1leHRyYSB0aXRsZXdvcmQgZW5kLW1hdGNoKQogICAgICAgKHdoaWxlIChhbmQgKG9yIChub3Qg KG51bWJlcnAgYmlidGV4LWF1dG9rZXktdGl0bGV3b3JkcykpCiAgICAgICAgICAgICAgICAgICAg ICAgKDwgY291bnRlciAoKyBiaWJ0ZXgtYXV0b2tleS10aXRsZXdvcmRzCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBiaWJ0ZXgtYXV0b2tleS10aXRsZXdvcmRzLXN0cmV0Y2gp KSkKQEAgLTIwNzksMTAgKzIwOTMsMTQgQEAKICAgIkRvIHNvbWUgYWJicmV2aWF0aW9ucyBvbiBU SVRMRVdPUkQuCiBUaGUgcnVsZXMgYXJlIGRlZmluZWQgaW4gYGJpYnRleC1hdXRva2V5LXRpdGxl d29yZC1hYmJyZXZzJwogYW5kIGBiaWJ0ZXgtYXV0b2tleS10aXRsZXdvcmQtbGVuZ3RoJy4iCi0g IChsZXQgKChhYmJyZXYgKGJpYnRleC1hc3NvYy1vZi1yZWdleHAKLSAgICAgICAgICAgICAgICAg dGl0bGV3b3JkIGJpYnRleC1hdXRva2V5LXRpdGxld29yZC1hYmJyZXZzKSkpCi0gICAgKGlmIGFi YnJldgotICAgICAgICAoY2RyIGFiYnJldikKKyAgKGxldCAoKGNhc2UtZm9sZGUtc2VhcmNoIHQp CisgICAgICAgIChhbGlzdCBiaWJ0ZXgtYXV0b2tleS10aXRsZXdvcmQtYWJicmV2cykpCisgICAg KHdoaWxlIChhbmQgYWxpc3QKKyAgICAgICAgICAgICAgICAobm90IChzdHJpbmctbWF0Y2ggKGNv bmNhdCAiXFxgXFwoPzoiIChjYWFyIGFsaXN0KSAiXFwpXFwnIikKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgdGl0bGV3b3JkKSkpCisgICAgICAoc2V0cSBhbGlzdCAoY2RyIGFs aXN0KSkpCisgICAgKGlmIGFsaXN0CisgICAgICAgIChjZGFyIGFsaXN0KQogICAgICAgKGJpYnRl eC1hdXRva2V5LWFiYnJldiB0aXRsZXdvcmQKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg YmlidGV4LWF1dG9rZXktdGl0bGV3b3JkLWxlbmd0aCkpKSkKIApAQCAtMjM4NCw2ICsyNDAyLDcg QEAKICAgICAgICAgICAgICAoZGlzcGxheS1jb21wbGV0aW9uLWxpc3QgKGFsbC1jb21wbGV0aW9u cyBwYXJ0LW9mLXdvcmQKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBjb21wbGV0aW9ucykpKQogICAgICAgICAgICAobWVzc2FnZSAiTWFraW5n IGNvbXBsZXRpb24gbGlzdC4uLmRvbmUiKQorICAgICAgICAgICA7OyByZXR1cm4gdmFsdWUgaXMg aGFuZGxlZCBieSBjaG9vc2UtY29tcGxldGlvbi1zdHJpbmctZnVuY3Rpb25zCiAgICAgICAgICAg IG5pbCkpKSkKIAogKGRlZnVuIGJpYnRleC1jb21wbGV0ZS1zdHJpbmctY2xlYW51cCAoc3RyKQpA QCAtMjYyOSw2ICsyNjQ4LDM0IEBACiAgIChlYXN5LW1lbnUtYWRkIGJpYnRleC1lbnRyeS1tZW51 KQogICAocnVuLWhvb2tzICdiaWJ0ZXgtbW9kZS1ob29rKSkKIAorKGRlZnVuIGJpYnRleC1maWVs ZC1saXN0IChlbnRyeS10eXBlKQorICAiUmV0dXJuIGxpc3Qgb2YgYWxsb3dlZCBmaWVsZHMgZm9y IGVudHJ5IEVOVFJZLVRZUEUuCitNb3JlIHNwZWNpZmljYWxseSwgdGhlIHJldHVybiB2YWx1ZSBp cyBhIGNvbnMgcGFpciAoUkVRVUlSRUQgLiBPUFRJT05BTCksCit3aGVyZSBSRVFVSVJFRCBhbmQg T1BUSU9OQUwgYXJlIGxpc3RzIG9mIHRoZSByZXF1aXJlZCBhbmQgb3B0aW9uYWwgZmllbGQKK25h bWVzIGZvciBFTlRSWS1UWVBFIGFjY29yZGluZyB0byBgYmlidGV4LWVudHJ5LWZpZWxkLWFsaXN0 Jy4iCisgIChsZXQgKChlIChhc3NvYy1pZ25vcmUtY2FzZSBlbnRyeS10eXBlIGJpYnRleC1lbnRy eS1maWVsZC1hbGlzdCkpCisgICAgICAgIHJlcXVpcmVkIG9wdGlvbmFsKQorICAgICh1bmxlc3Mg ZQorICAgICAgKGVycm9yICJCaWJ0ZXggZW50cnkgdHlwZSAlcyBub3QgZGVmaW5lZCIgZW50cnkt dHlwZSkpCisgICAgKGlmIChhbmQgKG1lbWJlci1pZ25vcmUtY2FzZSBlbnRyeS10eXBlIGJpYnRl eC1pbmNsdWRlLU9QVGNyb3NzcmVmKQorICAgICAgICAgICAgIChudGggMiBlKSkKKyAgICAgICAg KHNldHEgcmVxdWlyZWQgKG50aCAwIChudGggMiBlKSkKKyAgICAgICAgICAgICAgb3B0aW9uYWwg KG50aCAxIChudGggMiBlKSkpCisgICAgICAoc2V0cSByZXF1aXJlZCAobnRoIDAgKG50aCAxIGUp KQorICAgICAgICAgICAgb3B0aW9uYWwgKG50aCAxIChudGggMSBlKSkpKQorICAgIChpZiBiaWJ0 ZXgtaW5jbHVkZS1PUFRrZXkKKyAgICAgICAgKHB1c2ggKGxpc3QgImtleSIKKyAgICAgICAgICAg ICAgICAgICAgIlVzZWQgZm9yIHJlZmVyZW5jZSBrZXkgY3JlYXRpb24gaWYgYXV0aG9yIGFuZCBl ZGl0b3IgZmllbGRzIGFyZSBtaXNzaW5nIgorICAgICAgICAgICAgICAgICAgICAoaWYgKG9yIChz dHJpbmdwIGJpYnRleC1pbmNsdWRlLU9QVGtleSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAoZmJvdW5kcCBiaWJ0ZXgtaW5jbHVkZS1PUFRrZXkpKQorICAgICAgICAgICAgICAgICAgICAg ICAgYmlidGV4LWluY2x1ZGUtT1BUa2V5KSkKKyAgICAgICAgICAgICAgb3B0aW9uYWwpKQorICAg IChpZiAobWVtYmVyLWlnbm9yZS1jYXNlIGVudHJ5LXR5cGUgYmlidGV4LWluY2x1ZGUtT1BUY3Jv c3NyZWYpCisgICAgICAgIChwdXNoICcoImNyb3NzcmVmIiAiUmVmZXJlbmNlIGtleSBvZiB0aGUg Y3Jvc3MtcmVmZXJlbmNlZCBlbnRyeSIpCisgICAgICAgICAgICAgIG9wdGlvbmFsKSkKKyAgICAo c2V0cSBvcHRpb25hbCAoYXBwZW5kIG9wdGlvbmFsIGJpYnRleC11c2VyLW9wdGlvbmFsLWZpZWxk cykpCisgICAgKGNvbnMgcmVxdWlyZWQgb3B0aW9uYWwpKSkKKwogKGRlZnVuIGJpYnRleC1lbnRy eSAoZW50cnktdHlwZSkKICAgIkluc2VydCBhIG5ldyBCaWJUZVggZW50cnkuCiBBZnRlciBpbnNl cnRpb24gaXQgY2FsbHMgdGhlIGZ1bmN0aW9ucyBpbiBgYmlidGV4LWFkZC1lbnRyeS1ob29rJy4i CkBAIC0yNjM4LDM4ICsyNjg1LDE3IEBACiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYmli dGV4LWVudHJ5LWZpZWxkLWFsaXN0CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbmlsIHQg bmlsICdiaWJ0ZXgtZW50cnktdHlwZS1oaXN0b3J5KSkpCiAgICAgICAgICAgICAgICAgIChsaXN0 IGUtdCkpKQotICAobGV0KiAocmVxdWlyZWQgb3B0aW9uYWwKLSAgICAgICAgIChrZXkgKGlmIGJp YnRleC1tYWludGFpbi1zb3J0ZWQtZW50cmllcwotICAgICAgICAgICAgICAgICAgKGJpYnRleC1y ZWFkLWtleSAoZm9ybWF0ICIlcyBrZXk6ICIgZW50cnktdHlwZSkpKSkKLSAgICAgICAgIChlIChh c3NvYy1pZ25vcmUtY2FzZSBlbnRyeS10eXBlIGJpYnRleC1lbnRyeS1maWVsZC1hbGlzdCkpCi0g ICAgICAgICAoci1uLW8gKGVsdCBlIDEpKQotICAgICAgICAgKGMtcmVmIChlbHQgZSAyKSkpCi0g ICAgKGlmIChub3QgZSkKLSAgICAgICAgKGVycm9yICJCaWJ0ZXggZW50cnkgdHlwZSAlcyBub3Qg ZGVmaW5lZCIgZW50cnktdHlwZSkpCi0gICAgKGlmIChhbmQgKG1lbWJlciBlbnRyeS10eXBlIGJp YnRleC1pbmNsdWRlLU9QVGNyb3NzcmVmKQotICAgICAgICAgICAgIGMtcmVmKQotICAgICAgICAo c2V0cSByZXF1aXJlZCAoZWx0IGMtcmVmIDApCi0gICAgICAgICAgICAgIG9wdGlvbmFsIChlbHQg Yy1yZWYgMSkpCi0gICAgICAoc2V0cSByZXF1aXJlZCAoZWx0IHItbi1vIDApCi0gICAgICAgICAg ICBvcHRpb25hbCAoZWx0IHItbi1vIDEpKSkKKyAgKGxldCAoKGtleSAoaWYgYmlidGV4LW1haW50 YWluLXNvcnRlZC1lbnRyaWVzCisgICAgICAgICAgICAgICAgIChiaWJ0ZXgtcmVhZC1rZXkgKGZv cm1hdCAiJXMga2V5OiAiIGVudHJ5LXR5cGUpKSkpCisgICAgICAgIChmaWVsZC1saXN0IChiaWJ0 ZXgtZmllbGQtbGlzdCBlbnRyeS10eXBlKSkpCiAgICAgKHVubGVzcyAoYmlidGV4LXByZXBhcmUt bmV3LWVudHJ5IChsaXN0IGtleSBuaWwgZW50cnktdHlwZSkpCiAgICAgICAoZXJyb3IgIkVudHJ5 IHdpdGgga2V5IGAlcycgYWxyZWFkeSBleGlzdHMiIGtleSkpCiAgICAgKGluZGVudC10by1jb2x1 bW4gYmlidGV4LWVudHJ5LW9mZnNldCkKICAgICAoaW5zZXJ0ICJAIiBlbnRyeS10eXBlIChiaWJ0 ZXgtZW50cnktbGVmdC1kZWxpbWl0ZXIpKQotICAgIChpZiBrZXkKLSAgICAgICAgKGluc2VydCBr ZXkpKQorICAgIChpZiBrZXkgKGluc2VydCBrZXkpKQogICAgIChzYXZlLWV4Y3Vyc2lvbgotICAg ICAgKG1hcGNhciAnYmlidGV4LW1ha2UtZmllbGQgcmVxdWlyZWQpCi0gICAgICAoaWYgKG1lbWJl ciBlbnRyeS10eXBlIGJpYnRleC1pbmNsdWRlLU9QVGNyb3NzcmVmKQotICAgICAgICAgIChiaWJ0 ZXgtbWFrZS1vcHRpb25hbC1maWVsZCAnKCJjcm9zc3JlZiIpKSkKLSAgICAgIChpZiBiaWJ0ZXgt aW5jbHVkZS1PUFRrZXkKLSAgICAgICAgICAoaWYgKG9yIChzdHJpbmdwIGJpYnRleC1pbmNsdWRl LU9QVGtleSkKLSAgICAgICAgICAgICAgICAgIChmYm91bmRwIGJpYnRleC1pbmNsdWRlLU9QVGtl eSkpCi0gICAgICAgICAgICAgIChiaWJ0ZXgtbWFrZS1vcHRpb25hbC1maWVsZAotICAgICAgICAg ICAgICAgKGxpc3QgImtleSIgbmlsIGJpYnRleC1pbmNsdWRlLU9QVGtleSkpCi0gICAgICAgICAg ICAoYmlidGV4LW1ha2Utb3B0aW9uYWwtZmllbGQgJygia2V5IikpKSkKLSAgICAgIChtYXBjYXIg J2JpYnRleC1tYWtlLW9wdGlvbmFsLWZpZWxkIG9wdGlvbmFsKQotICAgICAgKG1hcGNhciAnYmli dGV4LW1ha2Utb3B0aW9uYWwtZmllbGQgYmlidGV4LXVzZXItb3B0aW9uYWwtZmllbGRzKQorICAg ICAgKG1hcGNhciAnYmlidGV4LW1ha2UtZmllbGQgKGNhciBmaWVsZC1saXN0KSkKKyAgICAgICht YXBjYXIgJ2JpYnRleC1tYWtlLW9wdGlvbmFsLWZpZWxkIChjZHIgZmllbGQtbGlzdCkpCiAgICAg ICAoaWYgYmlidGV4LWNvbW1hLWFmdGVyLWxhc3QtZmllbGQKICAgICAgICAgICAoaW5zZXJ0ICIs IikpCiAgICAgICAoaW5zZXJ0ICJcbiIpCkBAIC0yNjgwLDEwICsyNzA2LDMxIEBACiAJKGJpYnRl eC1hdXRvZmlsbC1lbnRyeSkpCiAgICAgKHJ1bi1ob29rcyAnYmlidGV4LWFkZC1lbnRyeS1ob29r KSkpCiAKKyhkZWZ1biBiaWJ0ZXgtZW50cnktdXBkYXRlICgpCisgICJVcGRhdGUgYW4gZXhpc3Rp bmcgQmliVGVYIGVudHJ5LgorSW4gdGhlIEJpYlRlWCBlbnRyeSBhdCBwb2ludCwgbWFrZSBuZXcg ZmllbGRzIGZvciB0aG9zZSBpdGVtcyB0aGF0IG1heSBvY2N1cgorYWNjb3JkaW5nIHRvIGBiaWJ0 ZXgtZW50cnktZmllbGQtYWxpc3QnLCBidXQgYXJlIG5vdCB5ZXQgcHJlc2VudC4iCisgIChpbnRl cmFjdGl2ZSkKKyAgKHNhdmUtZXhjdXJzaW9uCisgICAgKGJpYnRleC1iZWdpbm5pbmctb2YtZW50 cnkpCisgICAgOzsgRm9yIGluc2VydGluZyBuZXcgZmllbGRzLCB3ZSB1c2UgdGhlIGZhY3QgdGhh dAorICAgIDs7IGJpYnRleC1wYXJzZS1lbnRyeSBtb3ZlcyBwb2ludCB0byB0aGUgZW5kIG9mIHRo ZSBsYXN0IGZpZWxkLgorICAgIChsZXQqICgoZmllbGRzLWFsaXN0IChiaWJ0ZXgtcGFyc2UtZW50 cnkpKQorICAgICAgICAgICAoZmllbGQtbGlzdCAoYmlidGV4LWZpZWxkLWxpc3QKKyAgICAgICAg ICAgICAgICAgICAgICAgIChzdWJzdHJpbmcgKGNkciAoYXNzb2MgIj10eXBlPSIgZmllbGRzLWFs aXN0KSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMSkpKSkgOyBkb24ndCB3 YW50IEAKKyAgICAgIChkb2xpc3QgKGZpZWxkIChjYXIgZmllbGQtbGlzdCkpCisgICAgICAgICh1 bmxlc3MgKGFzc29jLWlnbm9yZS1jYXNlIChjYXIgZmllbGQpIGZpZWxkcy1hbGlzdCkKKyAgICAg ICAgICAoYmlidGV4LW1ha2UtZmllbGQgZmllbGQpKSkKKyAgICAgIChkb2xpc3QgKGZpZWxkIChj ZHIgZmllbGQtbGlzdCkpCisgICAgICAgICh1bmxlc3MgKGFzc29jLWlnbm9yZS1jYXNlIChjYXIg ZmllbGQpIGZpZWxkcy1hbGlzdCkKKyAgICAgICAgICAoYmlidGV4LW1ha2Utb3B0aW9uYWwtZmll bGQgZmllbGQpKSkpKSkKKwogKGRlZnVuIGJpYnRleC1wYXJzZS1lbnRyeSAoKQogICAiUGFyc2Ug ZW50cnkgYXQgcG9pbnQsIHJldHVybiBhbiBhbGlzdC4KIFRoZSBhbGlzdCBlbGVtZW50cyBoYXZl IHRoZSBmb3JtIChGSUVMRCAuIFRFWFQpLCB3aGVyZSBGSUVMRCBjYW4gYWxzbyBiZQotdGhlIHNw ZWNpYWwgc3RyaW5ncyBcIj10eXBlPVwiIGFuZCBcIj1rZXk9XCIuIgordGhlIHNwZWNpYWwgc3Ry aW5ncyBcIj10eXBlPVwiIGFuZCBcIj1rZXk9XCIuCitNb3ZlIHBvaW50IHRvIHRoZSBlbmQgb2Yg dGhlIGxhc3QgZmllbGQuIgogICAobGV0IChhbGlzdCBib3VuZHMpCiAgICAgKHdoZW4gKGxvb2tp bmctYXQgYmlidGV4LWVudHJ5LWhlYWQpCiAgICAgICAocHVzaCAoY29ucyAiPXR5cGU9IiAobWF0 Y2gtc3RyaW5nIGJpYnRleC10eXBlLWluLWhlYWQpKSBhbGlzdCkKQEAgLTI3NzQsMjggKzI4MjEs MTQgQEAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGxvb2tpbmctYXQgIk9Q VFxcfEFMVCIpKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgIChtYXRjaC1lbmQgMCkgbWIp CiAgICAgICAgICAgICAgICAgICAgICAgICAoYmlidGV4LWVuZC1vZi1uYW1lLWluLWZpZWxkIGJv dW5kcykpKQotICAgICAgICAgICAoZW50cnktdHlwZSAocHJvZ24gKHJlLXNlYXJjaC1iYWNrd2Fy ZAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJpYnRleC1lbnRyeS1tYXliZS1lbXB0 eS1oZWFkIG5pbCB0KQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGJpYnRleC10eXBl LWluLWhlYWQpKSkKLSAgICAgICAgICAgKGVudHJ5LWxpc3QgKGFzc29jLWlnbm9yZS1jYXNlIGVu dHJ5LXR5cGUKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJpYnRl eC1lbnRyeS1maWVsZC1hbGlzdCkpCi0gICAgICAgICAgIChjLXItbGlzdCAoZWx0IGVudHJ5LWxp c3QgMikpCi0gICAgICAgICAgIChyZXEtb3B0LWxpc3QgKGlmIChhbmQgKG1lbWJlciBlbnRyeS10 eXBlCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBiaWJ0ZXgtaW5j bHVkZS1PUFRjcm9zc3JlZikKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjLXIt bGlzdCkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYy1yLWxpc3QKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgIChlbHQgZW50cnktbGlzdCAxKSkpCi0gICAgICAgICAgIChsaXN0LW9m LWVudHJpZXMgKGFwcGVuZCAoZWx0IHJlcS1vcHQtbGlzdCAwKQotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgKGVsdCByZXEtb3B0LWxpc3QgMSkKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGJpYnRleC11c2VyLW9wdGlvbmFsLWZpZWxkcwotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgKGlmIChtZW1iZXIgZW50cnktdHlwZQotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYmlidGV4LWluY2x1ZGUt T1BUY3Jvc3NyZWYpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJygo ImNyb3NzcmVmIiAiUmVmZXJlbmNlIGtleSBvZiB0aGUgY3Jvc3MtcmVmZXJlbmNlZCBlbnRyeSIp KSkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChpZiBiaWJ0ZXgtaW5jbHVk ZS1PUFRrZXkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnKCgia2V5 IiAiVXNlZCBmb3IgcmVmZXJlbmNlIGtleSBjcmVhdGlvbiBpZiBhdXRob3IgYW5kIGVkaXRvciBm aWVsZHMgYXJlIG1pc3NpbmciKSkpKSkKLSAgICAgICAgICAgKGNvbW1lbnQgKGFzc29jLWlnbm9y ZS1jYXNlIGZpZWxkLW5hbWUgbGlzdC1vZi1lbnRyaWVzKSkpCisgICAgICAgICAgIChmaWVsZC1s aXN0IChiaWJ0ZXgtZmllbGQtbGlzdCAocHJvZ24gKHJlLXNlYXJjaC1iYWNrd2FyZAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBiaWJ0ZXgtZW50cnkt bWF5YmUtZW1wdHktaGVhZCBuaWwgdCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAoYmlidGV4LXR5cGUtaW4taGVhZCkpKSkKKyAgICAgICAgICAgKGNv bW1lbnQgKGFzc29jLWlnbm9yZS1jYXNlIGZpZWxkLW5hbWUKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIChhcHBlbmQgKGNhciBmaWVsZC1saXN0KQorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoY2RyIGZpZWxkLWxpc3QpKSkpKQog ICAgICAgKGlmIGNvbW1lbnQKLSAgICAgICAgICAobWVzc2FnZSAoZWx0IGNvbW1lbnQgMSkpCisg ICAgICAgICAgKG1lc3NhZ2UgKG50aCAxIGNvbW1lbnQpKQogICAgICAgICAobWVzc2FnZSAiTm8g Y29tbWVudCBhdmFpbGFibGUiKSkpKSkKIAogKGRlZnVuIGJpYnRleC1tYWtlLWZpZWxkIChmaWVs ZCAmb3B0aW9uYWwgY2FsbGVkLWJ5LXlhbmspCkBAIC0yODA0LDI0ICsyODM3LDEzIEBACiBcKEZJ RUxELU5BTUUgQ09NTUVOVC1TVFJJTkcgSU5JVCBBTFRFUk5BVElWRS1GTEFHKSBhcyBpbgogYGJp YnRleC1lbnRyeS1maWVsZC1hbGlzdCcuIgogICAoaW50ZXJhY3RpdmUKLSAgIChsaXN0IChsZXQq ICgoZW50cnktdHlwZQotICAgICAgICAgICAgICAgICAoc2F2ZS1leGN1cnNpb24KLSAgICAgICAg ICAgICAgICAgICAoYmlidGV4LWVuY2xvc2luZy1lbnRyeS1tYXliZS1lbXB0eS1oZWFkKQotICAg ICAgICAgICAgICAgICAgIChiaWJ0ZXgtdHlwZS1pbi1oZWFkKSkpCi0gICAgICAgICAgICAgICAg OzsgInByZWxpbWluYXJ5IiBjb21wbGV0aW9uIGxpc3QKLSAgICAgICAgICAgICAgICAoZmwgKG50 aCAxIChhc3NvYy1pZ25vcmUtY2FzZQotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVudHJ5 LXR5cGUgYmlidGV4LWVudHJ5LWZpZWxkLWFsaXN0KSkpCi0gICAgICAgICAgICAgICAgOzsgImZ1 bGwiIGNvbXBsZXRpb24gbGlzdAotICAgICAgICAgICAgICAgIChmaWVsZC1saXN0IChhcHBlbmQg KG50aCAwIGZsKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKG50aCAxIGZs KQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYmlidGV4LXVzZXItb3B0aW9u YWwtZmllbGRzCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoaWYgKG1lbWJl ciBlbnRyeS10eXBlCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBiaWJ0ZXgtaW5jbHVkZS1PUFRjcm9zc3JlZikKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAnKCgiY3Jvc3NyZWYiKSkpCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAoaWYgYmlidGV4LWluY2x1ZGUtT1BUa2V5Ci0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgJygoImtleSIpKSkpKQotICAgICAgICAgICAgICAgIChj b21wbGV0aW9uLWlnbm9yZS1jYXNlIHQpKQotICAgICAgICAgICAoY29tcGxldGluZy1yZWFkICJC aWJUZVggZmllbGQgbmFtZTogIiBmaWVsZC1saXN0CisgICAobGlzdCAobGV0ICgoY29tcGxldGlv bi1pZ25vcmUtY2FzZSB0KQorICAgICAgICAgICAgICAgKGZpZWxkLWxpc3QgKGJpYnRleC1maWVs ZC1saXN0CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChzYXZlLWV4Y3Vyc2lvbgorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIChiaWJ0ZXgtZW5jbG9zaW5nLWVudHJ5LW1heWJl LWVtcHR5LWhlYWQpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGJpYnRleC10eXBl LWluLWhlYWQpKSkpKQorICAgICAgICAgICAoY29tcGxldGluZy1yZWFkICJCaWJUZVggZmllbGQg bmFtZTogIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgIChhcHBlbmQgKGNhciBmaWVsZC1s aXN0KSAoY2RyIGZpZWxkLWxpc3QpKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5pbCBu aWwgbmlsIGJpYnRleC1maWVsZC1oaXN0b3J5KSkpKQogICAodW5sZXNzIChjb25zcCBmaWVsZCkK ICAgICAoc2V0cSBmaWVsZCAobGlzdCBmaWVsZCkpKQpAQCAtMjg0OCw4ICsyODcwLDkgQEAKICAg ICAgICAgICAoKGZib3VuZHAgaW5pdCkKICAgICAgICAgICAgKGluc2VydCAoZnVuY2FsbCBpbml0 KSkpKSkKICAgKGlmIChub3QgY2FsbGVkLWJ5LXlhbmspIChpbnNlcnQgKGJpYnRleC1maWVsZC1y aWdodC1kZWxpbWl0ZXIpKSkKLSAgKGlmIChpbnRlcmFjdGl2ZS1wKQotICAgICAgKGZvcndhcmQt Y2hhciAtMSkpKQorICAod2hlbiAoaW50ZXJhY3RpdmUtcCkKKyAgICAoZm9yd2FyZC1jaGFyIC0x KQorICAgIChiaWJ0ZXgtcHJpbnQtaGVscC1tZXNzYWdlKSkpCiAKIChkZWZ1biBiaWJ0ZXgtYmVn aW5uaW5nLW9mLWVudHJ5ICgpCiAgICJNb3ZlIHRvIGJlZ2lubmluZyBvZiBCaWJUZVggZW50cnkg KGJlZ2lubmluZyBvZiBsaW5lKS4KQEAgLTI5ODIsMTMgKzMwMDUsMTQgQEAKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAiXFwoT1BUXFwpP2Nyb3NzcmVmIiB0KSkpCiAgICAgICAgICAg ICAgICAgICAobGlzdCBrZXkKICAgICAgICAgICAgICAgICAgICAgICAgIChpZiBib3VuZHMgKGJp YnRleC10ZXh0LWluLWZpZWxkLWJvdW5kcyBib3VuZHMgdCkpCi0gICAgICAgICAgICAgICAgICAg ICAgICBlbnRyeS1uYW1lKSkpKQotICAgICAgICAgIChsaXN0IGtleSBuaWwgZW50cnktbmFtZSkp KSkpCisgICAgICAgICAgICAgICAgICAgICAgICBlbnRyeS1uYW1lKSkpCisgICAgICAgICAgICAo bGlzdCBrZXkgbmlsIGVudHJ5LW5hbWUpKSkpKSkKIAogKGRlZnVuIGJpYnRleC1sZXNzcCAoaW5k ZXgxIGluZGV4MikKICAgIlByZWRpY2F0ZSBmb3Igc29ydGluZyBCaWJUZVggZW50cmllcyB3aXRo IGluZGljZXMgSU5ERVgxIGFuZCBJTkRFWDIuCiBFYWNoIGluZGV4IGlzIGEgbGlzdCAoS0VZIENS T1NTUkVGLUtFWSBFTlRSWS1OQU1FKS4KLVRoZSBwcmVkaWNhdGUgZGVwZW5kcyBvbiB0aGUgdmFy aWFibGUgYGJpYnRleC1tYWludGFpbi1zb3J0ZWQtZW50cmllcycuIgorVGhlIHByZWRpY2F0ZSBk ZXBlbmRzIG9uIHRoZSB2YXJpYWJsZSBgYmlidGV4LW1haW50YWluLXNvcnRlZC1lbnRyaWVzJy4K K0lmIGl0cyB2YWx1ZSBpcyBuaWwgdXNlIHBsYWluIHNvcnRpbmcuIgogICAoY29uZCAoKG5vdCBp bmRleDEpIChub3QgaW5kZXgyKSkgOyBpbmRpY2VzIGNhbiBiZSBuaWwKICAgICAgICAgKChub3Qg aW5kZXgyKSBuaWwpCiAgICAgICAgICgoZXF1YWwgYmlidGV4LW1haW50YWluLXNvcnRlZC1lbnRy aWVzICdjcm9zc3JlZikK --SwpkivQnVc Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Emacs-devel mailing list Emacs-devel@gnu.org http://mail.gnu.org/mailman/listinfo/emacs-devel --SwpkivQnVc--