[PATCH] Re: Bug: org-cycle stops working on Org files with empty lines at end of buffer [9.4 (9.4-elpaplus @ /home/brentg/.emacs.d/elpa/org-plus-contrib-20200914/)]

[Ihor Radchenko]

> Also, if you can provide a patch, please go ahead.

Here it is.

>From 8e99e5dea780041d314f666f506a120224f064eb Mon Sep 17 00:00:00 2001
From: Ihor Radchenko <yantar92@gmail.com>
Date: Wed, 23 Sep 2020 21:54:47 +0800
Subject: [PATCH] Do not remove trailing newline when deleting planning info
 line.

* lisp/org.el (org-add-planning-info): Remove front newline instead of
trailing newline when deleting planning info is completetly removed
from a heading.  Fixes "Cycling through TODO workflow joins the next
line onto the current one".

The old behaviour affected folded headlines containing only planning
info in the body:

Before deletion:
* DONE Headline<begin fold>
  CLOSED: [2020-09-23 Wed 21:39]<end fold>
* test

After deletion:
* DONE Headline<begin fold>
<end fold>* test

The newline after the first headline is hidden making both the
headlines appear at the same visual line.

New behaviour:
After deletion:
* DONE Headline
* test

All the folded text is completely removed.
---
 lisp/org.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index a9fdc7b77..845920a71 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -10684,8 +10684,8 @@ WHAT entry will also be removed."
         ;; If there is nothing more to add and no more keyword is
         ;; left, remove the line completely.
         (if (and (looking-at-p "[ \t]*$") (not what))
-            (delete-region (line-beginning-position)
-                           (line-beginning-position 2))
+            (delete-region (line-end-position 0)
+                           (line-end-position))
           ;; If we removed last keyword, do not leave trailing white
           ;; space at the end of line.
           (let ((p (point)))
-- 
2.26.2


Bastien <bzg@gnu.org> writes:

> Hi,
>
> stardiviner <numbchild@gmail.com> writes:
>
>> I also did a bisect debug. Found the function ~org-cycle-show-empty-lines~ 
>> in hook
>> ~org-cycle-hook~ caused this problem.
>
> Did you find the commit that introduces this bug?
>
> Also, if you can provide a patch, please go ahead.
>
> Thanks!
>
> -- 
>  Bastien