From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.bugs Subject: bug#23425: master branch: `message' wrongly corrupts ' to curly quote. Date: Wed, 4 May 2016 16:49:12 -0700 Organization: UCLA Computer Science Department Message-ID: References: <7e599cf6-18c3-1633-33d5-e9f4eaa8fe6a@cs.ucla.edu> <20160502191031.GB2048@acm.fritz.box> <83a8k7kv87.fsf@gnu.org> <20160503162716.GB11330@acm.fritz.box> <831t5jkrn2.fsf@gnu.org> <20160503200330.GC11330@acm.fritz.box> <83twidj0tj.fsf@gnu.org> <20160504164849.GA31717@acm.fritz.box> <83d1p1iwls.fsf@gnu.org> <20160504180417.GB31717@acm.fritz.box> <4019c1e5-36b4-745f-b299-16b074bff81e@cs.ucla.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------C8C8849F4CE3D283D86F2980" X-Trace: ger.gmane.org 1462405859 29339 80.91.229.3 (4 May 2016 23:50:59 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 4 May 2016 23:50:59 +0000 (UTC) Cc: 23425@debbugs.gnu.org To: Alan Mackenzie , Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu May 05 01:50:43 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ay6Z1-0004TE-3K for geb-bug-gnu-emacs@m.gmane.org; Thu, 05 May 2016 01:50:43 +0200 Original-Received: from localhost ([::1]:50804 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ay6Yx-0003PM-3h for geb-bug-gnu-emacs@m.gmane.org; Wed, 04 May 2016 19:50:39 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60848) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ay6Yb-0002yv-NP for bug-gnu-emacs@gnu.org; Wed, 04 May 2016 19:50:34 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ay6YP-0001HP-9K for bug-gnu-emacs@gnu.org; Wed, 04 May 2016 19:50:12 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:54400) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ay6YP-0001Dc-5L for bug-gnu-emacs@gnu.org; Wed, 04 May 2016 19:50:05 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ay6YL-00054u-MX for bug-gnu-emacs@gnu.org; Wed, 04 May 2016 19:50:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Paul Eggert Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 04 May 2016 23:50:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 23425 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 23425-submit@debbugs.gnu.org id=B23425.146240576319471 (code B ref 23425); Wed, 04 May 2016 23:50:01 +0000 Original-Received: (at 23425) by debbugs.gnu.org; 4 May 2016 23:49:23 +0000 Original-Received: from localhost ([127.0.0.1]:38504 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ay6Xi-00053y-WC for submit@debbugs.gnu.org; Wed, 04 May 2016 19:49:23 -0400 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:42147) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ay6Xg-00053k-KZ for 23425@debbugs.gnu.org; Wed, 04 May 2016 19:49:21 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id AE583160633; Wed, 4 May 2016 16:49:14 -0700 (PDT) Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id WFQZQVIwO9se; Wed, 4 May 2016 16:49:13 -0700 (PDT) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 6938B16120B; Wed, 4 May 2016 16:49:13 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id poH5Nr2RbrhH; Wed, 4 May 2016 16:49:13 -0700 (PDT) Original-Received: from penguin.cs.ucla.edu (Penguin.CS.UCLA.EDU [131.179.64.200]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 49E23160633; Wed, 4 May 2016 16:49:13 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.0 In-Reply-To: <4019c1e5-36b4-745f-b299-16b074bff81e@cs.ucla.edu> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:117823 Archived-At: This is a multi-part message in MIME format. --------------C8C8849F4CE3D283D86F2980 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 05/04/2016 11:39 AM, Paul Eggert wrote: > > I plan to look into the further change you proposed, with an eye > toward installing something like it (but I hope simpler) Attached is a proposed patch to master to do this. It disables translation from curved quotes, which means that quote translation now affects only ` and ', and it documents that the text-quoting-style 'grave' therefore suppresses all quote translation. This shortens the Emacs source code by forty lines or so, which is a good sign. --------------C8C8849F4CE3D283D86F2980 Content-Type: text/plain; charset=UTF-8; name="0001-text-quoting-style-now-affects-only-and.txt" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0001-text-quoting-style-now-affects-only-and.txt" RnJvbSA0M2MyOGZlMzM4ZWM5OWY3ZjM2MTA4YjdhMmZhYjBlY2Q2YTI4NGM5IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEVnZ2VydCA8ZWdnZXJ0QGNzLnVjbGEuZWR1 PgpEYXRlOiBXZWQsIDQgTWF5IDIwMTYgMTY6NDQ6MzcgLTA3MDAKU3ViamVjdDogW1BBVENI XSAndGV4dC1xdW90aW5nLXN0eWxlJyBub3cgYWZmZWN0cyBvbmx5IGAgYW5kICcKCkNoYW5n ZSAndGV4dC1xdW90aW5nLXN0eWxlJyBzbyB0aGF0IGl0IG5vIGxvbmdlciBhZmZlY3RzCmZv cm1hdHRpbmcgb2YgY3VydmVkIHF1b3RlcyBpbiBmb3JtYXQgYXJndW1lbnRzIHRvIGZ1bmN0 aW9ucyBsaWtlCidtZXNzYWdlJy4gIEluIHBhcnRpY3VsYXIsIHdoZW4gdGhpcyB2YXJpYWJs ZSdzIHZhbHVlIGlzICdncmF2ZScsCmFsbCBxdW90ZXMgaW4gZm9ybWF0cyBhcmUgb3V0cHV0 IGFzLWlzLgoqIGRvYy9saXNwcmVmL2hlbHAudGV4aSAoS2V5cyBpbiBEb2N1bWVudGF0aW9u KToKKiBkb2MvbGlzcHJlZi9zdHJpbmdzLnRleGkgKEZvcm1hdHRpbmcgU3RyaW5ncyk6Ciog ZG9jL2xpc3ByZWYvdGlwcy50ZXhpIChEb2N1bWVudGF0aW9uIFRpcHMpOgoqIGV0Yy9ORVdT OgoqIHNyYy9kb2MuYyAoc3ltc19vZl9kb2MpOiBEb2N1bWVudCB0aGlzLgoqIGxpc3AvaGVs cC1mbnMuZWwgKGRlc2NyaWJlLWZ1bmN0aW9uLTEpOgoqIHNyYy9kb2MuYyAodGV4dF9xdW90 aW5nX3N0eWxlLCBGc3Vic3RpdHV0ZV9jb21tYW5kX2tleXMpCihzeW1zX29mX2RvYyk6Ciog c3JjL2VkaXRmbnMuYyAoc3R5bGVkX2Zvcm1hdCk6IE9taXQgbm93LXVubmVjZXNzYXJ5IGNv ZGUuCiogc3JjL2xpc3AuaCAoTEVBVkVfUVVPVElOR19TVFlMRSk6IFJlbW92ZS4KLS0tCiBk b2MvbGlzcHJlZi9oZWxwLnRleGkgICAgfCAgOSArKysrLS0tLS0KIGRvYy9saXNwcmVmL3N0 cmluZ3MudGV4aSB8ICA1ICsrLS0tCiBkb2MvbGlzcHJlZi90aXBzLnRleGkgICAgfCAgMyAr LS0KIGV0Yy9ORVdTICAgICAgICAgICAgICAgICB8ICA2ICsrKysrKwogbGlzcC9oZWxwLWZu cy5lbCAgICAgICAgIHwgIDIgKy0KIHNyYy9kb2MuYyAgICAgICAgICAgICAgICB8IDQxICsr KysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBzcmMvZWRpdGZucy5j ICAgICAgICAgICAgfCAyMiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBzcmMvbGlzcC5oICAg ICAgICAgICAgICAgfCAgMyAtLS0KIDggZmlsZXMgY2hhbmdlZCwgMjUgaW5zZXJ0aW9ucygr KSwgNjYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZG9jL2xpc3ByZWYvaGVscC50ZXhp IGIvZG9jL2xpc3ByZWYvaGVscC50ZXhpCmluZGV4IDU4YTExZjIuLjM4MWMyN2YgMTAwNjQ0 Ci0tLSBhL2RvYy9saXNwcmVmL2hlbHAudGV4aQorKysgYi9kb2MvbGlzcHJlZi9oZWxwLnRl eGkKQEAgLTMzMiwxMyArMzMyLDExIEBAIEtleXMgaW4gRG9jdW1lbnRhdGlvbgogc3BlY2lm aWVzIEB2YXJ7bWFwdmFyfSdzIHZhbHVlIGFzIHRoZSBrZXltYXAgZm9yIGFueSBmb2xsb3dp bmcKIEBzYW1we1xbQHZhcntjb21tYW5kfV19IHNlcXVlbmNlcyBpbiB0aGlzIGRvY3VtZW50 YXRpb24gc3RyaW5nLgogCi1AaXRlbSDigJgKIEBpdGVteCBgCi0obGVmdCBzaW5nbGUgcXVv dGF0aW9uIG1hcmsgYW5kIGdyYXZlIGFjY2VudCkgYm90aCBzdGFuZCBmb3IgYSBsZWZ0IHF1 b3RlLgorKGdyYXZlIGFjY2VudCkgc3RhbmRzIGZvciBhIGxlZnQgcXVvdGUuCiAKLUBpdGVt IOKAmQogQGl0ZW14ICcKLShyaWdodCBzaW5nbGUgcXVvdGF0aW9uIG1hcmsgYW5kIGFwb3N0 cm9waGUpIGJvdGggc3RhbmQgZm9yIGEgcmlnaHQgcXVvdGUuCisoYXBvc3Ryb3BoZSkgc3Rh bmRzIGZvciBhIHJpZ2h0IHF1b3RlLgogCiBAaXRlbSBcPQogcXVvdGVzIHRoZSBmb2xsb3dp bmcgY2hhcmFjdGVyIGFuZCBpcyBkaXNjYXJkZWQ7IHRodXMsIEBzYW1we1w9YH0gcHV0cwpA QCAtMzU3LDcgKzM1NSw4IEBAIEtleXMgaW4gRG9jdW1lbnRhdGlvbgogSWYgdGhlIHZhcmlh YmxlJ3MgdmFsdWUgaXMgQGNvZGV7Y3VydmV9LCB0aGUgc3R5bGUgaXMKIEB0e+KAmGxpa2Ug dGhpc+KAmX0gd2l0aCBjdXJ2ZWQgc2luZ2xlIHF1b3Rlcy4gIElmIHRoZSB2YWx1ZSBpcwog QGNvZGV7c3RyYWlnaHR9LCB0aGUgc3R5bGUgaXMgQHR7J2xpa2UgdGhpcyd9IHdpdGggc3Ry YWlnaHQKLWFwb3N0cm9waGVzLiAgSWYgdGhlIHZhbHVlIGlzIEBjb2Rle2dyYXZlfSwgdGhl IHN0eWxlIGlzIEB0e2BsaWtlCithcG9zdHJvcGhlcy4gIElmIHRoZSB2YWx1ZSBpcyBAY29k ZXtncmF2ZX0sCitxdW90ZXMgYXJlIG5vdCB0cmFuc2xhdGVkIGFuZCB0aGUgc3R5bGUgaXMg QHR7YGxpa2UKIHRoaXMnfSB3aXRoIGdyYXZlIGFjY2VudCBhbmQgYXBvc3Ryb3BoZSwgdGhl IHN0YW5kYXJkIHN0eWxlCiBiZWZvcmUgRW1hY3MgdmVyc2lvbiAyNS4gIFRoZSBkZWZhdWx0 IHZhbHVlIEBjb2Rle25pbH0KIGFjdHMgbGlrZSBAY29kZXtjdXJ2ZX0gaWYgY3VydmVkIHNp bmdsZSBxdW90ZXMgYXJlIGRpc3BsYXlhYmxlLCBhbmQKZGlmZiAtLWdpdCBhL2RvYy9saXNw cmVmL3N0cmluZ3MudGV4aSBiL2RvYy9saXNwcmVmL3N0cmluZ3MudGV4aQppbmRleCBjZTYy OWFhLi4wZTVmNWYxIDEwMDY0NAotLS0gYS9kb2MvbGlzcHJlZi9zdHJpbmdzLnRleGkKKysr IGIvZG9jL2xpc3ByZWYvc3RyaW5ncy50ZXhpCkBAIC04NDAsOSArODQwLDggQEAgRm9ybWF0 dGluZyBTdHJpbmdzCiBAY2luZGV4IGN1cnZlZCBxdW90ZXMKIEBjaW5kZXggY3VybHkgcXVv dGVzCiBUaGlzIGZ1bmN0aW9uIGFjdHMgbGlrZSBAY29kZXtmb3JtYXR9LCBleGNlcHQgaXQg YWxzbyBjb252ZXJ0cyBhbnkKLWN1cnZlZCBzaW5nbGUgcXVvdGVzIGluIEB2YXJ7c3RyaW5n fSBhcyBwZXIgdGhlIHZhbHVlIG9mCi1AY29kZXt0ZXh0LXF1b3Rpbmctc3R5bGV9LCBhbmQg dHJlYXRzIGdyYXZlIGFjY2VudCAoQHR7YH0pIGFuZAotYXBvc3Ryb3BoZSAoQHR7J30pIGFz IGlmIHRoZXkgd2VyZSBjdXJ2ZWQgc2luZ2xlIHF1b3Rlcy4gIEB4cmVme0tleXMKK2dyYXZl IGFjY2VudHMgKEB0e2B9KSBhbmQgYXBvc3Ryb3BoZXMgKEB0eyd9KSBpbiBAdmFye3N0cmlu Z30gYXMgcGVyIHRoZQordmFsdWUgb2YgQGNvZGV7dGV4dC1xdW90aW5nLXN0eWxlfS4gIEB4 cmVme0tleXMKIGluIERvY3VtZW50YXRpb259LgogQGVuZCBkZWZ1bgogCmRpZmYgLS1naXQg YS9kb2MvbGlzcHJlZi90aXBzLnRleGkgYi9kb2MvbGlzcHJlZi90aXBzLnRleGkKaW5kZXgg ZDEyZGU3YS4uYTg1ODlkZiAxMDA2NDQKLS0tIGEvZG9jL2xpc3ByZWYvdGlwcy50ZXhpCisr KyBiL2RvYy9saXNwcmVmL3RpcHMudGV4aQpAQCAtNjc5LDggKzY3OSw3IEBAIERvY3VtZW50 YXRpb24gVGlwcwogQHR7J306IEB0e2BsaWtlLXRoaXMnfSByYXRoZXIgdGhhbiBAdHvigJhs aWtlLXRoaXPigJl9LiAgVGhpcwogb2xkZXIgY29udmVudGlvbiB3YXMgZGVzaWduZWQgZm9y IG5vdy1vYnNvbGV0ZSBkaXNwbGF5cyBpbiB3aGljaCBncmF2ZQogYWNjZW50IGFuZCBhcG9z dHJvcGhlIHdlcmUgbWlycm9yIGltYWdlcy4KLQotRG9jdW1lbnRhdGlvbiB1c2luZyBlaXRo ZXIgY29udmVudGlvbiBpcyBjb252ZXJ0ZWQgdG8gdGhlIHVzZXIncworRG9jdW1lbnRhdGlv biB1c2luZyB0aGlzIGNvbnZlbnRpb24gaXMgY29udmVydGVkIHRvIHRoZSB1c2VyJ3MKIHBy ZWZlcnJlZCBmb3JtYXQgd2hlbiBpdCBpcyBjb3BpZWQgaW50byBhIGhlbHAgYnVmZmVyLiAg QHhyZWZ7S2V5cyBpbgogRG9jdW1lbnRhdGlvbn0uCiAKZGlmZiAtLWdpdCBhL2V0Yy9ORVdT IGIvZXRjL05FV1MKaW5kZXggMjE2MDJmZi4uNjViZDQ0ZiAxMDA2NDQKLS0tIGEvZXRjL05F V1MKKysrIGIvZXRjL05FV1MKQEAgLTM1Myw2ICszNTMsMTIgQEAgbW9kZSBiaW5kaW5nczog J0MtYyBAIEMtYScsICdDLWMgQCBDLXQnLCAnQy1jIEAgQy1kJywgYW5kICdDLWMgQCBDLWUu JwogYmVmb3JlIHJ1bm5pbmcuICBUaGlzIGlzIGNvbnRyb2xsZWQgYnkgdGhlICdncmVwLXNh dmUtYnVmZmVycycKIHZhcmlhYmxlLgogCisrKysKKyoqIFRoZSB2YXJpYWJsZSAndGV4dC1x dW90aW5nLXN0eWxlJyBubyBsb25nZXIgYWZmZWN0cyB0aGUgdHJlYXRtZW50CitvZiBjdXJ2 ZWQgcXVvdGVzIGluIGZvcm1hdCBhcmd1bWVudHMgdG8gZnVuY3Rpb25zIGxpa2UgJ21lc3Nh Z2UnIGFuZAorJ2Zvcm1hdC1tZXNzYWdlJy4gIEluIHBhcnRpY3VsYXIsIHdoZW4gdGhpcyB2 YXJpYWJsZSdzIHZhbHVlIGlzCisnZ3JhdmUnLCBhbGwgcXVvdGVzIGluIGZvcm1hdHMgYXJl IG91dHB1dCBhcy1pcy4KKwogDAogKiBMaXNwIENoYW5nZXMgaW4gRW1hY3MgMjUuMgogCmRp ZmYgLS1naXQgYS9saXNwL2hlbHAtZm5zLmVsIGIvbGlzcC9oZWxwLWZucy5lbAppbmRleCBk MWM4YjJkLi4wNDAxNTJhIDEwMDY0NAotLS0gYS9saXNwL2hlbHAtZm5zLmVsCisrKyBiL2xp c3AvaGVscC1mbnMuZWwKQEAgLTYyNiw3ICs2MjYsNyBAQCBkZXNjcmliZS1mdW5jdGlvbi0x CiAgICAgICAgICAgICA7OyBBdm9pZCBhc2tpbmcgdGhlIHVzZXIgYW5ub3lpbmcgcXVlc3Rp b25zIGlmIHNoZSBkZWNpZGVzCiAgICAgICAgICAgICA7OyB0byBzYXZlIHRoZSBoZWxwIGJ1 ZmZlciwgd2hlbiBoZXIgbG9jYWxlJ3MgY29kZXNldAogICAgICAgICAgICAgOzsgaXNuJ3Qg VVRGLTguCi0gICAgICAgICAgICAodW5sZXNzIChtZW1xIHRleHQtcXVvdGluZy1zdHlsZSAn KGxlYXZlIHN0cmFpZ2h0IGdyYXZlKSkKKyAgICAgICAgICAgICh1bmxlc3MgKG1lbXEgdGV4 dC1xdW90aW5nLXN0eWxlICcoc3RyYWlnaHQgZ3JhdmUpKQogICAgICAgICAgICAgICAoc2V0 LWJ1ZmZlci1maWxlLWNvZGluZy1zeXN0ZW0gJ3V0Zi04KSkpKSkpKSkKIAogOzsgQWRkIGRl ZmF1bHRzIHRvIGBoZWxwLWZucy1kZXNjcmliZS1mdW5jdGlvbi1mdW5jdGlvbnMnLgpkaWZm IC0tZ2l0IGEvc3JjL2RvYy5jIGIvc3JjL2RvYy5jCmluZGV4IDUzMjY0MzMuLjAxN2RkMTcg MTAwNjQ0Ci0tLSBhL3NyYy9kb2MuYworKysgYi9zcmMvZG9jLmMKQEAgLTcwNCw4ICs3MDQs NiBAQCB0ZXh0X3F1b3Rpbmdfc3R5bGUgKHZvaWQpCiAgICAgICA/IGRlZmF1bHRfdG9fZ3Jh dmVfcXVvdGluZ19zdHlsZSAoKQogICAgICAgOiBFUSAoVnRleHRfcXVvdGluZ19zdHlsZSwg UWdyYXZlKSkKICAgICByZXR1cm4gR1JBVkVfUVVPVElOR19TVFlMRTsKLSAgZWxzZSBpZiAo RVEgKFZ0ZXh0X3F1b3Rpbmdfc3R5bGUsIFFsZWF2ZSkpCi0gICAgcmV0dXJuIExFQVZFX1FV T1RJTkdfU1RZTEU7CiAgIGVsc2UgaWYgKEVRIChWdGV4dF9xdW90aW5nX3N0eWxlLCBRc3Ry YWlnaHQpKQogICAgIHJldHVybiBTVFJBSUdIVF9RVU9USU5HX1NUWUxFOwogICBlbHNlCkBA IC05ODIsMjkgKzk4MCwxMiBAQCBPdGhlcndpc2UsIHJldHVybiBhIG5ldyBzdHJpbmcuICAq LykKIAkgIG5jaGFycysrOwogCSAgY2hhbmdlZCA9IHRydWU7CiAJfQotICAgICAgZWxzZSBp ZiAoISBtdWx0aWJ5dGUpCi0JKmJ1ZnArKyA9ICpzdHJwKyssIG5jaGFycysrOwogICAgICAg ZWxzZQogCXsKLQkgIGludCBsZW47Ci0JICBpbnQgY2ggPSBTVFJJTkdfQ0hBUl9BTkRfTEVO R1RIIChzdHJwLCBsZW4pOwotCSAgaWYgKChjaCA9PSBMRUZUX1NJTkdMRV9RVU9UQVRJT05f TUFSSwotCSAgICAgICB8fCBjaCA9PSBSSUdIVF9TSU5HTEVfUVVPVEFUSU9OX01BUkspCi0J ICAgICAgJiYgcXVvdGluZ19zdHlsZSAhPSBDVVJWRV9RVU9USU5HX1NUWUxFCi0gICAgICAg ICAgICAgICYmIHF1b3Rpbmdfc3R5bGUgIT0gTEVBVkVfUVVPVElOR19TVFlMRSkKLQkgICAg ewotCSAgICAgICpidWZwKysgPSAoKGNoID09IExFRlRfU0lOR0xFX1FVT1RBVElPTl9NQVJL Ci0JCQkgICYmIHF1b3Rpbmdfc3R5bGUgPT0gR1JBVkVfUVVPVElOR19TVFlMRSkKLQkJCSA/ ICdgJyA6ICdcJycpOwotCSAgICAgIHN0cnAgKz0gbGVuOwotCSAgICAgIGNoYW5nZWQgPSB0 cnVlOwotCSAgICB9Ci0JICBlbHNlCi0JICAgIHsKLQkgICAgICBkbwotCQkqYnVmcCsrID0g KnN0cnArKzsKLQkgICAgICB3aGlsZSAoLS1sZW4gIT0gMCk7Ci0JICAgIH0KKwkgICpidWZw KysgPSAqc3RycCsrOworCSAgaWYgKG11bHRpYnl0ZSkKKwkgICAgd2hpbGUgKCEgQ0hBUl9I RUFEX1AgKCpzdHJwKSkKKwkgICAgICAqYnVmcCsrID0gKnN0cnArKzsKIAkgIG5jaGFycysr OwogCX0KICAgICB9CkBAIC0xMDM2LDcgKzEwMTcsNiBAQCB2b2lkCiBzeW1zX29mX2RvYyAo dm9pZCkKIHsKICAgREVGU1lNIChRZnVuY3Rpb25fZG9jdW1lbnRhdGlvbiwgImZ1bmN0aW9u LWRvY3VtZW50YXRpb24iKTsKLSAgREVGU1lNIChRbGVhdmUsICJsZWF2ZSIpOwogICBERUZT WU0gKFFncmF2ZSwgImdyYXZlIik7CiAgIERFRlNZTSAoUXN0cmFpZ2h0LCAic3RyYWlnaHQi KTsKIApAQCAtMTA1MSwxNSArMTAzMSwxNiBAQCBzeW1zX29mX2RvYyAodm9pZCkKICAgREVG VkFSX0xJU1AgKCJ0ZXh0LXF1b3Rpbmctc3R5bGUiLCBWdGV4dF9xdW90aW5nX3N0eWxlLAog ICAgICAgICAgICAgICAgZG9jOiAvKiBTdHlsZSB0byB1c2UgZm9yIHNpbmdsZSBxdW90ZXMg aW4gaGVscCBhbmQgbWVzc2FnZXMuCiBJdHMgdmFsdWUgc2hvdWxkIGJlIGEgc3ltYm9sLiAg SXQgd29ya3MgYnkgc3Vic3RpdHV0aW5nIGNlcnRhaW4gc2luZ2xlCi1xdW90ZXMgZm9yIGNl cnRhaW4gb3RoZXIgc2luZ2xlIHF1b3Rlcy4gIFRoaXMgaXMgZG9uZSBpbiBoZWxwIG91dHB1 dCBhbmQKLWBtZXNzYWdlJyBvdXRwdXQuICBJdCBpcyBub3QgZG9uZSBpbiBgZm9ybWF0Jy4K K3F1b3RlcyBmb3IgZ3JhdmUgYWNjZW50IGFuZCBhcG9zdHJvcGhlLiAgVGhpcyBpcyBkb25l IGluIGhlbHAgb3V0cHV0CithbmQgaW4gZnVuY3Rpb25zIGxpa2UgYG1lc3NhZ2UnIGFuZCBg Zm9ybWF0LW1lc3NhZ2UnLiAgSXQgaXMgbm90IGRvbmUKK2luIGBmb3JtYXQnLgogCi1gbGVh dmUnIG1lYW5zIGRvIG5vdCBkbyBhbnkgc3Vic3RpdHV0aW9ucy4KIGBjdXJ2ZScgbWVhbnMg cXVvdGUgd2l0aCBjdXJ2ZWQgc2luZ2xlIHF1b3RlcyBcXD3igJhsaWtlIHRoaXNcXD3igJku CiBgc3RyYWlnaHQnIG1lYW5zIHF1b3RlIHdpdGggc3RyYWlnaHQgYXBvc3Ryb3BoZXMgXFw9 J2xpa2UgdGhpc1xcPScuCi1gZ3JhdmUnIG1lYW5zIHF1b3RlIHdpdGggZ3JhdmUgYWNjZW50 IGFuZCBhcG9zdHJvcGhlIFxcPWBsaWtlIHRoaXNcXD0nLgotVGhlIGRlZmF1bHQgdmFsdWUg bmlsIGFjdHMgbGlrZSBgY3VydmUnIGlmIGN1cnZlZCBzaW5nbGUgcXVvdGVzIGFyZQotZGlz cGxheWFibGUsIGFuZCBsaWtlIGBncmF2ZScgb3RoZXJ3aXNlLiAgKi8pOworYGdyYXZlJyBt ZWFucyBxdW90ZSB3aXRoIGdyYXZlIGFjY2VudCBhbmQgYXBvc3Ryb3BoZSBcXD1gbGlrZSB0 aGlzXFw9JzsKK2kuZS4sIGRvIG5vdCBhbHRlciBxdW90ZSBtYXJrcy4gIFRoZSBkZWZhdWx0 IHZhbHVlIG5pbCBhY3RzIGxpa2UKK2BjdXJ2ZScgaWYgY3VydmVkIHNpbmdsZSBxdW90ZXMg YXJlIGRpc3BsYXlhYmxlLCBhbmQgbGlrZSBgZ3JhdmUnCitvdGhlcndpc2UuICAqLyk7CiAg IFZ0ZXh0X3F1b3Rpbmdfc3R5bGUgPSBRbmlsOwogCiAgIERFRlZBUl9CT09MICgiaW50ZXJu YWwtLXRleHQtcXVvdGluZy1mbGFnIiwgdGV4dF9xdW90aW5nX2ZsYWcsCmRpZmYgLS1naXQg YS9zcmMvZWRpdGZucy5jIGIvc3JjL2VkaXRmbnMuYwppbmRleCAxMWE4MmMzLi5lOWRmMDlm IDEwMDY0NAotLS0gYS9zcmMvZWRpdGZucy5jCisrKyBiL3NyYy9lZGl0Zm5zLmMKQEAgLTM5 NzQsOCArMzk3NCw2IEBAIHN0eWxlZF9mb3JtYXQgKHB0cmRpZmZfdCBuYXJncywgTGlzcF9P YmplY3QgKmFyZ3MsIGJvb2wgbWVzc2FnZSkKICAgICAgIG11bHRpYnl0ZSA9IHRydWU7CiAK ICAgaW50IHF1b3Rpbmdfc3R5bGUgPSBtZXNzYWdlID8gdGV4dF9xdW90aW5nX3N0eWxlICgp IDogLTE7Ci0gIGlmIChxdW90aW5nX3N0eWxlID09IExFQVZFX1FVT1RJTkdfU1RZTEUpCi0g ICAgcXVvdGluZ19zdHlsZSA9IC0xOwogCiAgIC8qIElmIHdlIHN0YXJ0IG91dCBwbGFubmlu ZyBhIHVuaWJ5dGUgcmVzdWx0LAogICAgICB0aGVuIGRpc2NvdmVyIGl0IGhhcyB0byBiZSBt dWx0aWJ5dGUsIHdlIGp1bXAgYmFjayB0byByZXRyeS4gICovCkBAIC00NDU0LDE0ICs0NDUy LDYgQEAgc3R5bGVkX2Zvcm1hdCAocHRyZGlmZl90IG5hcmdzLCBMaXNwX09iamVjdCAqYXJn cywgYm9vbCBtZXNzYWdlKQogCX0KICAgICAgIGVsc2UKIAl7Ci0JICAvKiBOYW1lZCBjb25z dGFudHMgZm9yIHRoZSBVVEYtOCBlbmNvZGluZ3Mgb2YgVSsyMDE4IExFRlQgU0lOR0xFCi0J ICAgICBRVU9UQVRJT04gTUFSSyBhbmQgVSsyMDE5IFJJR0hUIFNJTkdMRSBRVU9UQVRJT04g TUFSSy4gICovCi0JICBlbnVtCi0JICB7Ci0JICAgIHVMU1FNMCA9IDB4RTIsIHVMU1FNMSA9 IDB4ODAsIHVMU1FNMiA9IDB4OTgsCi0JICAgIC8qIHVSU1FNMCA9IDB4RTIsIHVSU1FNMSA9 IDB4ODAsICovIHVSU1FNMiA9IDB4OTkKLQkgIH07Ci0KIAkgIHVuc2lnbmVkIGNoYXIgc3Ry W01BWF9NVUxUSUJZVEVfTEVOR1RIXTsKIAogCSAgaWYgKChmb3JtYXRfY2hhciA9PSAnYCcg fHwgZm9ybWF0X2NoYXIgPT0gJ1wnJykKQEAgLTQ0NzcsMTggKzQ0NjcsNiBAQCBzdHlsZWRf Zm9ybWF0IChwdHJkaWZmX3QgbmFyZ3MsIExpc3BfT2JqZWN0ICphcmdzLCBib29sIG1lc3Nh Z2UpCiAJICAgIH0KIAkgIGVsc2UgaWYgKGZvcm1hdF9jaGFyID09ICdgJyAmJiBxdW90aW5n X3N0eWxlID09IFNUUkFJR0hUX1FVT1RJTkdfU1RZTEUpCiAJICAgIGNvbnZzcmMgPSAiJyI7 Ci0JICBlbHNlIGlmIChmb3JtYXRfY2hhciA9PSB1TFNRTTAgJiYgQ1VSVkVfUVVPVElOR19T VFlMRSA8IHF1b3Rpbmdfc3R5bGUKLQkJICAgJiYgbXVsdGlieXRlX2Zvcm1hdAotCQkgICAm JiAodW5zaWduZWQgY2hhcikgZm9ybWF0WzBdID09IHVMU1FNMQotCQkgICAmJiAoKHVuc2ln bmVkIGNoYXIpIGZvcm1hdFsxXSA9PSB1TFNRTTIKLQkJICAgICAgIHx8ICh1bnNpZ25lZCBj aGFyKSBmb3JtYXRbMV0gPT0gdVJTUU0yKSkKLQkgICAgewotCSAgICAgIGNvbnZzcmMgPSAo KCh1bnNpZ25lZCBjaGFyKSBmb3JtYXRbMV0gPT0gdUxTUU0yCi0JCQkgICYmIHF1b3Rpbmdf c3R5bGUgPT0gR1JBVkVfUVVPVElOR19TVFlMRSkKLQkJCSA/ICJgIiA6ICInIik7Ci0JICAg ICAgZm9ybWF0ICs9IDI7Ci0JICAgICAgbWVtc2V0ICgmZGlzY2FyZGVkW2Zvcm1hdDAgKyAx IC0gZm9ybWF0X3N0YXJ0XSwgMiwgMik7Ci0JICAgIH0KIAkgIGVsc2UKIAkgICAgewogCSAg ICAgIC8qIENvcHkgYSBzaW5nbGUgY2hhcmFjdGVyIGZyb20gZm9ybWF0IHRvIGJ1Zi4gICov CmRpZmYgLS1naXQgYS9zcmMvbGlzcC5oIGIvc3JjL2xpc3AuaAppbmRleCBkZTc0YTQ3Li4x ZmM2MTMwIDEwMDY0NAotLS0gYS9zcmMvbGlzcC5oCisrKyBiL3NyYy9saXNwLmgKQEAgLTQx OTgsOSArNDE5OCw2IEBAIGV4dGVybiB2b2lkIHN5bXNfb2ZfY2FsbHByb2MgKHZvaWQpOwog LyogRGVmaW5lZCBpbiBkb2MuYy4gICovCiBlbnVtIHRleHRfcXVvdGluZ19zdHlsZQogICB7 Ci0gICAgLyogTGVhdmUgcXVvdGVzIHVuY2hhbmdlZC4gICovCi0gICAgTEVBVkVfUVVPVElO R19TVFlMRSwKLQogICAgIC8qIFVzZSBjdXJ2ZWQgc2luZ2xlIHF1b3RlcyDigJhsaWtlIHRo aXPigJkuICAqLwogICAgIENVUlZFX1FVT1RJTkdfU1RZTEUsCiAKLS0gCjIuNS41Cgo= --------------C8C8849F4CE3D283D86F2980--