From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id qNCtKaCpnWRmFgAASxT56A (envelope-from ) for ; Thu, 29 Jun 2023 17:56:16 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id YNGaKaCpnWQ8JgAA9RJhRA (envelope-from ) for ; Thu, 29 Jun 2023 17:56:16 +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 E2C591C903 for ; Thu, 29 Jun 2023 17:56:15 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=posteo.eu header.s=2017 header.b=WvYCVjgK; 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=1688054176; 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=SkWs++e30ZhNfeZDTLKMTYAmaNSkHjvane4KOVEea9c=; b=Z5VuVlNy7O+b84CpOdM308lsiTM3KxgqpdWkVdzTmmYupsTwSZL++52YMHvDVxj8IirYI5 x3W2Iz/pUlrmn17zIuGOLhfAitsuJGiNQH79XH3ECT5oiKE4G9GrxB8Iwq2brVhR8/p6vx qjaJlGUIO1qHJk83WR1ayuyJEc4H4cBdEg8FFX/e95ag+7NmYDtUJj/mYNA6zE+oM48oar BWG1aZs8A7gJ2p1QwKqN2q3F+wgGFTbyrW2aeQeUSJi7diXonmxIjnnvh9gi4yeHSaCUK5 SMWJk3xbW0Rw3uUnJrY/6K4zMO6bZygDUiUBqD7Yqvx9XnSH2Xf0ccqx0bp+fA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=posteo.eu header.s=2017 header.b=WvYCVjgK; 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-Seal: i=1; s=key1; d=yhetil.org; t=1688054176; a=rsa-sha256; cv=none; b=rfM4ToFijQieBtmwSz2s34ICId46hiLqXvS45RC4FOY1R9X01wJOhNDs6sjFQ5z2ux/pRp 0YRhx6/Nt7sO672HqJTg9tQfjEzhVfyn+5kiPbU5UqGoPLosRcVJfeXS2rDe2zyH3JIqVc Y7GrM92toEU4iI7avHEzowELdRP9LFrK30oITpJmXC6VZU+EJ+gQBf4S6MsRwFdA1OrFV1 TpgWcUOM3JCHBZFStAKZeWdasfSezuYzrBX2Wvgo8GDOwpl1ewZ/W2/vLhi0TM0izpjRCW A/rqjO7sPp2vsUBNCGkyv3NhDta9p4DLnZAM+4O3y5/qrbUMZ6TUP9l6CZFOmQ== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qEtzB-0004Vu-KT; Thu, 29 Jun 2023 11:55:09 -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 1qEtz9-0004VO-U7 for emacs-orgmode@gnu.org; Thu, 29 Jun 2023 11:55:08 -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 1qEtz6-0007zv-Kx for emacs-orgmode@gnu.org; Thu, 29 Jun 2023 11:55:07 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 30FCA240103 for ; Thu, 29 Jun 2023 17:55:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.eu; s=2017; t=1688054101; bh=GcEYKsgZ/krC1eB6tkH5byuPFMun6fGiI3Hm6K0qn5c=; h=Message-ID:Date:MIME-Version:Reply-To:Subject:To:Cc:From:From; b=WvYCVjgK3a9s72oKY3Wk+TqBxqwC3DugcsyG/eAgzAqMbC/TbE7RlGx+bev2bmp40 8fiQvRmSJ1DcinmHmj/W59GR8klz3iRc4qb43TG3hPyPeTBW+waSaLn85cTPyO5D+v XWXHO51lcDC+EyBV3EVAvSTVlLtcRGzV3CZqEXyZzEwp+8YqCOuyl7P4QzR7Eu2J9F y2XxTJPFkWiT0KmjBU1N/GfYubu2uphvUba/r6zOIYcEtwMEb4JYUkgVIBg7tBeuHN O4yn9JruqwEjeIKzg/sqqnmX73+aLwNUr1l3GYKuNk3cMAXUdaSk4xyykRugW5rmJ6 aG02+lzvXnUuQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4QsNLr2Y1Kz6txJ; Thu, 29 Jun 2023 17:55:00 +0200 (CEST) Content-Type: multipart/mixed; boundary="------------GkFKd8phaFBDItRYReR0M8xp" Message-ID: <1d145455-2047-2b7a-8222-8eadc2529c8c@posteo.eu> Date: Thu, 29 Jun 2023 15:54:59 +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> <87o7l0vt5z.fsf@localhost> From: =?UTF-8?Q?S=c3=a9bastien_Miquel?= In-Reply-To: <87o7l0vt5z.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 X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -10.87 X-Spam-Score: -10.87 X-Migadu-Queue-Id: E2C591C903 X-TUID: 1FEYJTMFmInG This is a multi-part message in MIME format. --------------GkFKd8phaFBDItRYReR0M8xp Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Hi Ihor, Thank you for the feedback. Ihor Radchenko writes: >> + ;; Apply WRITE-BACK function on edit buffer contents. >> + (goto-char (point-min)) >> + (when (functionp write-back) (save-excursion (funcall write-back))) >> (set-marker marker nil)))) > `save-excursion' is no longer necessary here. Done. >> (defun org-src--edit-element >> @@ -1150,7 +1149,14 @@ Throw an error when not at such a table." >> (lambda () >> ;; Blank lines break things, replace with a single newline. >> (while (re-search-forward "\n[ \t]*\n" nil t) (replace-match "\n")) >> - ;; If within a table a newline would disrupt the structure, >> + ;; Trim contents. > It would be nice to have a bit more context about the purpose in the > comment here. I was confused. We need only trim the beginning of the result, for the indentation added by `org-src--contents-for-write-back'. I've added an explanation. >> ... >> - (skip-chars-forward " \t") >> - (when (or (not (eolp)) ; not a blank line >> - (and (eq (point) (marker-position marker)) ; current line >> + (when (or (not (eolp)) ; not an empty line >> + ;; If the current line is empty, we may >> + ;; want to indent it. >> + (and (eq (point) (marker-position marker)) >> preserve-blank-line)) > Do we still need this dance with special case for current line? Yes. This is fragile, but what it does is, if the line from which the original edit was called was blank and not empty, and the line from which the edit is ended is empty, we assume these two lines are the same, and we add the common block indentation to this empty line. This, and the pre-indentation in =org-indent-line=, make `TAB` work to indent an empty line. The logic in =org-edit-element= can now be simplified though, see the third patch attached. >> + ;; Display tab indentation characters preceded by spaces as spaces >> + (unless org-src-preserve-indentation > unless? Don't we rather want to preserve the original indentation > alignment when `org-src-preserve-indentation' is t? >> + (save-excursion >> + (goto-char start) >> + (while (re-search-forward "^[ ]+\\([\t]+\\)" end t) > Why just tabs at indentation? It would make sense to preserve width of > all the tabs. >> + (let* ((b (match-beginning 1)) >> + (e (match-end 1)) >> + (s (make-string (* (- e b) native-tab-width) ? ))) >> + (add-text-properties b e `(display ,s)))))) > Will the actual tab width be always equal to native-tab-width? What > about tab stops? May it be more reliable to use different of column > numbers in the src mode buffer after/before the tab? I was trying to be conservative. When =org-src-preserve-indentation= is t, I guess we can do the same, for consistency. As you say, the tabs at the beginning of indentation are the only ones we can be somewhat sure of the width, if we assume the native indentation was done sanely (using tabs then spaces). I'm inclined to only deal with those. To get the true tab widths, we'd need to get the columns numbers in yet a third different buffer, with the common indentation removed. I don't think that's worth it. Anyway, what I wrote doesn't deal correctly with the case where the org indentation may use tabs. I've updated the patch: I use the value of what should be the org indentation, and only change the display of the following consecutive tabs. >> @@ -318,19 +318,21 @@ This is a tab:\t. >> argument2)) >> #+END_SRC" >> (setq-local indent-tabs-mode t) >> - (let ((org-edit-src-content-indentation 2) >> + (let ((tab-width 8) >> + (org-edit-src-content-indentation 2) > Why is setting tab-width necessary? 8 is the default value. Removed, though I have left an instance of =(setq-local tab-width 8)=, for clarity. >> #+BEGIN_SRC emacs-lisp >> - (progn\n (function argument1\n\t\targument2)) >> + (progn\n (function argument1\n \targument2)) > I think it would be a bit more readable to convert this string into > actual multi-line, where the alignment is visible when reading the test > source. I've left it this way. I think the tests using tab characters are often written this way, so as to be understandable without whitespace mode. -- Sébastien Miquel --------------GkFKd8phaFBDItRYReR0M8xp 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 RnJvbSBkMDI0ZmU5NmFkODg5MDk3ZDAyNWE4N2RhZTMzMTZhY2M0NDI5OWY2IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/Uz1DMz1BOWJhc3RpZW49MjBNaXF1 ZWw/PSA8c2ViYXN0aWVuLm1pcXVlbEBwb3N0ZW8uZXU+CkRhdGU6IFN1biwgMjUgSnVuIDIw MjMgMTM6Mzg6MjEgKzAyMDAKU3ViamVjdDogW1BBVENIXSBvcmctc3JjLS1jb250ZW50cy1m b3Itd3JpdGUtYmFjazogc2ltcGxpZnkgdGhlIGNhc2Ugb2YgTGFUZVgKIGZyYWdtZW50cwoK KiBsaXNwL29yZy1zcmMuZWwgKG9yZy1zcmMtLWNvbnRlbnRzLWZvci13cml0ZS1iYWNrKTog RXh0cmFjdCBzcGVjaWFsCmNhc2UgbG9naWMgZm9yIExhVGVYIGZyYWdtZW50cy4KKG9yZy1l ZGl0LWxhdGV4LWZyYWdtZW50KTogVHJpbSB0aGUgY29udGVudHMgdG8gYmUgaW5zZXJ0ZWQg aW4gdGhlCm9yaWdpbmFsIGJ1ZmZlci4KLS0tCiBsaXNwL29yZy1zcmMuZWwgfCAxNCArKysr KysrKystLS0tLQogMSBmaWxlIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9saXNwL29yZy1zcmMuZWwgYi9saXNwL29yZy1zcmMuZWwK aW5kZXggZjE1YmE4ZTk5Li4xMjFlNTkyNDEgMTAwNjQ0Ci0tLSBhL2xpc3Avb3JnLXNyYy5l bAorKysgYi9saXNwL29yZy1zcmMuZWwKQEAgLTQ2Niw3ICs0NjYsNiBAQCBBc3N1bWUgcG9p bnQgaXMgaW4gdGhlIGNvcnJlc3BvbmRpbmcgZWRpdCBidWZmZXIuIgogCQkgIG9yZy1zcmMt LWNvbnRlbnQtaW5kZW50YXRpb24KIAkJMCkpKSkKIAkodXNlLXRhYnM/IChhbmQgKD4gb3Jn LXNyYy0tdGFiLXdpZHRoIDApIHQpKQotICAgICAgICAocHJlc2VydmUtZmwgKGVxIG9yZy1z cmMtLXNvdXJjZS10eXBlICdsYXRleC1mcmFnbWVudCkpCiAJKHNvdXJjZS10YWItd2lkdGgg b3JnLXNyYy0tdGFiLXdpZHRoKQogCShjb250ZW50cyAob3JnLXdpdGgtd2lkZS1idWZmZXIK ICAgICAgICAgICAgICAgICAgICAobGV0ICgoZW9sIChsaW5lLWVuZC1wb3NpdGlvbikpKQpA QCAtNDc5LDE2ICs0NzgsMTMgQEAgQXNzdW1lIHBvaW50IGlzIGluIHRoZSBjb3JyZXNwb25k aW5nIGVkaXQgYnVmZmVyLiIKICAgICAgIDs7IFJlcHJvZHVjZSBpbmRlbnRhdGlvbiBwYXJh bWV0ZXJzIGZyb20gc291cmNlIGJ1ZmZlci4KICAgICAgIChzZXRxIGluZGVudC10YWJzLW1v ZGUgdXNlLXRhYnM/KQogICAgICAgKHdoZW4gKD4gc291cmNlLXRhYi13aWR0aCAwKSAoc2V0 cSB0YWItd2lkdGggc291cmNlLXRhYi13aWR0aCkpCi0gICAgICA7OyBBcHBseSBXUklURS1C QUNLIGZ1bmN0aW9uIG9uIGVkaXQgYnVmZmVyIGNvbnRlbnRzLgogICAgICAgKGluc2VydCAo b3JnLW5vLXByb3BlcnRpZXMgKGNhciBjb250ZW50cykpKQogICAgICAgKHNldHEgbWFya2Vy IChwb2ludC1tYXJrZXIpKQogICAgICAgKGluc2VydCAob3JnLW5vLXByb3BlcnRpZXMgKGNh ciAoY2RyIGNvbnRlbnRzKSkpKQogICAgICAgKGdvdG8tY2hhciAocG9pbnQtbWluKSkKLSAg ICAgICh3aGVuIChmdW5jdGlvbnAgd3JpdGUtYmFjaykgKHNhdmUtZXhjdXJzaW9uIChmdW5j YWxsIHdyaXRlLWJhY2spKSkKICAgICAgIDs7IEFkZCBJTkRFTlRBVElPTi1PRkZTRVQgdG8g ZXZlcnkgbGluZSBpbiBidWZmZXIsCiAgICAgICA7OyB1bmxlc3MgaW5kZW50YXRpb24gaXMg bWVhbnQgdG8gYmUgcHJlc2VydmVkLgogICAgICAgKHdoZW4gKD4gaW5kZW50YXRpb24tb2Zm c2V0IDApCi0JKHdoZW4gcHJlc2VydmUtZmwgKGZvcndhcmQtbGluZSkpCiAgICAgICAgICh3 aGlsZSAobm90IChlb2JwKSkKIAkgIChza2lwLWNoYXJzLWZvcndhcmQgIiBcdCIpCiAgICAg ICAgICAgKHdoZW4gKG9yIChub3QgKGVvbHApKSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICA7IG5vdCBhIGJsYW5rIGxpbmUKQEAgLTQ5OCw2ICs0OTQsOSBAQCBBc3N1bWUgcG9p bnQgaXMgaW4gdGhlIGNvcnJlc3BvbmRpbmcgZWRpdCBidWZmZXIuIgogCSAgICAgIChkZWxl dGUtcmVnaW9uIChsaW5lLWJlZ2lubmluZy1wb3NpdGlvbikgKHBvaW50KSkKIAkgICAgICAo aW5kZW50LXRvICgrIGkgaW5kZW50YXRpb24tb2Zmc2V0KSkpKQogCSAgKGZvcndhcmQtbGlu ZSkpKQorICAgICAgOzsgQXBwbHkgV1JJVEUtQkFDSyBmdW5jdGlvbiBvbiBlZGl0IGJ1ZmZl ciBjb250ZW50cy4KKyAgICAgIChnb3RvLWNoYXIgKHBvaW50LW1pbikpCisgICAgICAod2hl biAoZnVuY3Rpb25wIHdyaXRlLWJhY2spIChmdW5jYWxsIHdyaXRlLWJhY2spKQogICAgICAg KHNldC1tYXJrZXIgbWFya2VyIG5pbCkpKSkKIAogKGRlZnVuIG9yZy1zcmMtLWVkaXQtZWxl bWVudApAQCAtMTE1MCw3ICsxMTQ5LDEyIEBAIFRocm93IGFuIGVycm9yIHdoZW4gbm90IGF0 IHN1Y2ggYSB0YWJsZS4iCiAgICAgICAgKGxhbWJkYSAoKQogCSA7OyBCbGFuayBsaW5lcyBi cmVhayB0aGluZ3MsIHJlcGxhY2Ugd2l0aCBhIHNpbmdsZSBuZXdsaW5lLgogCSAod2hpbGUg KHJlLXNlYXJjaC1mb3J3YXJkICJcblsgXHRdKlxuIiBuaWwgdCkgKHJlcGxhY2UtbWF0Y2gg IlxuIikpCi0JIDs7IElmIHdpdGhpbiBhIHRhYmxlIGEgbmV3bGluZSB3b3VsZCBkaXNydXB0 IHRoZSBzdHJ1Y3R1cmUsCisgICAgICAgICA7OyBUcmltIGNvbnRlbnRzOiBgb3JnLXNyYy0t Y29udGVudHMtZm9yLXdyaXRlLWJhY2snIG1heSBoYXZlCisgICAgICAgICA7OyBhZGRlZCBp bmRlbnRhdGlvbiBhdCB0aGUgYmVnaW5uaW5nLCB3aGljaCB3ZSByZW1vdmUuCisJIChnb3Rv LWNoYXIgKHBvaW50LW1pbikpCisgICAgICAgICAoc2tpcC1jaGFycy1mb3J3YXJkICIgXHQi KQorCSAoZGVsZXRlLXJlZ2lvbiAocG9pbnQtbWluKSAocG9pbnQpKQorICAgICAgICAgOzsg SWYgd2l0aGluIGEgdGFibGUgYSBuZXdsaW5lIHdvdWxkIGRpc3J1cHQgdGhlIHN0cnVjdHVy ZSwKIAkgOzsgc28gcmVtb3ZlIG5ld2xpbmVzLgogCSAoZ290by1jaGFyIChwb2ludC1taW4p KQogCSAod2hlbiAob3JnLWVsZW1lbnQtbGluZWFnZSBjb250ZXh0ICcodGFibGUtY2VsbCkp Ci0tIAoyLjQxLjAKCg== --------------GkFKd8phaFBDItRYReR0M8xp 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 RnJvbSBmNmVkNzRiNTM2NzIzZTJjODg4YjUxZjhkMGVjYzg0ZTEwNDQxMWZjIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/Uz1DMz1BOWJhc3RpZW49MjBNaXF1 ZWw/PSA8c2ViYXN0aWVuLm1pcXVlbEBwb3N0ZW8uZXU+CkRhdGU6IFR1ZSwgMjcgSnVuIDIw MjMgMDk6MjM6MDEgKzAyMDAKU3ViamVjdDogW1BBVENIXSBvcmctc3JjLmVsOiBVc2UgbmF0 aXZlIHZhbHVlIG9mIGBpbmRlbnQtdGFicy1tb2RlJyBmb3IKIGluZGVudGF0aW9uCgoqIGxp c3Avb3JnLW1hY3MuZWwgKG9yZy1kby1yZW1vdmUtaW5kZW50YXRpb24pOiBQcmVzZXJ2ZQpp bmRlbnRhdGlvbiAoc3BhY2VzIHZzIHRhYnMpIHBhc3QgdGhlIGNvbW1vbiBpbmRlbnRhdGlv biB0byByZW1vdmUuCiogbGlzcC9vcmctc3JjLmVsIChvcmctc3JjLS1jb250ZW50cy1mb3It d3JpdGUtYmFjayk6IFByZXNlcnZlIHRoZQpuYXRpdmUgaW5kZW50YXRpb24gKHNwYWNlcyB2 cyB0YWJzKS4gIElmIG5lY2Vzc2FyeSwgYWRkIGEgY29tbW9uIG9yZwppbmRlbnRhdGlvbiB0 byB0aGUgYmxvY2sgYWNjb3JkaW5nIHRvIG9yZydzIGBpbmRlbnQtdGFicy1tb2RlJy4KKG9y Zy1zcmMtZm9udC1sb2NrLWZvbnRpZnktYmxvY2spOiBJbiBjYXNlIG9mIG1peGVkIGluZGVu dGF0aW9uLApkaXNwbGF5IHRoZSB0YWIgY2hhcmFjdGVycyB3aXRoIGEgZml4ZWQgd2lkdGgs IGFjY29yZGluZyB0byB0aGUgbmF0aXZlCnRhYiB3aWR0aCB2YWx1ZS4KKiB0ZXN0aW5nL2xp c3AvdGVzdC1vcmctc3JjLmVsICh0ZXN0LW9yZy1zcmMvaW5kZW50ZWQtYmxvY2tzKTogVXBk YXRlCnRlc3RzLiAgSW5kZW50YXRpb24gbm8gbG9uZ2VyIG9iZXlzIGBpbmRlbnQtdGFicy1t b2RlJyBmcm9tIHRoZSBvcmcKYnVmZmVyLCBidXQgaXMgc2VwYXJhdGVkIGluIHR3byBwYXJ0 cy4KLS0tCiBsaXNwL29yZy1tYWNzLmVsICAgICAgICAgICAgIHwgIDQgKy0KIGxpc3Avb3Jn LXNyYy5lbCAgICAgICAgICAgICAgfCA0MSArKysrKysrKysrKysrKy0tLS0tLQogdGVzdGlu Zy9saXNwL3Rlc3Qtb3JnLXNyYy5lbCB8IDc1ICsrKysrKysrKysrKysrKysrKysrKystLS0t LS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCA3OSBpbnNlcnRpb25zKCspLCA0MSBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saXNwL29yZy1tYWNzLmVsIGIvbGlzcC9vcmctbWFj cy5lbAppbmRleCA1MWRiZmUxMTguLmY0MmU2YjE0YiAxMDA2NDQKLS0tIGEvbGlzcC9vcmct bWFjcy5lbAorKysgYi9saXNwL29yZy1tYWNzLmVsCkBAIC00ODUsNyArNDg1LDkgQEAgbGlu ZS4gIFJldHVybiBuaWwgaWYgaXQgZmFpbHMuIgogCSAgKGxldCAoKGluZCAocHJvZ24gKHNr aXAtY2hhcnMtZm9yd2FyZCAiIFx0IikgKGN1cnJlbnQtY29sdW1uKSkpKQogCSAgICAoY29u ZCAoKGVvbHApIChkZWxldGUtcmVnaW9uIChsaW5lLWJlZ2lubmluZy1wb3NpdGlvbikgKHBv aW50KSkpCiAJCSAgKCg8IGluZCBuKSAodGhyb3cgOmV4aXQgbmlsKSkKLQkJICAodCAoaW5k ZW50LWxpbmUtdG8gKC0gaW5kIG4pKSkpCisJCSAgKHQgKGRlbGV0ZS1yZWdpb24gKGxpbmUt YmVnaW5uaW5nLXBvc2l0aW9uKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgKHByb2duIChtb3ZlLXRvLWNvbHVtbiBuIHQpCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgKHBvaW50KSkpKSkKIAkgICAgKGZvcndhcmQtbGluZSkp KQogCTs7IFNpZ25hbCBzdWNjZXNzLgogCXQpKSkpCmRpZmYgLS1naXQgYS9saXNwL29yZy1z cmMuZWwgYi9saXNwL29yZy1zcmMuZWwKaW5kZXggMTIxZTU5MjQxLi5hOGYwNzZiMjEgMTAw NjQ0Ci0tLSBhL2xpc3Avb3JnLXNyYy5lbAorKysgYi9saXNwL29yZy1zcmMuZWwKQEAgLTQ3 MywxMSArNDczLDE1IEBAIEFzc3VtZSBwb2ludCBpcyBpbiB0aGUgY29ycmVzcG9uZGluZyBl ZGl0IGJ1ZmZlci4iCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAoYnVmZmVyLXN1YnN0 cmluZyBlb2wgKHBvaW50LW1heCkpKSkpKQogCSh3cml0ZS1iYWNrIG9yZy1zcmMtLWFsbG93 LXdyaXRlLWJhY2spCiAgICAgICAgIChwcmVzZXJ2ZS1ibGFuay1saW5lIG9yZy1zcmMtLXBy ZXNlcnZlLWJsYW5rLWxpbmUpCi0gICAgICAgIG1hcmtlcikKKyAgICAgICAgbWFya2VyIGlu ZGVudC1zdHIpCisgICAgKHNldHEgaW5kZW50LXN0cgorICAgICAgICAgICh3aXRoLXRlbXAt YnVmZmVyCisgICAgICAgICAgICA7OyBSZXByb2R1Y2UgaW5kZW50YXRpb24gcGFyYW1ldGVy cyBmcm9tIG9yZyBidWZmZXIuCisgICAgICAgICAgICAoc2V0cSBpbmRlbnQtdGFicy1tb2Rl IHVzZS10YWJzPykKKyAgICAgICAgICAgICh3aGVuICg+IHNvdXJjZS10YWItd2lkdGggMCkg KHNldHEgdGFiLXdpZHRoIHNvdXJjZS10YWItd2lkdGgpKQorICAgICAgICAgICAgKGluZGVu dC10byBpbmRlbnRhdGlvbi1vZmZzZXQpCisgICAgICAgICAgICAoYnVmZmVyLXN0cmluZykp KQogICAgICh3aXRoLWN1cnJlbnQtYnVmZmVyIHdyaXRlLWJhY2stYnVmCi0gICAgICA7OyBS ZXByb2R1Y2UgaW5kZW50YXRpb24gcGFyYW1ldGVycyBmcm9tIHNvdXJjZSBidWZmZXIuCi0g ICAgICAoc2V0cSBpbmRlbnQtdGFicy1tb2RlIHVzZS10YWJzPykKLSAgICAgICh3aGVuICg+ IHNvdXJjZS10YWItd2lkdGggMCkgKHNldHEgdGFiLXdpZHRoIHNvdXJjZS10YWItd2lkdGgp KQogICAgICAgKGluc2VydCAob3JnLW5vLXByb3BlcnRpZXMgKGNhciBjb250ZW50cykpKQog ICAgICAgKHNldHEgbWFya2VyIChwb2ludC1tYXJrZXIpKQogICAgICAgKGluc2VydCAob3Jn LW5vLXByb3BlcnRpZXMgKGNhciAoY2RyIGNvbnRlbnRzKSkpKQpAQCAtNDg2LDEzICs0OTAs MTIgQEAgQXNzdW1lIHBvaW50IGlzIGluIHRoZSBjb3JyZXNwb25kaW5nIGVkaXQgYnVmZmVy LiIKICAgICAgIDs7IHVubGVzcyBpbmRlbnRhdGlvbiBpcyBtZWFudCB0byBiZSBwcmVzZXJ2 ZWQuCiAgICAgICAod2hlbiAoPiBpbmRlbnRhdGlvbi1vZmZzZXQgMCkKICAgICAgICAgKHdo aWxlIChub3QgKGVvYnApKQotCSAgKHNraXAtY2hhcnMtZm9yd2FyZCAiIFx0IikKLSAgICAg ICAgICAod2hlbiAob3IgKG5vdCAoZW9scCkpICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIDsgbm90IGEgYmxhbmsgbGluZQotICAgICAgICAgICAgICAgICAgICAoYW5kIChlcSAo cG9pbnQpIChtYXJrZXItcG9zaXRpb24gbWFya2VyKSkgOyBjdXJyZW50IGxpbmUKKyAgICAg ICAgICAod2hlbiAob3IgKG5vdCAoZW9scCkpIDsgbm90IGFuIGVtcHR5IGxpbmUKKyAgICAg ICAgICAgICAgICAgICAgOzsgSWYgdGhlIGN1cnJlbnQgbGluZSBpcyBlbXB0eSwgd2UgbWF5 CisgICAgICAgICAgICAgICAgICAgIDs7IHdhbnQgdG8gaW5kZW50IGl0LgorICAgICAgICAg ICAgICAgICAgICAoYW5kIChlcSAocG9pbnQpIChtYXJrZXItcG9zaXRpb24gbWFya2VyKSkK ICAgICAgICAgICAgICAgICAgICAgICAgICBwcmVzZXJ2ZS1ibGFuay1saW5lKSkKLQkgICAg KGxldCAoKGkgKGN1cnJlbnQtY29sdW1uKSkpCi0JICAgICAgKGRlbGV0ZS1yZWdpb24gKGxp bmUtYmVnaW5uaW5nLXBvc2l0aW9uKSAocG9pbnQpKQotCSAgICAgIChpbmRlbnQtdG8gKCsg aSBpbmRlbnRhdGlvbi1vZmZzZXQpKSkpCisgICAgICAgICAgICAoaW5zZXJ0IGluZGVudC1z dHIpKQogCSAgKGZvcndhcmQtbGluZSkpKQogICAgICAgOzsgQXBwbHkgV1JJVEUtQkFDSyBm dW5jdGlvbiBvbiBlZGl0IGJ1ZmZlciBjb250ZW50cy4KICAgICAgIChnb3RvLWNoYXIgKHBv aW50LW1pbikpCkBAIC02MzYsNyArNjM5LDcgQEAgTGVhdmUgcG9pbnQgaW4gZWRpdCBidWZm ZXIuIgogICAiRm9udGlmeSBjb2RlIGJsb2NrIGJldHdlZW4gU1RBUlQgYW5kIEVORCB1c2lu ZyBMQU5HJ3Mgc3ludGF4LgogVGhpcyBmdW5jdGlvbiBpcyBjYWxsZWQgYnkgRW1hY3MnIGF1 dG9tYXRpYyBmb250aWZpY2F0aW9uLCBhcyBsb25nCiBhcyBgb3JnLXNyYy1mb250aWZ5LW5h dGl2ZWx5JyBpcyBub24tbmlsLiIKLSAgKGxldCAoKG1vZGlmaWVkIChidWZmZXItbW9kaWZp ZWQtcCkpKQorICAobGV0ICgobW9kaWZpZWQgKGJ1ZmZlci1tb2RpZmllZC1wKSkgbmF0aXZl LXRhYi13aWR0aCkKICAgICAocmVtb3ZlLXRleHQtcHJvcGVydGllcyBzdGFydCBlbmQgJyhm YWNlIG5pbCkpCiAgICAgKGxldCAoKGxhbmctbW9kZSAob3JnLXNyYy1nZXQtbGFuZy1tb2Rl IGxhbmcpKSkKICAgICAgICh3aGVuIChmYm91bmRwIGxhbmctbW9kZSkKQEAgLTY1MCw2ICs2 NTMsNyBAQCBhcyBgb3JnLXNyYy1mb250aWZ5LW5hdGl2ZWx5JyBpcyBub24tbmlsLiIKIAkg ICAgICA7OyBBZGQgc3RyaW5nIGFuZCBhIGZpbmFsIHNwYWNlIHRvIGVuc3VyZSBwcm9wZXJ0 eSBjaGFuZ2UuCiAJICAgICAgKGluc2VydCBzdHJpbmcgIiAiKSkKIAkgICAgKHVubGVzcyAo ZXEgbWFqb3ItbW9kZSBsYW5nLW1vZGUpIChmdW5jYWxsIGxhbmctbW9kZSkpCisgICAgICAg ICAgICAoc2V0cSBuYXRpdmUtdGFiLXdpZHRoIHRhYi13aWR0aCkKICAgICAgICAgICAgIChm b250LWxvY2stZW5zdXJlKQogCSAgICAobGV0ICgocG9zIChwb2ludC1taW4pKSBuZXh0KQog CSAgICAgICh3aGlsZSAoc2V0cSBuZXh0IChuZXh0LXByb3BlcnR5LWNoYW5nZSBwb3MpKQpA QCAtNzA3LDYgKzcxMSwyMSBAQCBhcyBgb3JnLXNyYy1mb250aWZ5LW5hdGl2ZWx5JyBpcyBu b24tbmlsLiIKICAgICAgICh3aGVuIChvciAoZmFjZXAgc3JjLWZhY2UpIChsaXN0cCBzcmMt ZmFjZSkpCiAgICAgICAgIChmb250LWxvY2stYXBwZW5kLXRleHQtcHJvcGVydHkgc3RhcnQg ZW5kICdmYWNlIHNyYy1mYWNlKSkKICAgICAgIChmb250LWxvY2stYXBwZW5kLXRleHQtcHJv cGVydHkgc3RhcnQgZW5kICdmYWNlICdvcmctYmxvY2spKQorICAgIDs7IERpc3BsYXkgbmF0 aXZlIHRhYiBpbmRlbnRhdGlvbiBjaGFyYWN0ZXJzIGFzIHNwYWNlcworICAgIChzYXZlLWV4 Y3Vyc2lvbgorICAgICAgKGdvdG8tY2hhciBzdGFydCkKKyAgICAgIChsZXQgKChpbmRlbnQt b2Zmc2V0CisJICAgICAoaWYgb3JnLXNyYy1wcmVzZXJ2ZS1pbmRlbnRhdGlvbiAwCisJICAg ICAgICgrIChwcm9nbiAoYmFja3dhcmQtY2hhcikKKyAgICAgICAgICAgICAgICAgICAgICAg ICAob3JnLWN1cnJlbnQtdGV4dC1pbmRlbnRhdGlvbikpCisJICAgICAgICAgIG9yZy1lZGl0 LXNyYy1jb250ZW50LWluZGVudGF0aW9uKSkpKQorICAgICAgICAod2hpbGUgKHJlLXNlYXJj aC1mb3J3YXJkICJeWyBdKlx0IiBlbmQgdCkKKyAgICAgICAgICAobGV0KiAoKGIgKGFuZCAo ZXEgaW5kZW50LW9mZnNldCAobW92ZS10by1jb2x1bW4gaW5kZW50LW9mZnNldCkpCisgICAg ICAgICAgICAgICAgICAgICAgICAgKHBvaW50KSkpCisgICAgICAgICAgICAgICAgIChlIChw cm9nbiAoc2tpcC1jaGFycy1mb3J3YXJkICJcdCIpIChwb2ludCkpKQorICAgICAgICAgICAg ICAgICAocyAoYW5kIGIgKG1ha2Utc3RyaW5nICgqICgtIGUgYikgbmF0aXZlLXRhYi13aWR0 aCkgPyApKSkpCisgICAgICAgICAgICAod2hlbiAoYW5kIGIgKDwgYiBlKSkgKGFkZC10ZXh0 LXByb3BlcnRpZXMgYiBlIGAoZGlzcGxheSAscykpKQorICAgICAgICAgICAgKGZvcndhcmQt Y2hhcikpKSkpCiAgICAgOzsgQ2xlYXIgYWJicmV2aWF0ZWQgbGluayBmb2xkaW5nLgogICAg IChvcmctZm9sZC1yZWdpb24gc3RhcnQgZW5kIG5pbCAnb3JnLWxpbmspCiAgICAgKGFkZC10 ZXh0LXByb3BlcnRpZXMKZGlmZiAtLWdpdCBhL3Rlc3RpbmcvbGlzcC90ZXN0LW9yZy1zcmMu ZWwgYi90ZXN0aW5nL2xpc3AvdGVzdC1vcmctc3JjLmVsCmluZGV4IDJhNDViYTY2ZS4uYzQz MDljY2ZjIDEwMDY0NAotLS0gYS90ZXN0aW5nL2xpc3AvdGVzdC1vcmctc3JjLmVsCisrKyBi L3Rlc3RpbmcvbGlzcC90ZXN0LW9yZy1zcmMuZWwKQEAgLTMwNCwxMSArMzA0LDExIEBAIFRo aXMgaXMgYSB0YWI6XHQuCiAJKGluc2VydCAiIEZvbyIpCiAJKG9yZy1lZGl0LXNyYy1leGl0 KQogCShidWZmZXItc3RyaW5nKSkpKSkKLSAgOzsgR2xvYmFsIGluZGVudGF0aW9uIG9iZXlz IGBpbmRlbnQtdGFicy1tb2RlJyBmcm9tIHRoZSBvcmlnaW5hbAotICA7OyBidWZmZXIuCi0g IChzaG91bGQKKyAgOzsgR2xvYmFsIGluZGVudGF0aW9uIGRvZXMgbm90IG9iZXkgYGluZGVu dC10YWJzLW1vZGUnIGZyb20gdGhlCisgIDs7IG9yaWdpbmFsIGJ1ZmZlci4KKyAgKHNob3Vs ZC1ub3QKICAgIChzdHJpbmctbWF0Y2gtcAotICAgICJeXHQrXHMqYXJndW1lbnQyIgorICAg ICJcdCIKICAgICAob3JnLXRlc3Qtd2l0aC10ZW1wLXRleHQKIAkiCiAtIEl0ZW0KQEAgLTMy MywxNCArMzIzLDE1IEBAIFRoaXMgaXMgYSB0YWI6XHQuCiAJKG9yZy1lZGl0LXNwZWNpYWwp CiAJKG9yZy1lZGl0LXNyYy1leGl0KQogCShidWZmZXItc3RyaW5nKSkpKSkKKyAgOzsgVGFi IGNoYXJhY3RlciBpcyBwcmVzZXJ2ZWQKICAgKHNob3VsZAogICAgKHN0cmluZy1tYXRjaC1w Ci0gICAgIl5ccythcmd1bWVudDIiCisgICAgIlx0YXJndW1lbnQyIgogICAgIChvcmctdGVz dC13aXRoLXRlbXAtdGV4dAogCSIKIC0gSXRlbQogICAjK0JFR0lOX1NSQyBlbWFjcy1saXNw PHBvaW50PgotICAgIChwcm9nblxuICAgICAgKGZ1bmN0aW9uIGFyZ3VtZW50MVxuXHRcdGFy Z3VtZW50MikpCisgICAgKHByb2duXG4gICAgICAoZnVuY3Rpb24gYXJndW1lbnQxXG4gICAg XHRhcmd1bWVudDIpKQogICAjK0VORF9TUkMiCiAgICAgICAoc2V0cS1sb2NhbCBpbmRlbnQt dGFicy1tb2RlIG5pbCkKICAgICAgIChsZXQgKChvcmctZWRpdC1zcmMtY29udGVudC1pbmRl bnRhdGlvbiAyKQpAQCAtMzM4LDQzICszMzksNTkgQEAgVGhpcyBpcyBhIHRhYjpcdC4KIAko b3JnLWVkaXQtc3BlY2lhbCkKIAkob3JnLWVkaXQtc3JjLWV4aXQpCiAJKGJ1ZmZlci1zdHJp bmcpKSkpKQotICA7OyBHbG9iYWwgaW5kZW50YXRpb24gYWxzbyBvYmV5cyBgdGFiLXdpZHRo JyBmcm9tIG9yaWdpbmFsIGJ1ZmZlci4KKyAgOzsgSW5kZW50YXRpb24gZG9lcyBub3Qgb2Jl eSBgdGFiLXdpZHRoJyBmcm9tIG9yZyBidWZmZXIuCiAgIChzaG91bGQKICAgIChzdHJpbmct bWF0Y2gtcAotICAgICJeXHRcXHszXFx9XHNcXHsyXFx9YXJndW1lbnQyIgorICAgICJeICBc dGFyZ3VtZW50MiIKICAgICAob3JnLXRlc3Qtd2l0aC10ZW1wLXRleHQKIAkiCi0tIEl0ZW0K LSAgIytCRUdJTl9TUkMgZW1hY3MtbGlzcDxwb2ludD4KKyMrQkVHSU5fU1JDIGVtYWNzLWxp c3AKICAgKHByb2duCi0gICAgKGZ1bmN0aW9uIGFyZ3VtZW50MQotICAgICAgICAgICAgICBh cmd1bWVudDIpKQotICAjK0VORF9TUkMiCisgICAgKGxpc3QgYXJndW1lbnQxXG4gIFx0PHBv aW50PmFyZ3VtZW50MikpCisjK0VORF9TUkMiCiAgICAgICAoc2V0cS1sb2NhbCBpbmRlbnQt dGFicy1tb2RlIHQpCiAgICAgICAoc2V0cS1sb2NhbCB0YWItd2lkdGggNCkKLSAgICAgIChs ZXQgKChvcmctZWRpdC1zcmMtY29udGVudC1pbmRlbnRhdGlvbiAwKQorICAgICAgKGxldCAo KG9yZy1lZGl0LXNyYy1jb250ZW50LWluZGVudGF0aW9uIDIpCiAJICAgIChvcmctc3JjLXBy ZXNlcnZlLWluZGVudGF0aW9uIG5pbCkpCiAJKG9yZy1lZGl0LXNwZWNpYWwpCisgICAgICAg IChzZXRxLWxvY2FsIGluZGVudC10YWJzLW1vZGUgdCkKKyAgICAgICAgKHNldHEtbG9jYWwg dGFiLXdpZHRoIDgpCisgICAgICAgIChsaXNwLWluZGVudC1saW5lKQogCShvcmctZWRpdC1z cmMtZXhpdCkKIAkoYnVmZmVyLXN0cmluZykpKSkpCisgIDs7IFRhYiBjaGFyYWN0ZXJzIGFy ZSBkaXNwbGF5ZWQgd2l0aCBgdGFiLXdpZHRoJyBmcm9tIHRoZSBuYXRpdmUKKyAgOzsgZWRp dCBidWZmZXIuCiAgIChzaG91bGQKLSAgIChzdHJpbmctbWF0Y2gtcAotICAgICJeXHRcc1xc ezZcXH1hcmd1bWVudDIiCisgICAoZXF1YWwKKyAgICAxMAogICAgIChvcmctdGVzdC13aXRo LXRlbXAtdGV4dAotCSIKLS0gSXRlbQotICAjK0JFR0lOX1NSQyBlbWFjcy1saXNwPHBvaW50 PgorICAgICAiCisjK0JFR0lOX1NSQyBlbWFjcy1saXNwCiAgIChwcm9nbgotICAgIChmdW5j dGlvbiBhcmd1bWVudDEKLSAgICAgICAgICAgICAgYXJndW1lbnQyKSkKLSAgIytFTkRfU1JD IgotICAgICAgKHNldHEtbG9jYWwgaW5kZW50LXRhYnMtbW9kZSB0KQotICAgICAgKHNldHEt bG9jYWwgdGFiLXdpZHRoIDgpCi0gICAgICAobGV0ICgob3JnLWVkaXQtc3JjLWNvbnRlbnQt aW5kZW50YXRpb24gMCkKLQkgICAgKG9yZy1zcmMtcHJlc2VydmUtaW5kZW50YXRpb24gbmls KSkKLQkob3JnLWVkaXQtc3BlY2lhbCkKLQkob3JnLWVkaXQtc3JjLWV4aXQpCi0JKGJ1ZmZl ci1zdHJpbmcpKSkpKSkKKyAgICAobGlzdCBhcmd1bWVudDFcbiAgXHQ8cG9pbnQ+YXJndW1l bnQyKSkKKyMrRU5EX1NSQyIKKyAgICAgKHNldHEtbG9jYWwgaW5kZW50LXRhYnMtbW9kZSB0 KQorICAgICAoc2V0cS1sb2NhbCB0YWItd2lkdGggNCkKKyAgICAgKGxldCAoKG9yZy1lZGl0 LXNyYy1jb250ZW50LWluZGVudGF0aW9uIDIpCisJICAgKG9yZy1zcmMtcHJlc2VydmUtaW5k ZW50YXRpb24gbmlsKSkKKyAgICAgICAoZm9udC1sb2NrLWVuc3VyZSkKKyAgICAgICAoY3Vy cmVudC1jb2x1bW4pKSkpKQorICA7OyBUaGUgaW5pdGlhbCB0YWIgY2hhcmFjdGVycyByZXNw ZWN0IG9yZydzIGB0YWItd2lkdGgnLgorICAoc2hvdWxkCisgICAoZXF1YWwKKyAgICAxMAor ICAgIChvcmctdGVzdC13aXRoLXRlbXAtdGV4dAorICAgICAiCisjK0JFR0lOX1NSQyBlbWFj cy1saXNwCitcdChwcm9nbgorXHQgIChsaXN0IGFyZ3VtZW50MVxuXHRcdDxwb2ludD5hcmd1 bWVudDIpKQorIytFTkRfU1JDIgorICAgICAoc2V0cS1sb2NhbCBpbmRlbnQtdGFicy1tb2Rl IHQpCisgICAgIChzZXRxLWxvY2FsIHRhYi13aWR0aCAyKQorICAgICAobGV0ICgob3JnLWVk aXQtc3JjLWNvbnRlbnQtaW5kZW50YXRpb24gMikKKwkgICAob3JnLXNyYy1wcmVzZXJ2ZS1p bmRlbnRhdGlvbiBuaWwpKQorICAgICAgIChmb250LWxvY2stZW5zdXJlKQorICAgICAgIChj dXJyZW50LWNvbHVtbikpKSkpKQogCiAoZXJ0LWRlZnRlc3QgdGVzdC1vcmctc3JjL2Zvb3Ru b3RlLXJlZmVyZW5jZXMgKCkKICAgIlRlc3QgZWRpdGluZyBmb290bm90ZSByZWZlcmVuY2Vz LiIKLS0gCjIuNDEuMAoK --------------GkFKd8phaFBDItRYReR0M8xp 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 RnJvbSA3MWU3YTc0NmM3ZDM5Yjg4MDM4MDYwYzViMDM1ZjFjOWU2ZjM1YjEzIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/Uz1DMz1BOWJhc3RpZW49MjBNaXF1 ZWw/PSA8c2ViYXN0aWVuLm1pcXVlbEBwb3N0ZW8uZXU+CkRhdGU6IFRodSwgMjkgSnVuIDIw MjMgMTQ6Mzc6MDkgKzAyMDAKU3ViamVjdDogW1BBVENIXSBvcmctc3JjLmVsOiBSZW5hbWUg aW50ZXJuYWwgdmFyaWFibGUgZm9yIGNsYXJpdHkKCiogbGlzcC9vcmctc3JjLmVsIChvcmct c3JjLS1jb250ZW50cy1mb3Itd3JpdGUtYmFjayk6Cihvcmctc3JjLS1lZGl0LWVsZW1lbnQp OiBSZW5hbWUgYHByZXNlcnZlLWJsYW5rLWxpbmUnIHRvCmBpbmRlbnQtY3VycmVudC1lbXB0 eS1saW5lJy4gIEl0IGlzIHVzZWQgdG8gZGVjaWRlIHdoZXRoZXIgd2Ugc2hvdWxkCmluZGVu dCB0aGUgY3VycmVudCBlbXB0eSBsaW5lIGFmdGVyIGEgc3BlY2lhbCBlZGl0LgotLS0KIGxp c3Avb3JnLXNyYy5lbCB8IDEzICsrKysrKy0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA2IGlu c2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGlzcC9vcmctc3Jj LmVsIGIvbGlzcC9vcmctc3JjLmVsCmluZGV4IGFjMjAxZGE0NC4uMTNiN2Y3ZTIwIDEwMDY0 NAotLS0gYS9saXNwL29yZy1zcmMuZWwKKysrIGIvbGlzcC9vcmctc3JjLmVsCkBAIC0zMTgs OCArMzE4LDggQEAgaXMgMC4iKQogICAiRmlsZSBuYW1lIGFzc29jaWF0ZWQgdG8gT3JnIHNv dXJjZSBidWZmZXIsIG9yIG5pbC4iKQogKHB1dCAnb3JnLXNyYy1zb3VyY2UtZmlsZS1uYW1l ICdwZXJtYW5lbnQtbG9jYWwgdCkKIAotKGRlZnZhci1sb2NhbCBvcmctc3JjLS1wcmVzZXJ2 ZS1ibGFuay1saW5lIG5pbCkKLShwdXQgJ29yZy1zcmMtLXByZXNlcnZlLWJsYW5rLWxpbmUg J3Blcm1hbmVudC1sb2NhbCB0KQorKGRlZnZhci1sb2NhbCBvcmctc3JjLS1pbmRlbnQtY3Vy cmVudC1lbXB0eS1saW5lIG5pbCkKKyhwdXQgJ29yZy1zcmMtLWluZGVudC1jdXJyZW50LWVt cHR5LWxpbmUgJ3Blcm1hbmVudC1sb2NhbCB0KQogCiAoZGVmdW4gb3JnLXNyYy0tY29uc3Ry dWN0LWVkaXQtYnVmZmVyLW5hbWUgKG9yZy1idWZmZXItbmFtZSBsYW5nKQogICAiQ29uc3Ry dWN0IHRoZSBidWZmZXIgbmFtZSBmb3IgYSBzb3VyY2UgZWRpdGluZyBidWZmZXIuCkBAIC00 NzIsNyArNDcyLDcgQEAgQXNzdW1lIHBvaW50IGlzIGluIHRoZSBjb3JyZXNwb25kaW5nIGVk aXQgYnVmZmVyLiIKICAgICAgICAgICAgICAgICAgICAgIChsaXN0IChidWZmZXItc3Vic3Ry aW5nIChwb2ludC1taW4pIGVvbCkKICAgICAgICAgICAgICAgICAgICAgICAgICAgIChidWZm ZXItc3Vic3RyaW5nIGVvbCAocG9pbnQtbWF4KSkpKSkpCiAJKHdyaXRlLWJhY2sgb3JnLXNy Yy0tYWxsb3ctd3JpdGUtYmFjaykKLSAgICAgICAgKHByZXNlcnZlLWJsYW5rLWxpbmUgb3Jn LXNyYy0tcHJlc2VydmUtYmxhbmstbGluZSkKKyAgICAgICAgKGluZGVudC1jdXJyZW50LWVt cHR5LWxpbmUgb3JnLXNyYy0taW5kZW50LWN1cnJlbnQtZW1wdHktbGluZSkKICAgICAgICAg bWFya2VyIGluZGVudC1zdHIpCiAgICAgKHNldHEgaW5kZW50LXN0cgogICAgICAgICAgICh3 aXRoLXRlbXAtYnVmZmVyCkBAIC00OTQsNyArNDk0LDcgQEAgQXNzdW1lIHBvaW50IGlzIGlu IHRoZSBjb3JyZXNwb25kaW5nIGVkaXQgYnVmZmVyLiIKICAgICAgICAgICAgICAgICAgICAg OzsgSWYgdGhlIGN1cnJlbnQgbGluZSBpcyBlbXB0eSwgd2UgbWF5CiAgICAgICAgICAgICAg ICAgICAgIDs7IHdhbnQgdG8gaW5kZW50IGl0LgogICAgICAgICAgICAgICAgICAgICAoYW5k IChlcSAocG9pbnQpIChtYXJrZXItcG9zaXRpb24gbWFya2VyKSkKLSAgICAgICAgICAgICAg ICAgICAgICAgICBwcmVzZXJ2ZS1ibGFuay1saW5lKSkKKyAgICAgICAgICAgICAgICAgICAg ICAgICBpbmRlbnQtY3VycmVudC1lbXB0eS1saW5lKSkKICAgICAgICAgICAgIChpbnNlcnQg aW5kZW50LXN0cikpCiAJICAoZm9yd2FyZC1saW5lKSkpCiAgICAgICA7OyBBcHBseSBXUklU RS1CQUNLIGZ1bmN0aW9uIG9uIGVkaXQgYnVmZmVyIGNvbnRlbnRzLgpAQCAtNTU0LDggKzU1 NCw2IEBAIExlYXZlIHBvaW50IGluIGVkaXQgYnVmZmVyLiIKICAgICAgICAgICAgICAoYmxh bmstbGluZSAoc2F2ZS1leGN1cnNpb24gKGJlZ2lubmluZy1vZi1saW5lKQogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAobG9va2luZy1hdC1wICJeW1s6c3Bh Y2U6XV0qJCIpKSkKICAgICAgICAgICAgICAoZW1wdHktbGluZSAoYW5kIGJsYW5rLWxpbmUg KGxvb2tpbmctYXQtcCAiXiQiKSkpCi0gICAgICAgICAgICAgKHByZXNlcnZlLWJsYW5rLWxp bmUgKG9yIChhbmQgYmxhbmstbGluZSAobm90IGVtcHR5LWxpbmUpKQotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAoYW5kIGVtcHR5LWxpbmUgKD0gKCsgYmxvY2st aW5kIGNvbnRlbnQtaW5kKSAwKSkpKQogCSAgICAgKHByZXNlcnZlLWluZAogCSAgICAgIChh bmQgKG1lbXEgdHlwZSAnKGV4YW1wbGUtYmxvY2sgc3JjLWJsb2NrKSkKIAkJICAgKG9yIChv cmctZWxlbWVudC1wcm9wZXJ0eSA6cHJlc2VydmUtaW5kZW50IGRhdHVtKQpAQCAtNjA1LDcg KzYwMyw4IEBAIExlYXZlIHBvaW50IGluIGVkaXQgYnVmZmVyLiIKIAkoc2V0cSBvcmctc3Jj LS1vdmVybGF5IG92ZXJsYXkpCiAJKHNldHEgb3JnLXNyYy0tYWxsb3ctd3JpdGUtYmFjayB3 cml0ZS1iYWNrKQogCShzZXRxIG9yZy1zcmMtc291cmNlLWZpbGUtbmFtZSBzb3VyY2UtZmls ZS1uYW1lKQotICAgICAgICAoc2V0cSBvcmctc3JjLS1wcmVzZXJ2ZS1ibGFuay1saW5lIHBy ZXNlcnZlLWJsYW5rLWxpbmUpCisgICAgICAgIChzZXRxIG9yZy1zcmMtLWluZGVudC1jdXJy ZW50LWVtcHR5LWxpbmUgKGFuZCBibGFuay1saW5lCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAobm90IGVtcHR5LWxpbmUpKSkKIAk7 OyBTdGFydCBtaW5vciBtb2RlLgogCShvcmctc3JjLW1vZGUpCiAJOzsgQ2xlYXIgdW5kbyBp bmZvcm1hdGlvbiBzbyB3ZSBjYW5ub3QgdW5kbyBiYWNrIHRvIHRoZQotLSAKMi40MS4wCgo= --------------GkFKd8phaFBDItRYReR0M8xp--