[PATCH] org.el: Fix indentation in lists after blocks with special env

[PATCH] org.el: Fix indentation in lists after blocks with special env

[Tim Stewart]

* lisp/org.el (org--get-expected-indentation): Fix indentation within
  lists after blocks that support a special editing environment.

Testing shows that the indentation within lists is incorrect after
`example-block', `export-block', and `source-block'.  The logic falls
through and makes a recursive call to `org-get-indentation' which
results in an indent to the same level as the last line of the block's
contents.

TINYCHANGE
---
 lisp/org.el | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lisp/org.el b/lisp/org.el
index 59f537b..441597a 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -22604,6 +22604,13 @@ ELEMENT."
 	  ;; and contents.
 	  ((= (line-beginning-position) post-affiliated)
 	   (org--get-expected-indentation element t))
+	  ;; Line above is a `#+BEGIN_.../#+END_...' structural
+	  ;; element with support for special editing environments.
+	  ;; Make sure we indent to the same level as the element
+	  ;; instead of its contents.
+	  ((member (car (org-element-at-point))
+		   '(example-block export-block src-block))
+	   (org-get-indentation))
 	  ;; POS is after contents in a greater element.  Indent like
 	  ;; the beginning of the element.
 	  ((and (memq type org-element-greater-elements)
--
2.1.4

Re: [PATCH] org.el: Fix indentation in lists after blocks with special env

[Nicolas Goaziou]

Hello,

Tim Stewart <tim@stoo.org> writes:

> * lisp/org.el (org--get-expected-indentation): Fix indentation within
>   lists after blocks that support a special editing environment.
>
> Testing shows that the indentation within lists is incorrect after
> `example-block', `export-block', and `source-block'.  The logic falls
> through and makes a recursive call to `org-get-indentation' which
> results in an indent to the same level as the last line of the block's
> contents.

Thank you. Could you provide an ECM, however? I'm not able to reproduce
it so far.

Regards,

-- 
Nicolas Goaziou

Re: [PATCH] org.el: Fix indentation in lists after blocks with special env

[Tim Stewart]

Hi,

Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:

> Hello,
>
> Tim Stewart <tim@stoo.org> writes:
>
>> * lisp/org.el (org--get-expected-indentation): Fix indentation within
>>   lists after blocks that support a special editing environment.
>>
>> Testing shows that the indentation within lists is incorrect after
>> `example-block', `export-block', and `source-block'.  The logic falls
>> through and makes a recursive call to `org-get-indentation' which
>> results in an indent to the same level as the last line of the block's
>> contents.
>
> Thank you. Could you provide an ECM, however? I'm not able to reproduce
> it so far.

Huh.  I just tried to minimally reproduce and was unable to do so.  Then
I tried my standard configuration (without this patch) and was still
unable to reproduce!  To keep my sanity, I'm telling myself this may
have been fixed in the meantime.

There were several others at my workplace experiencing the issue--I will
have them remove the patch and retest in their environments.  I
apologize, I should have tried to provide an ECM from the beginning!

Thank you, and I'll let you know what I find,

-TimS

--
Tim Stewart
-----------
Mail:   tim@stoo.org
Matrix: @tim:stoo.org

Re: [PATCH] org.el: Fix indentation in lists after blocks with special env

[Tim Stewart]

Tim Stewart <tim@stoo.org> writes:

> Hi,
>
> Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:
>
>> Hello,
>>
>> Tim Stewart <tim@stoo.org> writes:
>>
>>> * lisp/org.el (org--get-expected-indentation): Fix indentation within
>>>   lists after blocks that support a special editing environment.
>>>
>>> Testing shows that the indentation within lists is incorrect after
>>> `example-block', `export-block', and `source-block'.  The logic falls
>>> through and makes a recursive call to `org-get-indentation' which
>>> results in an indent to the same level as the last line of the block's
>>> contents.
>>
>> Thank you. Could you provide an ECM, however? I'm not able to reproduce
>> it so far.
>
> Huh.  I just tried to minimally reproduce and was unable to do so.  Then
> I tried my standard configuration (without this patch) and was still
> unable to reproduce!  To keep my sanity, I'm telling myself this may
> have been fixed in the meantime.
>
> There were several others at my workplace experiencing the issue--I will
> have them remove the patch and retest in their environments.  I
> apologize, I should have tried to provide an ECM from the beginning!
>
> Thank you, and I'll let you know what I find,

I checked and my coworkers checked and it seems this issue was, in fact,
resolved outside of my changes.  I have not tracked down the change that
provided the actual fix.

Thanks,

-TimS

--
Tim Stewart
-----------
Mail:   tim@stoo.org
Matrix: @tim:stoo.org