branch: externals/org
commit 1661cd153f16444a38a262c36bca3ecf03edf558
Merge: b255cb13a7 0cf0f51163
Author: Ihor Radchenko <[email protected]>
Commit: Ihor Radchenko <[email protected]>
Merge branch 'bugfix'
---
lisp/org-archive.el | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lisp/org-archive.el b/lisp/org-archive.el
index e3d5c423bb..ba2c9b7a81 100644
--- a/lisp/org-archive.el
+++ b/lisp/org-archive.el
@@ -221,8 +221,9 @@ an error if LOCATION is not a valid archive location."
"Move the current subtree to the archive.
The archive can be a certain top-level heading in the current
file, or in a different file. The tree will be moved to that
-location, the subtree heading be marked DONE, and the current
-time will be added.
+location. If `org-archive-mark-done' is non-nil and the subtree
+has a TODO keyword, the subtree heading will be marked DONE.
+And the current time will be added.
When called with a single prefix argument FIND-DONE, find whole
trees without any open TODO items and archive them (after getting
