Merge branch 'maint'

2013-10-30 00:34:46 +01:00 · 2013-10-30 00:34:46 +01:00 · 5aaf45ea6d
parent 929a422a3c d80bdb7431
commit 5aaf45ea6d
1 changed files with 2 additions and 1 deletions
--- a/lisp/org-inlinetask.el
+++ b/lisp/org-inlinetask.el
@ -315,7 +315,8 @@ If the task has an end part, also demote it."
     ((= end start))
     ;; Inlinetask was folded: expand it.
     ((get-char-property (1+ start) 'invisible)
-      (org-show-entry))
+      (outline-flag-region start end nil)
+      (org-cycle-hide-drawers 'children))
     (t (outline-flag-region start end t)))))

 (defun org-inlinetask-remove-END-maybe ()