diff options
| author | Marco Wahl <marcowahlsoft@gmail.com> | 2017-12-28 19:15:43 +0100 |
|---|---|---|
| committer | Marco Wahl <marcowahlsoft@gmail.com> | 2017-12-28 19:15:43 +0100 |
| commit | 144451143a2ed727b775c4f78999bcdcdb0b82dc (patch) | |
| tree | d55c7fb3516652e78cb1e09327f46b2fbbcdb6e8 | |
| parent | 6311c12556384e8faf24594a09f882a634dc7972 (diff) | |
| parent | e401afffde1891b1bf4b1d37dd074886c5c2a3f9 (diff) | |
| download | org-mode-144451143a2ed727b775c4f78999bcdcdb0b82dc.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/org-inlinetask.el | 4 | ||||
| -rw-r--r-- | testing/lisp/test-org-inlinetask.el | 24 |
2 files changed, 26 insertions, 2 deletions
diff --git a/lisp/org-inlinetask.el b/lisp/org-inlinetask.el index a166b50..c0477b8 100644 --- a/lisp/org-inlinetask.el +++ b/lisp/org-inlinetask.el @@ -341,7 +341,9 @@ This function is meant to be used in `org-cycle-hook'." (org-inlinetask-goto-end))))) (`children (save-excursion - (while (and (outline-next-heading) (org-inlinetask-at-task-p)) + (while + (or (org-inlinetask-at-task-p) + (and (outline-next-heading) (org-inlinetask-at-task-p))) (org-inlinetask-toggle-visibility) (org-inlinetask-goto-end)))))) diff --git a/testing/lisp/test-org-inlinetask.el b/testing/lisp/test-org-inlinetask.el index 6830b16..1e8c9ff 100644 --- a/testing/lisp/test-org-inlinetask.el +++ b/testing/lisp/test-org-inlinetask.el @@ -119,7 +119,7 @@ http://lists.gnu.org/archive/html/emacs-orgmode/2017-12/msg00502.html" (org-cycle-internal-local) (invisible-p (1- (search-forward "- b")))))) -(ert-deftest test-org-inlinetask/folding-directly-consecutive-tasks () +(ert-deftest test-org-inlinetask/folding-directly-consecutive-tasks/0 () "Fold directly consecutive inlinetasks." (should (org-test-with-temp-text @@ -135,6 +135,28 @@ http://lists.gnu.org/archive/html/emacs-orgmode/2017-12/msg00502.html" (org-cycle-internal-local) (invisible-p (1- (search-forward "- b")))))) +(ert-deftest test-org-inlinetask/folding-directly-consecutive-tasks/1 () + "Fold directly consecutive inlinetasks." + (should + (org-test-with-temp-text + "<point>* Test +*************** p1 +p2 +*************** END +*************** p3 +p4 +*************** END + +" + (outline-hide-subtree) + (org-cycle) + (and + (not (invisible-p (1- (search-forward "p1")))) + (invisible-p (1- (search-forward "p2"))) + (not (invisible-p (1- (search-forward "p3")))) + (invisible-p (1- (search-forward "p4"))))))) + + (provide 'test-org-inlinetask) |