From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id qNxxCYQFjmTv9gAASxT56A (envelope-from ) for ; Sat, 17 Jun 2023 21:12:04 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id GA1ZCYQFjmQOowAAauVa8A (envelope-from ) for ; Sat, 17 Jun 2023 21:12:04 +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 8BFBC2FA87 for ; Sat, 17 Jun 2023 21:12:03 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qAbKK-0001EZ-LR; Sat, 17 Jun 2023 15:11:12 -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 1qAbKH-0001Dz-Q9 for emacs-orgmode@gnu.org; Sat, 17 Jun 2023 15:11:10 -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 1qAbKD-00066E-Sm for emacs-orgmode@gnu.org; Sat, 17 Jun 2023 15:11:09 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 8B018240104 for ; Sat, 17 Jun 2023 21:11:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.eu; s=2017; t=1687029062; bh=IYmqt69bm7gk+gYcrvXjFaW2zre5xcdfTbQiiDXodVo=; h=Message-ID:Date:MIME-Version:Reply-To:Subject:To:Cc:From:From; b=RLuY+IQB8A4lqLQSgIclXTCHs2O6B4RBX9vXLRkOOWTsBntVGXYzkoH9OYw5sT28x 9jt6fx0jwBmY752vcHlXesiABhqJ9E5cqY5VHCV6dIp46zRl9Kn/OepKk9wlG9BD2t oXiyLoKC77dPeobLbMrbljwZ19TO0sWaHw/gZ+YIxJPQOteMqEwRVGPQ+BZNaHeVcE r8KzfaMHUSWdgjCK4gJq/XY1Y9jhKMk/UY/j+9J5IB+tCN9aktWvG/h1ES2u/n84oE us85BWm64qrZqCwHzBWSs1lk+DJ8r4ss1DXOev476ZMSm0VNoAc+oEWgKgXAbhRHFj JnrW9t5/uHVnQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Qk5GY6rgkz6twk; Sat, 17 Jun 2023 21:11:01 +0200 (CEST) Content-Type: multipart/mixed; boundary="------------edTje3PwOHXRoBZNNW4tUXEG" Message-ID: <8d8642c9-ced3-b254-0f49-f7b9c06311ff@posteo.eu> Date: Sat, 17 Jun 2023 19:11:01 +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/)] To: Ihor Radchenko , wolf Cc: emacs-orgmode@gnu.org References: <87ttva8chx.fsf@localhost> Content-Language: fr From: =?UTF-8?Q?S=c3=a9bastien_Miquel?= In-Reply-To: <87ttva8chx.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=1687029123; a=rsa-sha256; cv=none; b=dz28MrVp7VI6TOQX63THgYHKZzaobXTWZ4MqIhm4Z/3xFBGZC47sqxDpZ8h5EqwPsRtorq XFpjkEFjLCojw8oVuIxZLqA4I1kPimVpx3sXtdOC4Xq/IBSIgg7b2YTtg10VCEH38AVVze TT7sY8SaQy1Ms+878Jq1GjQ5buEoxxfMIkOKWzHDy6h+2IUzOFCal7miPytruV6BIzuMsu 49t9oPfQpXMhr/vWZ5IQ4Wcq+iZ4DUwk8cq9730wPZSR/yvhY5fm0miPXjXZrpzbanou5h /Etne5CaXefLLzEzUIsO1WApw9iEnH38HGmyu3I0aZAV6g6dschr83cHoX0liw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=posteo.eu header.s=2017 header.b=RLuY+IQB; 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=1687029123; 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=Yn8CGvPbX6pxOHxm/AI8t5KD75FMB4KyYJNhPRP/6gc=; b=JgycMFl1nknlsBBed+eNt+0g35aXPJgzMpD38WdvW7AfzzeueGdRwNmLthofhJt9qYlWr7 AnVshmL7a512W7+clYrKdeszrgRmZsk7WXbg/IACqxx+7tXwvnsYbKRAOsmXhRc7C+juFX Y0kYjY27QYkWu1nmuvU8JmHgnn85HFp8ki0VdyvLzpSlGxCVT1ig/q1+7/vyFgF0bR8NhV n4WP5HREqGL5FL9SLDQpX/086fJUQCBMCZKv0q1xec3iIOaLmDTFuyfRWs5oX9zNTEFp1r VZ5A9m9etjWkOGFuhGixBkECkGtiHA69xazdcnVK5JsX3ZzAmArf9EKtZ8HOyQ== Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=posteo.eu header.s=2017 header.b=RLuY+IQB; 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: -3.43 X-Spam-Score: -3.43 X-Migadu-Queue-Id: 8BFBC2FA87 X-TUID: DXdAHy3rHCQY This is a multi-part message in MIME format. --------------edTje3PwOHXRoBZNNW4tUXEG Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Hi Ihor, wolf, Ihor Radchenko writes: > Confirmed. > This is caused by `org-src--contents-for-write-back' not adjusting > blank line indentation in some cases. I don't think that's the issue. In fact, applying your diff didn't seem to solve the issue on my end. Generally, if you edit the given yaml in a =C-c C-'= buffer and go back to the org buffer with the default configuration, spaces will be converted to tabs, because =indent-tabs-mode= is =t= in the org buffer. I don't think there's much that we can do about it. We could try to read the value of =indent-tabs-mode= in the native buffer and preserve it in the org buffer, but then the org buffer would have mixed indentation all over, and that's exactly what the current code tries to avoid. To fix the original issue, you can set =indent-tabs-mode= to =nil= in your org files, or possibly set =org-preserve-indentation= to =t= (untested). > I feel that the whole approach we use now with preserve-fl, use-tabs?, > and preserve-blank-line is overcomplicated. Maybe someone can explain > why we need all these special cases? The code does not reveal a whole lot. - =use-tabs?= seems pretty straightforward, its purpose is to respect the value of =indent-tabs-mode= in the org buffer. - =preserve-fl= is an isolated issue, and only concerns LaTeX fragments. I will attach a test with the issue it solves with multiline LaTeX fragments. I think LaTeX fragments are particular because in the org buffer they do not need to start at the beginning of a line. - The =preserve-blank-line= part (committed by me) is quite abstruse. Its name does not make any sense ! Originally, we did not try to reindent blank lines when writing back to the org buffer. I changed it so that when using =org-return=, the newline would get correctly indented, I think. Then I changed it again so that only the current blank line might get indented, see : https://list.orgmode.org/725763.1632663635@apollo2.minshall.org/T/ The variable =preserve-blank-line= decides whether we should indent the current blank line (if it is empty, we should maybe not). Here are three patches attached. 1. Two tests : about editing LaTeX fragments, and preserving empty lines. 2. Renaming of =preserve-blank-line=, for clarity. 3. Two more tests testing the behaviour of =org-return= and indentation, with the default configuration. When writing these, I found the behaviour was buggy in one case, and modified =org-indent-line= to fix it. Does that look alright to you ? Regards, -- Sébastien Miquel --------------edTje3PwOHXRoBZNNW4tUXEG Content-Type: text/x-patch; charset=UTF-8; name="0001-test-org-src.el-Add-two-tests.patch" Content-Disposition: attachment; filename="0001-test-org-src.el-Add-two-tests.patch" Content-Transfer-Encoding: base64 RnJvbSA5NjEzYTU0ZDIwODgzZTU2MzAxZjk4N2Y1NDk1Yjk2MmYzNzYzY2FkIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/Uz1DMz1BOWJhc3RpZW49MjBNaXF1 ZWw/PSA8c2ViYXN0aWVuLm1pcXVlbEBwb3N0ZW8uZXU+CkRhdGU6IFNhdCwgMTcgSnVuIDIw MjMgMTc6MDA6NTEgKzAyMDAKU3ViamVjdDogW1BBVENIXSB0ZXN0LW9yZy1zcmMuZWw6IEFk ZCB0d28gdGVzdHMKCiogdGVzdGluZy9saXNwL3Rlc3Qtb3JnLXNyYy5lbCAodGVzdC1vcmct c3JjL3ByZXNlcnZlLWVtcHR5LWxpbmVzKToKVGVzdCB0aGF0IGVtcHR5IGxpbmVzIGFyZSBu b3QgaW5kZW50ZWQuCih0ZXN0LW9yZy1zcmMvaW5kZW50ZWQtbGF0ZXgtZnJhZ21lbnRzKTog VGVzdCBzcGVjaWFsIGVkaXQgb2YKbXVsdGlsaW5lIGluZGVudGVkIExhVGVYIGZyYWdtZW50 LgotLS0KIHRlc3RpbmcvbGlzcC90ZXN0LW9yZy1zcmMuZWwgfCA1MiArKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysKIDEgZmlsZSBjaGFuZ2VkLCA1MiBpbnNlcnRpb25z KCspCgpkaWZmIC0tZ2l0IGEvdGVzdGluZy9saXNwL3Rlc3Qtb3JnLXNyYy5lbCBiL3Rlc3Rp bmcvbGlzcC90ZXN0LW9yZy1zcmMuZWwKaW5kZXggMmE0NWJhNjZlLi40MmVkYjM2NGEgMTAw NjQ0Ci0tLSBhL3Rlc3RpbmcvbGlzcC90ZXN0LW9yZy1zcmMuZWwKKysrIGIvdGVzdGluZy9s aXNwL3Rlc3Qtb3JnLXNyYy5lbApAQCAtMTQ0LDYgKzE0NCw0NyBAQCBUaGlzIGlzIGEgdGFi Olx0LgogICAgICAgICAgICAgICAob3JnLWVkaXQtc3JjLWV4aXQpCiAgICAgICAgICAgICAg IChidWZmZXItc3RyaW5nKSkpKSkpCiAKKyhlcnQtZGVmdGVzdCB0ZXN0LW9yZy1zcmMvcHJl c2VydmUtZW1wdHktbGluZXMgKCkKKyAgIkVkaXRpbmcgYmxvY2sgcHJlc2VydmVzIGVtcHR5 IGxpbmVzLiIKKyAgKHNob3VsZAorICAgKGVxdWFsICIKKyMrYmVnaW5fc3JjIGVtYWNzLWxp c3AKKyAgVGhlIGZvbGxvd2luZyBsaW5lIGlzIGVtcHR5CisKKyAgYWJjCisjK2VuZF9zcmMi CisgICAgICAgICAgKG9yZy10ZXN0LXdpdGgtdGVtcC10ZXh0CisgICAgICAgICAgICIKKyMr YmVnaW5fc3JjIGVtYWNzLWxpc3AKKyAgVGhlIGZvbGxvd2luZyBsaW5lIGlzIGVtcHR5CisK KyAgYWJjPHBvaW50PgorIytlbmRfc3JjIgorICAgICAgICAgICAobGV0ICgob3JnLWVkaXQt c3JjLWNvbnRlbnQtaW5kZW50YXRpb24gMikKKyAgICAgICAgICAgICAgICAgKG9yZy1zcmMt cHJlc2VydmUtaW5kZW50YXRpb24gbmlsKSkKKyAgICAgICAgICAgICAob3JnLWVkaXQtc3Bl Y2lhbCkKKyAgICAgICAgICAgICAob3JnLWVkaXQtc3JjLWV4aXQpCisgICAgICAgICAgICAg KGJ1ZmZlci1zdHJpbmcpKSkpKQorICAoc2hvdWxkCisgICAoZXF1YWwgIgorIytiZWdpbl9z cmMgZW1hY3MtbGlzcAorICBUaGUgZm9sbG93aW5nIGxpbmUgaXMgZW1wdHkKKworICBhYmMK KyMrZW5kX3NyYyIKKyAgICAgICAgICAob3JnLXRlc3Qtd2l0aC10ZW1wLXRleHQKKyAgICAg ICAgICAgIgorIytiZWdpbl9zcmMgZW1hY3MtbGlzcAorICBUaGUgZm9sbG93aW5nIGxpbmUg aXMgZW1wdHkKKzxwb2ludD4KKyAgYWJjCisjK2VuZF9zcmMiCisgICAgICAgICAgIChsZXQg KChvcmctZWRpdC1zcmMtY29udGVudC1pbmRlbnRhdGlvbiAyKQorICAgICAgICAgICAgICAg ICAob3JnLXNyYy1wcmVzZXJ2ZS1pbmRlbnRhdGlvbiBuaWwpKQorICAgICAgICAgICAgIChv cmctZWRpdC1zcGVjaWFsKQorICAgICAgICAgICAgIChvcmctZWRpdC1zcmMtZXhpdCkKKyAg ICAgICAgICAgICAoYnVmZmVyLXN0cmluZykpKSkpICApCisKIChlcnQtZGVmdGVzdCB0ZXN0 LW9yZy1zcmMvY29kZXJlZi1mb3JtYXQgKCkKICAgIlRlc3QgYG9yZy1zcmMtY29kZXJlZi1m b3JtYXQnIHNwZWNpZmljYXRpb25zLiIKICAgOzsgUmVndWxhciB0ZXN0cyBpbiBhIHNyYyBi bG9jaywgYW4gZXhhbXBsZSBibG9jayBhbmQgYW4gZWRpdApAQCAtMzc2LDYgKzQxNywxNyBA QCBUaGlzIGlzIGEgdGFiOlx0LgogCShvcmctZWRpdC1zcmMtZXhpdCkKIAkoYnVmZmVyLXN0 cmluZykpKSkpKQogCisoZXJ0LWRlZnRlc3QgdGVzdC1vcmctc3JjL2luZGVudGVkLWxhdGV4 LWZyYWdtZW50cyAoKQorICAiVGVzdCBlZGl0aW5nIG11bHRpbGluZSBpbmRlbnRlZCBMYVRl WCBmcmFnbWVudC4iCisgIChzaG91bGQKKyAgIChlcXVhbAorICAgICItIEl0ZW0gJGFiY1xu ICBlZmckIgorICAgIChvcmctdGVzdC13aXRoLXRlbXAtdGV4dAorICAgICAiLSBJdGVtICRh YmM8cG9pbnQ+XG4gIGVmZyQiCisgICAgIChvcmctZWRpdC1zcGVjaWFsKQorICAgICAob3Jn LWVkaXQtc3JjLWV4aXQpCisgICAgIChidWZmZXItc3RyaW5nKSkpKSkKKwogKGVydC1kZWZ0 ZXN0IHRlc3Qtb3JnLXNyYy9mb290bm90ZS1yZWZlcmVuY2VzICgpCiAgICJUZXN0IGVkaXRp bmcgZm9vdG5vdGUgcmVmZXJlbmNlcy4iCiAgIDs7IEVycm9yIHdoZW4gdGhlcmUgaXMgbm8g ZGVmaW5pdGlvbiB0byBlZGl0LgotLSAKMi40MS4wCgo= --------------edTje3PwOHXRoBZNNW4tUXEG Content-Type: text/x-patch; charset=UTF-8; name="0001-org-src.el-Rename-internal-variable-for-clarity.patch" Content-Disposition: attachment; filename*0="0001-org-src.el-Rename-internal-variable-for-clarity.patch" Content-Transfer-Encoding: base64 RnJvbSBjYjdlM2ZiNTkxMDlkMmUzZWE0ZmFiNzJhZTJjZDY5ZjViMWVmYTA4IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/Uz1DMz1BOWJhc3RpZW49MjBNaXF1 ZWw/PSA8c2ViYXN0aWVuLm1pcXVlbEBwb3N0ZW8uZXU+CkRhdGU6IFNhdCwgMTcgSnVuIDIw MjMgMTc6MTA6NTMgKzAyMDAKU3ViamVjdDogW1BBVENIXSBvcmctc3JjLmVsOiBSZW5hbWUg aW50ZXJuYWwgdmFyaWFibGUgZm9yIGNsYXJpdHkKCiogbGlzcC9vcmctc3JjLmVsIChvcmct c3JjLS1jb250ZW50cy1mb3Itd3JpdGUtYmFjayk6Cihvcmctc3JjLS1lZGl0LWVsZW1lbnQp OiBSZW5hbWUgYHByZXNlcnZlLWJsYW5rLWxpbmUnIHRvCmBpbmRlbnQtY3VycmVudC1ibGFu ay1saW5lJy4gSXQgaXMgdXNlZCB0byBkZWNpZGUgd2hldGhlciB3ZSBzaG91bGQKaW5kZW50 IHRoZSBjdXJyZW50IGJsYW5rIGxpbmUgYWZ0ZXIgYSBzcGVjaWFsIGVkaXQuCi0tLQogbGlz cC9vcmctc3JjLmVsIHwgMTUgKysrKysrKystLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgOCBp bnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpc3Avb3JnLXNy Yy5lbCBiL2xpc3Avb3JnLXNyYy5lbAppbmRleCBmMTViYThlOTkuLmYwOTgyZWExMiAxMDA2 NDQKLS0tIGEvbGlzcC9vcmctc3JjLmVsCisrKyBiL2xpc3Avb3JnLXNyYy5lbApAQCAtMzE4 LDggKzMxOCw4IEBAIGlzIDAuIikKICAgIkZpbGUgbmFtZSBhc3NvY2lhdGVkIHRvIE9yZyBz b3VyY2UgYnVmZmVyLCBvciBuaWwuIikKIChwdXQgJ29yZy1zcmMtc291cmNlLWZpbGUtbmFt ZSAncGVybWFuZW50LWxvY2FsIHQpCiAKLShkZWZ2YXItbG9jYWwgb3JnLXNyYy0tcHJlc2Vy dmUtYmxhbmstbGluZSBuaWwpCi0ocHV0ICdvcmctc3JjLS1wcmVzZXJ2ZS1ibGFuay1saW5l ICdwZXJtYW5lbnQtbG9jYWwgdCkKKyhkZWZ2YXItbG9jYWwgb3JnLXNyYy0taW5kZW50LWN1 cnJlbnQtYmxhbmstbGluZSBuaWwpCisocHV0ICdvcmctc3JjLS1pbmRlbnQtY3VycmVudC1i bGFuay1saW5lICdwZXJtYW5lbnQtbG9jYWwgdCkKIAogKGRlZnVuIG9yZy1zcmMtLWNvbnN0 cnVjdC1lZGl0LWJ1ZmZlci1uYW1lIChvcmctYnVmZmVyLW5hbWUgbGFuZykKICAgIkNvbnN0 cnVjdCB0aGUgYnVmZmVyIG5hbWUgZm9yIGEgc291cmNlIGVkaXRpbmcgYnVmZmVyLgpAQCAt NDczLDcgKzQ3Myw3IEBAIEFzc3VtZSBwb2ludCBpcyBpbiB0aGUgY29ycmVzcG9uZGluZyBl ZGl0IGJ1ZmZlci4iCiAgICAgICAgICAgICAgICAgICAgICAobGlzdCAoYnVmZmVyLXN1YnN0 cmluZyAocG9pbnQtbWluKSBlb2wpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAoYnVm ZmVyLXN1YnN0cmluZyBlb2wgKHBvaW50LW1heCkpKSkpKQogCSh3cml0ZS1iYWNrIG9yZy1z cmMtLWFsbG93LXdyaXRlLWJhY2spCi0gICAgICAgIChwcmVzZXJ2ZS1ibGFuay1saW5lIG9y Zy1zcmMtLXByZXNlcnZlLWJsYW5rLWxpbmUpCisgICAgICAgIChpbmRlbnQtY3VycmVudC1i bGFuay1saW5lIG9yZy1zcmMtLWluZGVudC1jdXJyZW50LWJsYW5rLWxpbmUpCiAgICAgICAg IG1hcmtlcikKICAgICAod2l0aC1jdXJyZW50LWJ1ZmZlciB3cml0ZS1iYWNrLWJ1ZgogICAg ICAgOzsgUmVwcm9kdWNlIGluZGVudGF0aW9uIHBhcmFtZXRlcnMgZnJvbSBzb3VyY2UgYnVm ZmVyLgpAQCAtNDkzLDcgKzQ5Myw3IEBAIEFzc3VtZSBwb2ludCBpcyBpbiB0aGUgY29ycmVz cG9uZGluZyBlZGl0IGJ1ZmZlci4iCiAJICAoc2tpcC1jaGFycy1mb3J3YXJkICIgXHQiKQog ICAgICAgICAgICh3aGVuIChvciAobm90IChlb2xwKSkgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgOyBub3QgYSBibGFuayBsaW5lCiAgICAgICAgICAgICAgICAgICAgIChhbmQg KGVxIChwb2ludCkgKG1hcmtlci1wb3NpdGlvbiBtYXJrZXIpKSA7IGN1cnJlbnQgbGluZQot ICAgICAgICAgICAgICAgICAgICAgICAgIHByZXNlcnZlLWJsYW5rLWxpbmUpKQorICAgICAg ICAgICAgICAgICAgICAgICAgIGluZGVudC1jdXJyZW50LWJsYW5rLWxpbmUpKQogCSAgICAo bGV0ICgoaSAoY3VycmVudC1jb2x1bW4pKSkKIAkgICAgICAoZGVsZXRlLXJlZ2lvbiAobGlu ZS1iZWdpbm5pbmctcG9zaXRpb24pIChwb2ludCkpCiAJICAgICAgKGluZGVudC10byAoKyBp IGluZGVudGF0aW9uLW9mZnNldCkpKSkKQEAgLTU1Miw4ICs1NTIsOSBAQCBMZWF2ZSBwb2lu dCBpbiBlZGl0IGJ1ZmZlci4iCiAgICAgICAgICAgICAgKGJsYW5rLWxpbmUgKHNhdmUtZXhj dXJzaW9uIChiZWdpbm5pbmctb2YtbGluZSkKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgKGxvb2tpbmctYXQtcCAiXltbOnNwYWNlOl1dKiQiKSkpCiAgICAg ICAgICAgICAgKGVtcHR5LWxpbmUgKGFuZCBibGFuay1saW5lIChsb29raW5nLWF0LXAgIl4k IikpKQotICAgICAgICAgICAgIChwcmVzZXJ2ZS1ibGFuay1saW5lIChvciAoYW5kIGJsYW5r LWxpbmUgKG5vdCBlbXB0eS1saW5lKSkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgKGFuZCBlbXB0eS1saW5lICg9ICgrIGJsb2NrLWluZCBjb250ZW50LWluZCkg MCkpKSkKKyAgICAgICAgICAgICAoaW5kZW50LWN1cnJlbnQtYmxhbmstbGluZSAob3IgKGFu ZCBibGFuay1saW5lIChub3QgZW1wdHktbGluZSkpCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIChhbmQgZW1wdHktbGluZQorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICg9ICgrIGJsb2NrLWluZCBjb250 ZW50LWluZCkgMCkpKSkKIAkgICAgIChwcmVzZXJ2ZS1pbmQKIAkgICAgICAoYW5kIChtZW1x IHR5cGUgJyhleGFtcGxlLWJsb2NrIHNyYy1ibG9jaykpCiAJCSAgIChvciAob3JnLWVsZW1l bnQtcHJvcGVydHkgOnByZXNlcnZlLWluZGVudCBkYXR1bSkKQEAgLTYwMyw3ICs2MDQsNyBA QCBMZWF2ZSBwb2ludCBpbiBlZGl0IGJ1ZmZlci4iCiAJKHNldHEgb3JnLXNyYy0tb3Zlcmxh eSBvdmVybGF5KQogCShzZXRxIG9yZy1zcmMtLWFsbG93LXdyaXRlLWJhY2sgd3JpdGUtYmFj aykKIAkoc2V0cSBvcmctc3JjLXNvdXJjZS1maWxlLW5hbWUgc291cmNlLWZpbGUtbmFtZSkK LSAgICAgICAgKHNldHEgb3JnLXNyYy0tcHJlc2VydmUtYmxhbmstbGluZSBwcmVzZXJ2ZS1i bGFuay1saW5lKQorICAgICAgICAoc2V0cSBvcmctc3JjLS1pbmRlbnQtY3VycmVudC1ibGFu ay1saW5lIGluZGVudC1jdXJyZW50LWJsYW5rLWxpbmUpCiAJOzsgU3RhcnQgbWlub3IgbW9k ZS4KIAkob3JnLXNyYy1tb2RlKQogCTs7IENsZWFyIHVuZG8gaW5mb3JtYXRpb24gc28gd2Ug Y2Fubm90IHVuZG8gYmFjayB0byB0aGUKLS0gCjIuNDEuMAoK --------------edTje3PwOHXRoBZNNW4tUXEG Content-Type: text/x-patch; charset=UTF-8; name="0001-org.el-org-indent-line-Fix-to-the-indentation-inside.patch" Content-Disposition: attachment; filename*0="0001-org.el-org-indent-line-Fix-to-the-indentation-inside.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSBjNWQ5MTk3NzAwMjU3ZjE1MDVhNzBjMGNmZWUwYWE4MzYxOWE0Mzk5IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/Uz1DMz1BOWJhc3RpZW49MjBNaXF1 ZWw/PSA8c2ViYXN0aWVuLm1pcXVlbEBwb3N0ZW8uZXU+CkRhdGU6IFNhdCwgMTcgSnVuIDIw MjMgMTk6MDc6NTAgKzAyMDAKU3ViamVjdDogW1BBVENIXSBvcmcuZWwgKG9yZy1pbmRlbnQt bGluZSk6IEZpeCB0byB0aGUgaW5kZW50YXRpb24gaW5zaWRlIHNyYwogYmxvY2tzCgoqIGxp c3Avb3JnLmVsIChvcmctaW5kZW50LWxpbmUpOiBXaGVuIGluZGVudGluZyBhIGxpbmUgaW5z aWRlIGEgc3JjCmJsb2NrLCBwcmVpbmRlbnQgaXQgd2l0aCB0aGUgY29tbW9uIGJsb2NrIGlu ZGVudGF0aW9uIGJlZm9yZSBjYWxsaW5nCm5hdGl2ZSBpbmRlbnRhdGlvbi4KKiB0ZXN0aW5n L2xpc3AvdGVzdC1vcmctc3JjLmVsICh0ZXN0LW9yZy1zcmMvb3JnLXJldHVybi1pbmRlbnRz KTogVGVzdAppbmRlbnRhdGlvbiBpbnNpZGUgc3JjIGJsb2Nrcywgd2hlbiBjYWxsaW5nIGBv cmctcmV0dXJuJy4KLS0tCiBsaXNwL29yZy5lbCAgICAgICAgICAgICAgICAgIHwgMTkgKysr KysrKysrKysrKy0tLS0tLQogdGVzdGluZy9saXNwL3Rlc3Qtb3JnLXNyYy5lbCB8IDM0ICsr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIDIgZmlsZXMgY2hhbmdlZCwgNDcg aW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saXNwL29yZy5l bCBiL2xpc3Avb3JnLmVsCmluZGV4IDQyNzMzODViZi4uMzhkMTNmMTExIDEwMDY0NAotLS0g YS9saXNwL29yZy5lbAorKysgYi9saXNwL29yZy5lbApAQCAtMTkwODMsMjAgKzE5MDgzLDI3 IEBAIEFsc28gYWxpZ24gbm9kZSBwcm9wZXJ0aWVzIGFjY29yZGluZyB0byBgb3JnLXByb3Bl cnR5LWZvcm1hdCcuIgogCQkgICAgIChvcmctd2l0aC1wb2ludC1hdCAob3JnLWVsZW1lbnQt cHJvcGVydHkgOmVuZCBlbGVtZW50KQogCQkgICAgICAgKHNraXAtY2hhcnMtYmFja3dhcmQg IiBcdFxuIikKIAkJICAgICAgIChsaW5lLWJlZ2lubmluZy1wb3NpdGlvbikpKSkKLSAgICAg ICAgICAgICA7OyBBdCB0aGUgYmVnaW5uaW5nIG9mIGEgYmxhbmsgbGluZSwgZG8gc29tZSBw cmVpbmRlbnRhdGlvbi4gIFRoaXMKLSAgICAgICAgICAgICA7OyBzaWduYWxzIG9yZy1zcmMt LWVkaXQtZWxlbWVudCB0byBwcmVzZXJ2ZSB0aGUgaW5kZW50YXRpb24gb24gZXhpdAotICAg ICAgICAgICAgICh3aGVuIChhbmQgKGxvb2tpbmctYXQtcCAiXltbOnNwYWNlOl1dKiQiKQot ICAgICAgICAgICAgICAgICAgICAgICAgKG5vdCBvcmctc3JjLXByZXNlcnZlLWluZGVudGF0 aW9uKSkKLSAgICAgICAgICAgICAgIChsZXQgKGJsb2NrLWNvbnRlbnQtaW5kIHNvbWUtaW5k KQorICAgICAgICAgICAgIDs7IERvIHNvbWUgcHJlaW5kZW50YXRpb24sIHRvIGFkZCB0aGUg Y29tbW9uIGJsb2NrCisgICAgICAgICAgICAgOzsgaW5kZW50YXRpb24gdG8gdGhlIGN1cnJl bnQgbGluZS4KKyAgICAgICAgICAgICAod2hlbiAobm90IG9yZy1zcmMtcHJlc2VydmUtaW5k ZW50YXRpb24pCisgICAgICAgICAgICAgICAobGV0ICgoY3VycmVudC1pbmQgKG9yZy1jdXJy ZW50LXRleHQtaW5kZW50YXRpb24pKQorICAgICAgICAgICAgICAgICAgICAgYmxvY2stY29u dGVudC1pbmQgc29tZS1pbmQpCiAgICAgICAgICAgICAgICAgIChvcmctd2l0aC1wb2ludC1h dCAob3JnLWVsZW1lbnQtcHJvcGVydHkgOmJlZ2luIGVsZW1lbnQpCiAgICAgICAgICAgICAg ICAgICAgKHNldHEgYmxvY2stY29udGVudC1pbmQgKCsgKG9yZy1jdXJyZW50LXRleHQtaW5k ZW50YXRpb24pCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgb3JnLWVkaXQtc3JjLWNvbnRlbnQtaW5kZW50YXRpb24pKQorICAgICAgICAgICAgICAg ICAgIDs7IENoZWNrIHRoYXQgdGhlIGZpcnN0IGxpbmUgb2YgdGhlIGJsb2NrIGhhcyB0aGUK KyAgICAgICAgICAgICAgICAgICA7OyBtaW5pbWFsIGluZGVudGF0aW9uCiAgICAgICAgICAg ICAgICAgICAgKGZvcndhcmQtbGluZSkKIAkJICAgKHNhdmUtbWF0Y2gtZGF0YSAocmUtc2Vh cmNoLWZvcndhcmQgIl5bIFx0XSpcXFMtIiBuaWwgdCkpCiAgICAgICAgICAgICAgICAgICAg KGJhY2t3YXJkLWNoYXIpCiAgICAgICAgICAgICAgICAgICAgKHNldHEgc29tZS1pbmQgKGlm IChsb29raW5nLWF0LXAgIiNcXCtlbmRfc3JjIikKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgYmxvY2stY29udGVudC1pbmQgKG9yZy1jdXJyZW50LXRleHQtaW5k ZW50YXRpb24pKSkpCi0gICAgICAgICAgICAgICAgIChpbmRlbnQtbGluZS10byAobWluIGJs b2NrLWNvbnRlbnQtaW5kIHNvbWUtaW5kKSkpKQorICAgICAgICAgICAgICAgICA7OyBJZiB0 aGUgY3VycmVudCBsaW5lIGlzIHRoZSBmaXJzdCBvbmUgYW5kIGRvZXMgbm90CisgICAgICAg ICAgICAgICAgIDs7IGhhdmUgdGhlIG1pbmltYWwgaW5kZW50YXRpb24sIHdlIGRvIG5vdCBw cmVpbmRlbnQsCisgICAgICAgICAgICAgICAgIDs7IHNpbmNlIGl0IGNvdWxkIGJyZWFrIHRo ZSByZWxhdGl2ZSBpbmRlbnRhdGlvbiB3aXRoCisgICAgICAgICAgICAgICAgIDs7IHJlc3Bl Y3QgdG8gdGhlIGZvbGxvd2luZyBsaW5lcworICAgICAgICAgICAgICAgICAod2hlbiAoPCBj dXJyZW50LWluZCAobWluIGJsb2NrLWNvbnRlbnQtaW5kIHNvbWUtaW5kKSkKKyAgICAgICAg ICAgICAgICAgICAoaW5kZW50LWxpbmUtdG8gKG1pbiBibG9jay1jb250ZW50LWluZCBzb21l LWluZCkpKSkpCiAJICAgICAob3JnLWJhYmVsLWRvLWtleS1zZXF1ZW5jZS1pbi1lZGl0LWJ1 ZmZlciAoa2JkICJUQUIiKSkpCiAJICAgICh0CiAJICAgICAobGV0ICgoY29sdW1uIChvcmct LWdldC1leHBlY3RlZC1pbmRlbnRhdGlvbiBlbGVtZW50IG5pbCkpKQpkaWZmIC0tZ2l0IGEv dGVzdGluZy9saXNwL3Rlc3Qtb3JnLXNyYy5lbCBiL3Rlc3RpbmcvbGlzcC90ZXN0LW9yZy1z cmMuZWwKaW5kZXggNDJlZGIzNjRhLi40ZDk0MzkyN2QgMTAwNjQ0Ci0tLSBhL3Rlc3Rpbmcv bGlzcC90ZXN0LW9yZy1zcmMuZWwKKysrIGIvdGVzdGluZy9saXNwL3Rlc3Qtb3JnLXNyYy5l bApAQCAtMTQ0LDYgKzE0NCw0MCBAQCBUaGlzIGlzIGEgdGFiOlx0LgogICAgICAgICAgICAg ICAob3JnLWVkaXQtc3JjLWV4aXQpCiAgICAgICAgICAgICAgIChidWZmZXItc3RyaW5nKSkp KSkpCiAKKyhlcnQtZGVmdGVzdCB0ZXN0LW9yZy1zcmMvb3JnLXJldHVybi1pbmRlbnRzICgp CisgICJDYWxsaW5nIGBvcmctcmV0dXJuJyBpbmRlbnRzIG5ld2xpbmUuIgorICAoc2hvdWxk CisgICAoZXF1YWwgIgorIytiZWdpbl9zcmMgZW1hY3MtbGlzcAorICAob3IgYzFcbiAgICAg IFxuICAgICAgYzIpCisjK2VuZF9zcmMiCisgICAgICAgICAgKG9yZy10ZXN0LXdpdGgtdGVt cC10ZXh0CisgICAgICAgICAgICIKKyMrYmVnaW5fc3JjIGVtYWNzLWxpc3AKKyAgKG9yIGMx PHBvaW50PgorICAgICAgYzIpCisjK2VuZF9zcmMiCisgICAgICAgICAgIChsZXQgKChvcmct ZWRpdC1zcmMtY29udGVudC1pbmRlbnRhdGlvbiAyKQorICAgICAgICAgICAgICAgICAob3Jn LXNyYy10YWItYWN0cy1uYXRpdmVseSB0KQorICAgICAgICAgICAgICAgICAob3JnLXNyYy1w cmVzZXJ2ZS1pbmRlbnRhdGlvbiBuaWwpKQorICAgICAgICAgICAgIChvcmctcmV0dXJuIHQp CisgICAgICAgICAgICAgKGJ1ZmZlci1zdHJpbmcpKSkpKQorICAoc2hvdWxkCisgICAoZXF1 YWwgIgorIytiZWdpbl9zcmMgZW1hY3MtbGlzcAorICAob3IgYzEKKyAgICAgIGMyKQorIytl bmRfc3JjIgorICAgICAgICAgIChvcmctdGVzdC13aXRoLXRlbXAtdGV4dAorICAgICAgICAg ICAiCisjK2JlZ2luX3NyYyBlbWFjcy1saXNwCisgIChvciBjMTxwb2ludD4gYzIpCisjK2Vu ZF9zcmMiCisgICAgICAgICAgIChsZXQgKChvcmctZWRpdC1zcmMtY29udGVudC1pbmRlbnRh dGlvbiAyKQorICAgICAgICAgICAgICAgICAob3JnLXNyYy1wcmVzZXJ2ZS1pbmRlbnRhdGlv biBuaWwpKQorICAgICAgICAgICAgIChvcmctcmV0dXJuIHQpCisgICAgICAgICAgICAgKGJ1 ZmZlci1zdHJpbmcpKSkpKSkKKwogKGVydC1kZWZ0ZXN0IHRlc3Qtb3JnLXNyYy9wcmVzZXJ2 ZS1lbXB0eS1saW5lcyAoKQogICAiRWRpdGluZyBibG9jayBwcmVzZXJ2ZXMgZW1wdHkgbGlu ZXMuIgogICAoc2hvdWxkCi0tIAoyLjQxLjAKCg== --------------edTje3PwOHXRoBZNNW4tUXEG--