From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id sLokICikmmQvKQEASxT56A (envelope-from ) for ; Tue, 27 Jun 2023 10:56:08 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id iM4GICikmmTcYgEA9RJhRA (envelope-from ) for ; Tue, 27 Jun 2023 10:56:08 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4EF4D39108 for ; Tue, 27 Jun 2023 10:56:07 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qE4TZ-0001rK-MQ; Tue, 27 Jun 2023 04:55:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qE4TT-0001i1-P5 for emacs-orgmode@gnu.org; Tue, 27 Jun 2023 04:55:00 -0400 Received: from mout02.posteo.de ([185.67.36.66]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qE4TN-0007Ua-6j for emacs-orgmode@gnu.org; Tue, 27 Jun 2023 04:54:57 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 9E478240103 for ; Tue, 27 Jun 2023 10:54:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.eu; s=2017; t=1687856090; bh=DxIG7OG5/xMl3LKNfBgYWaeMqXMDKIcewaew0jg7qds=; h=Message-ID:Date:MIME-Version:Reply-To:Subject:To:Cc:From:From; b=dEGXgep4hz8SwbKpmI/3FtFV7iQzNt/XoSRr/akZ2w/TANMBKZUgNVtLQOjKfSGH5 5RZbh4NBUpEHGASjindzOq6KNo3LqnSeYI6Xo9Guznyl0FI14nEZckokcug2ZB8Rql bIZ0IOwmUPAQvjne/QII+mqGtUz9hx3Hu6VWRgHmVz1BdQgo7Ki0WRqVJoluYWksS9 AyIovb957StTS4RbfUPLtfmfljoy3JJMGJ8LWkKIx5hi2wJlugGW6Yh4m6bdYO1DKB Px2k7qGbO9iV6TR7K544OenvHtBoaKE0cYYBBfpklltmvaTllT2mKujX/Ocn5maccE oYPXyredwKpwQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Qqz6x442fz9rxW; Tue, 27 Jun 2023 10:54:49 +0200 (CEST) Content-Type: multipart/mixed; boundary="------------zuEhhJ0RFcVvl0hUxSzBBBp4" Message-ID: Date: Tue, 27 Jun 2023 08:54:49 +0000 MIME-Version: 1.0 Subject: Re: [BUG] Source block indentation does not work properly for yaml-mode [9.6.6 ( @ /home/user/.emacs.d/elpa/org-9.6.6/)] Content-Language: fr To: Ihor Radchenko Cc: wolf , emacs-orgmode@gnu.org References: <87ttva8chx.fsf@localhost> <8d8642c9-ced3-b254-0f49-f7b9c06311ff@posteo.eu> <87352p9g13.fsf@localhost> <87zg4vsof6.fsf@localhost> <37d86bbf-c0e2-6337-efc2-cdf63dbf4580@posteo.eu> <87sfamsb7m.fsf@localhost> <274bbd61-790d-8e19-d3a0-0793126c3bb0@posteo.eu> <87cz1itp8k.fsf@localhost> <1a97917c-bbab-4d7f-b629-0c84807448f2@posteo.eu> <87a5wmtmug.fsf@localhost> From: =?UTF-8?Q?S=c3=a9bastien_Miquel?= In-Reply-To: <87a5wmtmug.fsf@localhost> Received-SPF: pass client-ip=185.67.36.66; envelope-from=sebastien.miquel@posteo.eu; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: sebastien.miquel@posteo.eu Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: emacs-orgmode-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1687856168; a=rsa-sha256; cv=none; b=Mz2C7YFuIXFYKNWdYM1sjJBzqzimBASkxxi8HklnjBs6/6S7wjTaRZOjj2l4x7ZH5EYjOm t3jsSPI8lC37pdX2qn2KByDa0wwMe4F9iSfkk+LFGcpxJ8lEFvZdasvkO1UIL4s6Ix1ag+ h0WHxhTdnn5YqH0C3z+FiFD4LQl/+0cEuSikD8+Cd8Y//yq/Pi57zIYpsGeIKxX8YJTGCS twG8u5vg6fc4Ibi3IDbyYI/E8R/+hSZAn4pRrx915vo3gyhZQo0qudYnRzYONFShJiILBF ZRajrj//L9ECw8iRYj14i3NBjhtIoiZyxjohdmc1oAvkjo0F2yEkqpsV5T2DGw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=posteo.eu header.s=2017 header.b=dEGXgep4; dmarc=pass (policy=none) header.from=posteo.eu; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1687856168; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=/d5uGq1C+P0kHXwuAbb22UvYrP656xWESsXKeiQd01o=; b=J9ICSoFB+Pl8VX7rYZvtMm1CmycRRlEPKs/pNZlZu8Aji+7r0BnDxagFHthho72K7/jYXS LqwmoiJlFrLePIfuajKlRVEKNRLJJ2HrEwrk9ked/zO6bUnbuZBcvwtwY89tXskMeaxFKw J6+I7PvTo7FObxHvC0ZLICyRYNAPQHOOhNm2+TamNQMiET4iOfV6CAgNwmnEBh7GEkYXtO MVGPvYW6OPlG/vAEdhDksEUUGOckdCETU65mFk6VXRRu2e6BKPpOKkUCnT8sve+D2Rbtgq XzNHdtc1vh4MgbYuTJkRBV84UnGnDKnOGQ6Qb5QKXegqpYnVqxmpSlrTHjhjsw== Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=posteo.eu header.s=2017 header.b=dEGXgep4; dmarc=pass (policy=none) header.from=posteo.eu; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -10.35 X-Spam-Score: -10.35 X-Migadu-Queue-Id: 4EF4D39108 X-TUID: MCgj1fqmajre This is a multi-part message in MIME format. --------------zuEhhJ0RFcVvl0hUxSzBBBp4 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Ihor Radchenko writes: > This is not a problem. We can just apply appropriate 'display property > in `org-src-font-lock-fontify-block', manually replacing the tab with > appropriate number of spaces (as in the origin buffer). Ok, that works, thanks. Here are two patches, the first that removes the special case logic for LaTeX fragments, and the second that implements what you suggest, and applies on top of the first one. Does that look ok to you ? NB: Calling newline-and-indent from the middle of a line is currently broken, but that has nothing to do with this change. -- Sébastien Miquel --------------zuEhhJ0RFcVvl0hUxSzBBBp4 Content-Type: text/x-patch; charset=UTF-8; name="0001-org-src-contents-for-write-back-simplify-the-case-of.patch" Content-Disposition: attachment; filename*0="0001-org-src-contents-for-write-back-simplify-the-case-of.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSBkMmE4NmQ5MDExNDU1MTcyZTU5OTAxNDlmODQ0MDMxZjUzNGU2NWYyIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/Uz1DMz1BOWJhc3RpZW49MjBNaXF1 ZWw/PSA8c2ViYXN0aWVuLm1pcXVlbEBwb3N0ZW8uZXU+CkRhdGU6IFN1biwgMjUgSnVuIDIw MjMgMTM6Mzg6MjEgKzAyMDAKU3ViamVjdDogW1BBVENIXSBvcmctc3JjLS1jb250ZW50cy1m b3Itd3JpdGUtYmFjazogc2ltcGxpZnkgdGhlIGNhc2Ugb2YgTGFUZVgKIGZyYWdtZW50cwoK KiBsaXNwL29yZy1zcmMuZWwgKG9yZy1zcmMtLWNvbnRlbnRzLWZvci13cml0ZS1iYWNrKTog RXh0cmFjdCBzcGVjaWFsCmNhc2UgbG9naWMgZm9yIExhVGVYIGZyYWdtZW50cy4KKG9yZy1l ZGl0LWxhdGV4LWZyYWdtZW50KTogVHJpbSB0aGUgY29udGVudHMgdG8gYmUgaW5zZXJ0ZWQg aW4gdGhlCm9yaWdpbmFsIGJ1ZmZlci4KLS0tCiBsaXNwL29yZy1zcmMuZWwgfCAxNiArKysr KysrKysrKy0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTEgaW5zZXJ0aW9ucygrKSwgNSBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saXNwL29yZy1zcmMuZWwgYi9saXNwL29yZy1zcmMu ZWwKaW5kZXggZjE1YmE4ZTk5Li41YzI3MmM3ZjUgMTAwNjQ0Ci0tLSBhL2xpc3Avb3JnLXNy Yy5lbAorKysgYi9saXNwL29yZy1zcmMuZWwKQEAgLTQ2Niw3ICs0NjYsNiBAQCBBc3N1bWUg cG9pbnQgaXMgaW4gdGhlIGNvcnJlc3BvbmRpbmcgZWRpdCBidWZmZXIuIgogCQkgIG9yZy1z cmMtLWNvbnRlbnQtaW5kZW50YXRpb24KIAkJMCkpKSkKIAkodXNlLXRhYnM/IChhbmQgKD4g b3JnLXNyYy0tdGFiLXdpZHRoIDApIHQpKQotICAgICAgICAocHJlc2VydmUtZmwgKGVxIG9y Zy1zcmMtLXNvdXJjZS10eXBlICdsYXRleC1mcmFnbWVudCkpCiAJKHNvdXJjZS10YWItd2lk dGggb3JnLXNyYy0tdGFiLXdpZHRoKQogCShjb250ZW50cyAob3JnLXdpdGgtd2lkZS1idWZm ZXIKICAgICAgICAgICAgICAgICAgICAobGV0ICgoZW9sIChsaW5lLWVuZC1wb3NpdGlvbikp KQpAQCAtNDc5LDE2ICs0NzgsMTMgQEAgQXNzdW1lIHBvaW50IGlzIGluIHRoZSBjb3JyZXNw b25kaW5nIGVkaXQgYnVmZmVyLiIKICAgICAgIDs7IFJlcHJvZHVjZSBpbmRlbnRhdGlvbiBw YXJhbWV0ZXJzIGZyb20gc291cmNlIGJ1ZmZlci4KICAgICAgIChzZXRxIGluZGVudC10YWJz LW1vZGUgdXNlLXRhYnM/KQogICAgICAgKHdoZW4gKD4gc291cmNlLXRhYi13aWR0aCAwKSAo c2V0cSB0YWItd2lkdGggc291cmNlLXRhYi13aWR0aCkpCi0gICAgICA7OyBBcHBseSBXUklU RS1CQUNLIGZ1bmN0aW9uIG9uIGVkaXQgYnVmZmVyIGNvbnRlbnRzLgogICAgICAgKGluc2Vy dCAob3JnLW5vLXByb3BlcnRpZXMgKGNhciBjb250ZW50cykpKQogICAgICAgKHNldHEgbWFy a2VyIChwb2ludC1tYXJrZXIpKQogICAgICAgKGluc2VydCAob3JnLW5vLXByb3BlcnRpZXMg KGNhciAoY2RyIGNvbnRlbnRzKSkpKQogICAgICAgKGdvdG8tY2hhciAocG9pbnQtbWluKSkK LSAgICAgICh3aGVuIChmdW5jdGlvbnAgd3JpdGUtYmFjaykgKHNhdmUtZXhjdXJzaW9uIChm dW5jYWxsIHdyaXRlLWJhY2spKSkKICAgICAgIDs7IEFkZCBJTkRFTlRBVElPTi1PRkZTRVQg dG8gZXZlcnkgbGluZSBpbiBidWZmZXIsCiAgICAgICA7OyB1bmxlc3MgaW5kZW50YXRpb24g aXMgbWVhbnQgdG8gYmUgcHJlc2VydmVkLgogICAgICAgKHdoZW4gKD4gaW5kZW50YXRpb24t b2Zmc2V0IDApCi0JKHdoZW4gcHJlc2VydmUtZmwgKGZvcndhcmQtbGluZSkpCiAgICAgICAg ICh3aGlsZSAobm90IChlb2JwKSkKIAkgIChza2lwLWNoYXJzLWZvcndhcmQgIiBcdCIpCiAg ICAgICAgICAgKHdoZW4gKG9yIChub3QgKGVvbHApKSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICA7IG5vdCBhIGJsYW5rIGxpbmUKQEAgLTQ5OCw2ICs0OTQsOSBAQCBBc3N1bWUg cG9pbnQgaXMgaW4gdGhlIGNvcnJlc3BvbmRpbmcgZWRpdCBidWZmZXIuIgogCSAgICAgIChk ZWxldGUtcmVnaW9uIChsaW5lLWJlZ2lubmluZy1wb3NpdGlvbikgKHBvaW50KSkKIAkgICAg ICAoaW5kZW50LXRvICgrIGkgaW5kZW50YXRpb24tb2Zmc2V0KSkpKQogCSAgKGZvcndhcmQt bGluZSkpKQorICAgICAgOzsgQXBwbHkgV1JJVEUtQkFDSyBmdW5jdGlvbiBvbiBlZGl0IGJ1 ZmZlciBjb250ZW50cy4KKyAgICAgIChnb3RvLWNoYXIgKHBvaW50LW1pbikpCisgICAgICAo d2hlbiAoZnVuY3Rpb25wIHdyaXRlLWJhY2spIChzYXZlLWV4Y3Vyc2lvbiAoZnVuY2FsbCB3 cml0ZS1iYWNrKSkpCiAgICAgICAoc2V0LW1hcmtlciBtYXJrZXIgbmlsKSkpKQogCiAoZGVm dW4gb3JnLXNyYy0tZWRpdC1lbGVtZW50CkBAIC0xMTUwLDcgKzExNDksMTQgQEAgVGhyb3cg YW4gZXJyb3Igd2hlbiBub3QgYXQgc3VjaCBhIHRhYmxlLiIKICAgICAgICAobGFtYmRhICgp CiAJIDs7IEJsYW5rIGxpbmVzIGJyZWFrIHRoaW5ncywgcmVwbGFjZSB3aXRoIGEgc2luZ2xl IG5ld2xpbmUuCiAJICh3aGlsZSAocmUtc2VhcmNoLWZvcndhcmQgIlxuWyBcdF0qXG4iIG5p bCB0KSAocmVwbGFjZS1tYXRjaCAiXG4iKSkKLQkgOzsgSWYgd2l0aGluIGEgdGFibGUgYSBu ZXdsaW5lIHdvdWxkIGRpc3J1cHQgdGhlIHN0cnVjdHVyZSwKKyAgICAgICAgIDs7IFRyaW0g Y29udGVudHMuCisJIChnb3RvLWNoYXIgKHBvaW50LW1pbikpCisgICAgICAgICAoc2tpcC1j aGFycy1mb3J3YXJkICIgXHQiKQorCSAoZGVsZXRlLXJlZ2lvbiAocG9pbnQtbWluKSAocG9p bnQpKQorICAgICAgICAgKGdvdG8tY2hhciAocG9pbnQtbWF4KSkKKwkgKHNraXAtY2hhcnMt YmFja3dhcmQgIiBcdCIpCisJIChkZWxldGUtcmVnaW9uIChwb2ludCkgKHBvaW50LW1heCkp CisgICAgICAgICA7OyBJZiB3aXRoaW4gYSB0YWJsZSBhIG5ld2xpbmUgd291bGQgZGlzcnVw dCB0aGUgc3RydWN0dXJlLAogCSA7OyBzbyByZW1vdmUgbmV3bGluZXMuCiAJIChnb3RvLWNo YXIgKHBvaW50LW1pbikpCiAJICh3aGVuIChvcmctZWxlbWVudC1saW5lYWdlIGNvbnRleHQg Jyh0YWJsZS1jZWxsKSkKLS0gCjIuNDEuMAoK --------------zuEhhJ0RFcVvl0hUxSzBBBp4 Content-Type: text/x-patch; charset=UTF-8; name="0001-org-src.el-Use-native-value-of-indent-tabs-mode-for-.patch" Content-Disposition: attachment; filename*0="0001-org-src.el-Use-native-value-of-indent-tabs-mode-for-.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSBhYjQ4ZTk2NzFlZmRhYmE2NTY2ZjQwNmIxZGY4MWE0NDFjNzIyNTJjIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/Uz1DMz1BOWJhc3RpZW49MjBNaXF1 ZWw/PSA8c2ViYXN0aWVuLm1pcXVlbEBwb3N0ZW8uZXU+CkRhdGU6IFR1ZSwgMjcgSnVuIDIw MjMgMDk6MjM6MDEgKzAyMDAKU3ViamVjdDogW1BBVENIXSBvcmctc3JjLmVsOiBVc2UgbmF0 aXZlIHZhbHVlIG9mIGBpbmRlbnQtdGFicy1tb2RlJyBmb3IKIGluZGVudGF0aW9uCgoqIGxp c3Avb3JnLW1hY3MuZWwgKG9yZy1kby1yZW1vdmUtaW5kZW50YXRpb24pOiBQcmVzZXJ2ZQpp bmRlbnRhdGlvbiAoc3BhY2VzIHZzIHRhYnMpIHBhc3QgdGhlIGNvbW1vbiBpbmRlbnRhdGlv biB0byByZW1vdmUuCiogbGlzcC9vcmctc3JjLmVsIChvcmctc3JjLS1jb250ZW50cy1mb3It d3JpdGUtYmFjayk6IFByZXNlcnZlIHRoZQpuYXRpdmUgaW5kZW50YXRpb24gKHNwYWNlcyB2 cyB0YWJzKS4gIElmIG5lY2Vzc2FyeSwgYWRkIGEgY29tbW9uIG9yZwppbmRlbnRhdGlvbiB0 byB0aGUgYmxvY2sgYWNjb3JkaW5nIHRvIG9yZydzIGBpbmRlbnQtdGFicy1tb2RlJy4KKG9y Zy1zcmMtZm9udC1sb2NrLWZvbnRpZnktYmxvY2spOiBJbiBjYXNlIG9mIG1peGVkIGluZGVu dGF0aW9uLApkaXNwbGF5IHRoZSB0YWIgY2hhcmFjdGVycyB3aXRoIGEgZml4ZWQgd2lkdGgs IGFjY29yZGluZyB0byB0aGUgbmF0aXZlCnRhYiB3aWR0aCB2YWx1ZS4KKiB0ZXN0aW5nL2xp c3AvdGVzdC1vcmctc3JjLmVsICh0ZXN0LW9yZy1zcmMvaW5kZW50ZWQtYmxvY2tzKTogVXBk YXRlCnRlc3RzLiAgSW5kZW50YXRpb24gbm8gbG9uZ2VyIG9iZXlzIGBpbmRlbnQtdGFicy1t b2RlJyBmcm9tIHRoZSBvcmcKYnVmZmVyLCBidXQgaXMgc2VwYXJhdGVkIGluIHR3byBwYXJ0 cy4KLS0tCiBsaXNwL29yZy1tYWNzLmVsICAgICAgICAgICAgIHwgIDQgKystCiBsaXNwL29y Zy1zcmMuZWwgICAgICAgICAgICAgIHwgMzYgKysrKysrKysrKysrKystLS0tLS0tCiB0ZXN0 aW5nL2xpc3AvdGVzdC1vcmctc3JjLmVsIHwgNjIgKysrKysrKysrKysrKysrKysrKy0tLS0t LS0tLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDYwIGluc2VydGlvbnMoKyksIDQyIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpc3Avb3JnLW1hY3MuZWwgYi9saXNwL29yZy1t YWNzLmVsCmluZGV4IDUxZGJmZTExOC4uZjQyZTZiMTRiIDEwMDY0NAotLS0gYS9saXNwL29y Zy1tYWNzLmVsCisrKyBiL2xpc3Avb3JnLW1hY3MuZWwKQEAgLTQ4NSw3ICs0ODUsOSBAQCBs aW5lLiAgUmV0dXJuIG5pbCBpZiBpdCBmYWlscy4iCiAJICAobGV0ICgoaW5kIChwcm9nbiAo c2tpcC1jaGFycy1mb3J3YXJkICIgXHQiKSAoY3VycmVudC1jb2x1bW4pKSkpCiAJICAgIChj b25kICgoZW9scCkgKGRlbGV0ZS1yZWdpb24gKGxpbmUtYmVnaW5uaW5nLXBvc2l0aW9uKSAo cG9pbnQpKSkKIAkJICAoKDwgaW5kIG4pICh0aHJvdyA6ZXhpdCBuaWwpKQotCQkgICh0IChp bmRlbnQtbGluZS10byAoLSBpbmQgbikpKSkKKwkJICAodCAoZGVsZXRlLXJlZ2lvbiAobGlu ZS1iZWdpbm5pbmctcG9zaXRpb24pCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAocHJvZ24gKG1vdmUtdG8tY29sdW1uIG4gdCkKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAocG9pbnQpKSkpKQogCSAgICAoZm9yd2FyZC1saW5l KSkpCiAJOzsgU2lnbmFsIHN1Y2Nlc3MuCiAJdCkpKSkKZGlmZiAtLWdpdCBhL2xpc3Avb3Jn LXNyYy5lbCBiL2xpc3Avb3JnLXNyYy5lbAppbmRleCA1YzI3MmM3ZjUuLjVhMTAzMGM0MiAx MDA2NDQKLS0tIGEvbGlzcC9vcmctc3JjLmVsCisrKyBiL2xpc3Avb3JnLXNyYy5lbApAQCAt NDczLDExICs0NzMsMTUgQEAgQXNzdW1lIHBvaW50IGlzIGluIHRoZSBjb3JyZXNwb25kaW5n IGVkaXQgYnVmZmVyLiIKICAgICAgICAgICAgICAgICAgICAgICAgICAgIChidWZmZXItc3Vi c3RyaW5nIGVvbCAocG9pbnQtbWF4KSkpKSkpCiAJKHdyaXRlLWJhY2sgb3JnLXNyYy0tYWxs b3ctd3JpdGUtYmFjaykKICAgICAgICAgKHByZXNlcnZlLWJsYW5rLWxpbmUgb3JnLXNyYy0t cHJlc2VydmUtYmxhbmstbGluZSkKLSAgICAgICAgbWFya2VyKQorICAgICAgICBtYXJrZXIg aW5kZW50LXN0cikKKyAgICAoc2V0cSBpbmRlbnQtc3RyCisgICAgICAgICAgKHdpdGgtdGVt cC1idWZmZXIKKyAgICAgICAgICAgIDs7IFJlcHJvZHVjZSBpbmRlbnRhdGlvbiBwYXJhbWV0 ZXJzIGZyb20gb3JnIGJ1ZmZlci4KKyAgICAgICAgICAgIChzZXRxIGluZGVudC10YWJzLW1v ZGUgdXNlLXRhYnM/KQorICAgICAgICAgICAgKHdoZW4gKD4gc291cmNlLXRhYi13aWR0aCAw KSAoc2V0cSB0YWItd2lkdGggc291cmNlLXRhYi13aWR0aCkpCisgICAgICAgICAgICAoaW5k ZW50LXRvIGluZGVudGF0aW9uLW9mZnNldCkKKyAgICAgICAgICAgIChidWZmZXItc3RyaW5n KSkpCiAgICAgKHdpdGgtY3VycmVudC1idWZmZXIgd3JpdGUtYmFjay1idWYKLSAgICAgIDs7 IFJlcHJvZHVjZSBpbmRlbnRhdGlvbiBwYXJhbWV0ZXJzIGZyb20gc291cmNlIGJ1ZmZlci4K LSAgICAgIChzZXRxIGluZGVudC10YWJzLW1vZGUgdXNlLXRhYnM/KQotICAgICAgKHdoZW4g KD4gc291cmNlLXRhYi13aWR0aCAwKSAoc2V0cSB0YWItd2lkdGggc291cmNlLXRhYi13aWR0 aCkpCiAgICAgICAoaW5zZXJ0IChvcmctbm8tcHJvcGVydGllcyAoY2FyIGNvbnRlbnRzKSkp CiAgICAgICAoc2V0cSBtYXJrZXIgKHBvaW50LW1hcmtlcikpCiAgICAgICAoaW5zZXJ0IChv cmctbm8tcHJvcGVydGllcyAoY2FyIChjZHIgY29udGVudHMpKSkpCkBAIC00ODYsMTMgKzQ5 MCwxMiBAQCBBc3N1bWUgcG9pbnQgaXMgaW4gdGhlIGNvcnJlc3BvbmRpbmcgZWRpdCBidWZm ZXIuIgogICAgICAgOzsgdW5sZXNzIGluZGVudGF0aW9uIGlzIG1lYW50IHRvIGJlIHByZXNl cnZlZC4KICAgICAgICh3aGVuICg+IGluZGVudGF0aW9uLW9mZnNldCAwKQogICAgICAgICAo d2hpbGUgKG5vdCAoZW9icCkpCi0JICAoc2tpcC1jaGFycy1mb3J3YXJkICIgXHQiKQotICAg ICAgICAgICh3aGVuIChvciAobm90IChlb2xwKSkgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgOyBub3QgYSBibGFuayBsaW5lCi0gICAgICAgICAgICAgICAgICAgIChhbmQgKGVx IChwb2ludCkgKG1hcmtlci1wb3NpdGlvbiBtYXJrZXIpKSA7IGN1cnJlbnQgbGluZQorICAg ICAgICAgICh3aGVuIChvciAobm90IChlb2xwKSkgOyBub3QgYW4gZW1wdHkgbGluZQorICAg ICAgICAgICAgICAgICAgICA7OyBJZiB0aGUgY3VycmVudCBsaW5lIGlzIGVtcHR5LCB3ZSBt YXkKKyAgICAgICAgICAgICAgICAgICAgOzsgd2FudCB0byBpbmRlbnQgaXQuCisgICAgICAg ICAgICAgICAgICAgIChhbmQgKGVxIChwb2ludCkgKG1hcmtlci1wb3NpdGlvbiBtYXJrZXIp KQogICAgICAgICAgICAgICAgICAgICAgICAgIHByZXNlcnZlLWJsYW5rLWxpbmUpKQotCSAg ICAobGV0ICgoaSAoY3VycmVudC1jb2x1bW4pKSkKLQkgICAgICAoZGVsZXRlLXJlZ2lvbiAo bGluZS1iZWdpbm5pbmctcG9zaXRpb24pIChwb2ludCkpCi0JICAgICAgKGluZGVudC10byAo KyBpIGluZGVudGF0aW9uLW9mZnNldCkpKSkKKyAgICAgICAgICAgIChpbnNlcnQgaW5kZW50 LXN0cikpCiAJICAoZm9yd2FyZC1saW5lKSkpCiAgICAgICA7OyBBcHBseSBXUklURS1CQUNL IGZ1bmN0aW9uIG9uIGVkaXQgYnVmZmVyIGNvbnRlbnRzLgogICAgICAgKGdvdG8tY2hhciAo cG9pbnQtbWluKSkKQEAgLTYzNiw3ICs2MzksOCBAQCBMZWF2ZSBwb2ludCBpbiBlZGl0IGJ1 ZmZlci4iCiAgICJGb250aWZ5IGNvZGUgYmxvY2sgYmV0d2VlbiBTVEFSVCBhbmQgRU5EIHVz aW5nIExBTkcncyBzeW50YXguCiBUaGlzIGZ1bmN0aW9uIGlzIGNhbGxlZCBieSBFbWFjcycg YXV0b21hdGljIGZvbnRpZmljYXRpb24sIGFzIGxvbmcKIGFzIGBvcmctc3JjLWZvbnRpZnkt bmF0aXZlbHknIGlzIG5vbi1uaWwuIgotICAobGV0ICgobW9kaWZpZWQgKGJ1ZmZlci1tb2Rp ZmllZC1wKSkpCisgIChsZXQgKChtb2RpZmllZCAoYnVmZmVyLW1vZGlmaWVkLXApKQorICAg ICAgICBuYXRpdmUtdGFiLXdpZHRoKQogICAgIChyZW1vdmUtdGV4dC1wcm9wZXJ0aWVzIHN0 YXJ0IGVuZCAnKGZhY2UgbmlsKSkKICAgICAobGV0ICgobGFuZy1tb2RlIChvcmctc3JjLWdl dC1sYW5nLW1vZGUgbGFuZykpKQogICAgICAgKHdoZW4gKGZib3VuZHAgbGFuZy1tb2RlKQpA QCAtNjUwLDYgKzY1NCw3IEBAIGFzIGBvcmctc3JjLWZvbnRpZnktbmF0aXZlbHknIGlzIG5v bi1uaWwuIgogCSAgICAgIDs7IEFkZCBzdHJpbmcgYW5kIGEgZmluYWwgc3BhY2UgdG8gZW5z dXJlIHByb3BlcnR5IGNoYW5nZS4KIAkgICAgICAoaW5zZXJ0IHN0cmluZyAiICIpKQogCSAg ICAodW5sZXNzIChlcSBtYWpvci1tb2RlIGxhbmctbW9kZSkgKGZ1bmNhbGwgbGFuZy1tb2Rl KSkKKyAgICAgICAgICAgIChzZXRxIG5hdGl2ZS10YWItd2lkdGggdGFiLXdpZHRoKQogICAg ICAgICAgICAgKGZvbnQtbG9jay1lbnN1cmUpCiAJICAgIChsZXQgKChwb3MgKHBvaW50LW1p bikpIG5leHQpCiAJICAgICAgKHdoaWxlIChzZXRxIG5leHQgKG5leHQtcHJvcGVydHktY2hh bmdlIHBvcykpCkBAIC03MDcsNiArNzEyLDE1IEBAIGFzIGBvcmctc3JjLWZvbnRpZnktbmF0 aXZlbHknIGlzIG5vbi1uaWwuIgogICAgICAgKHdoZW4gKG9yIChmYWNlcCBzcmMtZmFjZSkg KGxpc3RwIHNyYy1mYWNlKSkKICAgICAgICAgKGZvbnQtbG9jay1hcHBlbmQtdGV4dC1wcm9w ZXJ0eSBzdGFydCBlbmQgJ2ZhY2Ugc3JjLWZhY2UpKQogICAgICAgKGZvbnQtbG9jay1hcHBl bmQtdGV4dC1wcm9wZXJ0eSBzdGFydCBlbmQgJ2ZhY2UgJ29yZy1ibG9jaykpCisgICAgOzsg RGlzcGxheSB0YWIgaW5kZW50YXRpb24gY2hhcmFjdGVycyBwcmVjZWRlZCBieSBzcGFjZXMg YXMgc3BhY2VzCisgICAgKHVubGVzcyBvcmctc3JjLXByZXNlcnZlLWluZGVudGF0aW9uCisg ICAgICAoc2F2ZS1leGN1cnNpb24KKyAgICAgICAgKGdvdG8tY2hhciBzdGFydCkKKyAgICAg ICAgKHdoaWxlIChyZS1zZWFyY2gtZm9yd2FyZCAiXlsgXStcXChbXHRdK1xcKSIgZW5kIHQp CisgICAgICAgICAgKGxldCogKChiIChtYXRjaC1iZWdpbm5pbmcgMSkpCisgICAgICAgICAg ICAgICAgIChlIChtYXRjaC1lbmQgMSkpCisgICAgICAgICAgICAgICAgIChzIChtYWtlLXN0 cmluZyAoKiAoLSBlIGIpIG5hdGl2ZS10YWItd2lkdGgpID8gKSkpCisgICAgICAgICAgICAo YWRkLXRleHQtcHJvcGVydGllcyBiIGUgYChkaXNwbGF5ICxzKSkpKSkpCiAgICAgOzsgQ2xl YXIgYWJicmV2aWF0ZWQgbGluayBmb2xkaW5nLgogICAgIChvcmctZm9sZC1yZWdpb24gc3Rh cnQgZW5kIG5pbCAnb3JnLWxpbmspCiAgICAgKGFkZC10ZXh0LXByb3BlcnRpZXMKZGlmZiAt LWdpdCBhL3Rlc3RpbmcvbGlzcC90ZXN0LW9yZy1zcmMuZWwgYi90ZXN0aW5nL2xpc3AvdGVz dC1vcmctc3JjLmVsCmluZGV4IDJhNDViYTY2ZS4uMTFkNTYyMDlkIDEwMDY0NAotLS0gYS90 ZXN0aW5nL2xpc3AvdGVzdC1vcmctc3JjLmVsCisrKyBiL3Rlc3RpbmcvbGlzcC90ZXN0LW9y Zy1zcmMuZWwKQEAgLTMwNCwxMSArMzA0LDExIEBAIFRoaXMgaXMgYSB0YWI6XHQuCiAJKGlu c2VydCAiIEZvbyIpCiAJKG9yZy1lZGl0LXNyYy1leGl0KQogCShidWZmZXItc3RyaW5nKSkp KSkKLSAgOzsgR2xvYmFsIGluZGVudGF0aW9uIG9iZXlzIGBpbmRlbnQtdGFicy1tb2RlJyBm cm9tIHRoZSBvcmlnaW5hbAotICA7OyBidWZmZXIuCi0gIChzaG91bGQKKyAgOzsgR2xvYmFs IGluZGVudGF0aW9uIGRvZXMgbm90IG9iZXkgYGluZGVudC10YWJzLW1vZGUnIGZyb20gdGhl CisgIDs7IG9yaWdpbmFsIGJ1ZmZlci4KKyAgKHNob3VsZC1ub3QKICAgIChzdHJpbmctbWF0 Y2gtcAotICAgICJeXHQrXHMqYXJndW1lbnQyIgorICAgICJcdCIKICAgICAob3JnLXRlc3Qt d2l0aC10ZW1wLXRleHQKIAkiCiAtIEl0ZW0KQEAgLTMxOCwxOSArMzE4LDIxIEBAIFRoaXMg aXMgYSB0YWI6XHQuCiAgICAgICAgICAgICAgIGFyZ3VtZW50MikpCiAgICMrRU5EX1NSQyIK ICAgICAgIChzZXRxLWxvY2FsIGluZGVudC10YWJzLW1vZGUgdCkKLSAgICAgIChsZXQgKChv cmctZWRpdC1zcmMtY29udGVudC1pbmRlbnRhdGlvbiAyKQorICAgICAgKGxldCAoKHRhYi13 aWR0aCA4KQorICAgICAgICAgICAgKG9yZy1lZGl0LXNyYy1jb250ZW50LWluZGVudGF0aW9u IDIpCiAJICAgIChvcmctc3JjLXByZXNlcnZlLWluZGVudGF0aW9uIG5pbCkpCiAJKG9yZy1l ZGl0LXNwZWNpYWwpCiAJKG9yZy1lZGl0LXNyYy1leGl0KQogCShidWZmZXItc3RyaW5nKSkp KSkKKyAgOzsgVGFiIGNoYXJhY3RlciBpcyBwcmVzZXJ2ZWQKICAgKHNob3VsZAogICAgKHN0 cmluZy1tYXRjaC1wCi0gICAgIl5ccythcmd1bWVudDIiCisgICAgIlx0YXJndW1lbnQyIgog ICAgIChvcmctdGVzdC13aXRoLXRlbXAtdGV4dAogCSIKIC0gSXRlbQogICAjK0JFR0lOX1NS QyBlbWFjcy1saXNwPHBvaW50PgotICAgIChwcm9nblxuICAgICAgKGZ1bmN0aW9uIGFyZ3Vt ZW50MVxuXHRcdGFyZ3VtZW50MikpCisgICAgKHByb2duXG4gICAgICAoZnVuY3Rpb24gYXJn dW1lbnQxXG4gICAgXHRhcmd1bWVudDIpKQogICAjK0VORF9TUkMiCiAgICAgICAoc2V0cS1s b2NhbCBpbmRlbnQtdGFicy1tb2RlIG5pbCkKICAgICAgIChsZXQgKChvcmctZWRpdC1zcmMt Y29udGVudC1pbmRlbnRhdGlvbiAyKQpAQCAtMzM4LDQzICszNDAsNDMgQEAgVGhpcyBpcyBh IHRhYjpcdC4KIAkob3JnLWVkaXQtc3BlY2lhbCkKIAkob3JnLWVkaXQtc3JjLWV4aXQpCiAJ KGJ1ZmZlci1zdHJpbmcpKSkpKQotICA7OyBHbG9iYWwgaW5kZW50YXRpb24gYWxzbyBvYmV5 cyBgdGFiLXdpZHRoJyBmcm9tIG9yaWdpbmFsIGJ1ZmZlci4KKyAgOzsgSW5kZW50YXRpb24g ZG9lcyBub3Qgb2JleSBgdGFiLXdpZHRoJyBmcm9tIG9yZyBidWZmZXIuCiAgIChzaG91bGQK ICAgIChzdHJpbmctbWF0Y2gtcAotICAgICJeXHRcXHszXFx9XHNcXHsyXFx9YXJndW1lbnQy IgorICAgICJeICBcdGFyZ3VtZW50MiIKICAgICAob3JnLXRlc3Qtd2l0aC10ZW1wLXRleHQK IAkiCi0tIEl0ZW0KLSAgIytCRUdJTl9TUkMgZW1hY3MtbGlzcDxwb2ludD4KKyMrQkVHSU5f U1JDIGVtYWNzLWxpc3AKICAgKHByb2duCi0gICAgKGZ1bmN0aW9uIGFyZ3VtZW50MQotICAg ICAgICAgICAgICBhcmd1bWVudDIpKQotICAjK0VORF9TUkMiCisgICAgKGxpc3QgYXJndW1l bnQxXG4gIFx0PHBvaW50PmFyZ3VtZW50MikpCisjK0VORF9TUkMiCiAgICAgICAoc2V0cS1s b2NhbCBpbmRlbnQtdGFicy1tb2RlIHQpCiAgICAgICAoc2V0cS1sb2NhbCB0YWItd2lkdGgg NCkKLSAgICAgIChsZXQgKChvcmctZWRpdC1zcmMtY29udGVudC1pbmRlbnRhdGlvbiAwKQor ICAgICAgKGxldCAoKG9yZy1lZGl0LXNyYy1jb250ZW50LWluZGVudGF0aW9uIDIpCiAJICAg IChvcmctc3JjLXByZXNlcnZlLWluZGVudGF0aW9uIG5pbCkpCiAJKG9yZy1lZGl0LXNwZWNp YWwpCisgICAgICAgIChzZXRxLWxvY2FsIGluZGVudC10YWJzLW1vZGUgdCkKKyAgICAgICAg KHNldHEtbG9jYWwgdGFiLXdpZHRoIDgpCisgICAgICAgIChsaXNwLWluZGVudC1saW5lKQog CShvcmctZWRpdC1zcmMtZXhpdCkKIAkoYnVmZmVyLXN0cmluZykpKSkpCisgIDs7IFRhYiBj aGFyYWN0ZXJzIGFyZSBkaXNwbGF5ZWQgd2l0aCBgdGFiLXdpZHRoJyBmcm9tIHRoZSBuYXRp dmUKKyAgOzsgZWRpdCBidWZmZXIuCiAgIChzaG91bGQKLSAgIChzdHJpbmctbWF0Y2gtcAot ICAgICJeXHRcc1xcezZcXH1hcmd1bWVudDIiCisgICAoZXF1YWwKKyAgICAxMAogICAgIChv cmctdGVzdC13aXRoLXRlbXAtdGV4dAotCSIKLS0gSXRlbQotICAjK0JFR0lOX1NSQyBlbWFj cy1saXNwPHBvaW50PgorICAgICAiCisjK0JFR0lOX1NSQyBlbWFjcy1saXNwCiAgIChwcm9n bgotICAgIChmdW5jdGlvbiBhcmd1bWVudDEKLSAgICAgICAgICAgICAgYXJndW1lbnQyKSkK LSAgIytFTkRfU1JDIgotICAgICAgKHNldHEtbG9jYWwgaW5kZW50LXRhYnMtbW9kZSB0KQot ICAgICAgKHNldHEtbG9jYWwgdGFiLXdpZHRoIDgpCi0gICAgICAobGV0ICgob3JnLWVkaXQt c3JjLWNvbnRlbnQtaW5kZW50YXRpb24gMCkKLQkgICAgKG9yZy1zcmMtcHJlc2VydmUtaW5k ZW50YXRpb24gbmlsKSkKLQkob3JnLWVkaXQtc3BlY2lhbCkKLQkob3JnLWVkaXQtc3JjLWV4 aXQpCi0JKGJ1ZmZlci1zdHJpbmcpKSkpKSkKKyAgICAobGlzdCBhcmd1bWVudDFcbiAgXHQ8 cG9pbnQ+YXJndW1lbnQyKSkKKyMrRU5EX1NSQyIKKyAgICAgKHNldHEtbG9jYWwgaW5kZW50 LXRhYnMtbW9kZSB0KQorICAgICAoc2V0cS1sb2NhbCB0YWItd2lkdGggNCkKKyAgICAgKGxl dCAoKG9yZy1lZGl0LXNyYy1jb250ZW50LWluZGVudGF0aW9uIDIpCisJICAgKG9yZy1zcmMt cHJlc2VydmUtaW5kZW50YXRpb24gbmlsKSkKKyAgICAgICAoZm9udC1sb2NrLWVuc3VyZSkK KyAgICAgICAoY3VycmVudC1jb2x1bW4pKSkpKSkKIAogKGVydC1kZWZ0ZXN0IHRlc3Qtb3Jn LXNyYy9mb290bm90ZS1yZWZlcmVuY2VzICgpCiAgICJUZXN0IGVkaXRpbmcgZm9vdG5vdGUg cmVmZXJlbmNlcy4iCi0tIAoyLjQxLjAKCg== --------------zuEhhJ0RFcVvl0hUxSzBBBp4--