>From 3236ba94c92c021311f7ffb128686f9c2751d4e1 Mon Sep 17 00:00:00 2001
From: Eric Abrahamsen <address@hidden>
Date: Sun, 12 Oct 2014 23:48:49 +0800
Subject: [PATCH 4/4] Move deletion of inlinetasks to archive hook

* lisp/org-archive.el (org-archive-subtree): Remove org-inlinetask
  specific code.

* lisp/org-inlinetask.el: Add org-inlinetask-remove-END-maybe to the
  org-archive-hook.
---
 lisp/org-archive.el    | 2 --
 lisp/org-inlinetask.el | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/org-archive.el b/lisp/org-archive.el
index c7f02b9..6d07f5a 100644
--- a/lisp/org-archive.el
+++ b/lisp/org-archive.el
@@ -378,8 +378,6 @@ this heading."
 	;; up.
 	(run-hooks 'org-archive-hook)
 	(let (this-command) (org-cut-subtree))
-	(when (featurep 'org-inlinetask)
-	  (org-inlinetask-remove-END-maybe))
 	(setq org-markers-to-move nil)
 	(message "Subtree archived %s"
 		 (if (eq this-buffer buffer)
diff --git a/lisp/org-inlinetask.el b/lisp/org-inlinetask.el
index 9e0aadb..206ddf3 100644
--- a/lisp/org-inlinetask.el
+++ b/lisp/org-inlinetask.el
@@ -325,6 +325,8 @@ If the task has an end part, also demote it."
 			    org-inlinetask-min-level))
     (replace-match "")))
 
+(add-hook 'org-archive-hook 'org-inlinetask-remove-END-maybe)
+
 (eval-after-load "org"
   '(add-hook 'org-font-lock-hook 'org-inlinetask-fontify))
 
-- 
2.1.2