Imported Upstream version 8.3.1

1 files changed, 20 insertions, 4 deletions

diff --git a/lisp/org-inlinetask.el b/lisp/org-inlinetask.el
index de4267c..75654b4 100644
--- a/lisp/org-inlinetask.el
+++ b/lisp/org-inlinetask.el
@@ -108,7 +108,6 @@ When nil, the first star is not shown."
 
 (defvar org-odd-levels-only)
 (defvar org-keyword-time-regexp)
-(defvar org-drawer-regexp)
 (defvar org-complex-heading-regexp)
 (defvar org-property-end-re)
 
@@ -315,19 +314,36 @@ If the task has an end part, also demote it."
      ;; Nothing to show/hide.
      ((= end start))
      ;; Inlinetask was folded: expand it.
-     ((get-char-property (1+ start) 'invisible)
+     ((eq (get-char-property (1+ start) 'invisible) 'outline)
       (outline-flag-region start end nil)
       (org-cycle-hide-drawers 'children))
      (t (outline-flag-region start end t)))))
 
+(defun org-inlinetask-hide-tasks (state)
+  "Hide inline tasks in buffer when STATE is `contents' or `children'.
+This function is meant to be used in `org-cycle-hook'."
+  (case state
+    (contents
+     (let ((regexp (org-inlinetask-outline-regexp)))
+       (save-excursion
+	 (goto-char (point-min))
+	 (while (re-search-forward regexp nil t)
+	   (org-inlinetask-toggle-visibility)
+	   (org-inlinetask-goto-end)))))
+    (children
+     (save-excursion
+       (while (and (outline-next-heading) (org-inlinetask-at-task-p))
+	 (org-inlinetask-toggle-visibility)
+	 (org-inlinetask-goto-end))))))
+
 (defun org-inlinetask-remove-END-maybe ()
   "Remove an END line when present."
   (when (looking-at (format "\\([ \t]*\n\\)*\\*\\{%d,\\}[ \t]+END[ \t]*$"
 			    org-inlinetask-min-level))
     (replace-match "")))
 
-(eval-after-load "org"
-  '(add-hook 'org-font-lock-hook 'org-inlinetask-fontify))
+(add-hook 'org-font-lock-hook 'org-inlinetask-fontify)
+(add-hook 'org-cycle-hook 'org-inlinetask-hide-tasks)
 
 (provide 'org-inlinetask)