summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <n.goaziou@gmail.com>2013-11-06 16:52:49 +0100
committerNicolas Goaziou <n.goaziou@gmail.com>2013-11-06 16:52:49 +0100
commit7ffc460c7f11907297caf3e253e84b7c5b75c565 (patch)
tree8b9d34fd65f8d1f1726495b9c8f6f76870b18b83
parent41755e24ed63077581934a24d62d4017015e57c0 (diff)
parent4c04c13a189e6f6729d1ee9adae346ffc30522c4 (diff)
downloadorg-mode-7ffc460c7f11907297caf3e253e84b7c5b75c565.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org.el18
1 files changed, 13 insertions, 5 deletions
diff --git a/lisp/org.el b/lisp/org.el
index a700785..245caca 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -7060,11 +7060,19 @@ specifying which drawers should not be hidden."
(org-flag-drawer t)))))))
(defun org-cycle-hide-inline-tasks (state)
- "Re-hide inline task when switching to 'contents visibility state."
- (when (and (eq state 'contents)
- (boundp 'org-inlinetask-min-level)
- org-inlinetask-min-level)
- (hide-sublevels (1- org-inlinetask-min-level))))
+ "Re-hide inline tasks when switching to 'contents or 'children
+visibility state."
+ (case state
+ (contents
+ (when (org-bound-and-true-p org-inlinetask-min-level)
+ (hide-sublevels (1- org-inlinetask-min-level))))
+ (children
+ (when (featurep 'org-inlinetask)
+ (save-excursion
+ (while (and (outline-next-heading)
+ (org-inlinetask-at-task-p))
+ (org-inlinetask-toggle-visibility)
+ (org-inlinetask-goto-end)))))))
(defun org-flag-drawer (flag &optional element)
"When FLAG is non-nil, hide the drawer we are at.