From 7879a93081ab5d82e4fed8bbecfc62dfff755879 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 11 Nov 2019 14:49:34 -0500 Subject: [PATCH] lang/org: preserve TODO keyword on C-RET Rather than reverting to first TODO keyword. --- modules/lang/org/autoload/org.el | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/lang/org/autoload/org.el b/modules/lang/org/autoload/org.el index 52b23c76c..98d919ea9 100644 --- a/modules/lang/org/autoload/org.el +++ b/modules/lang/org/autoload/org.el @@ -95,9 +95,12 @@ (org-back-to-heading) (insert (make-string level ?*) " ") (save-excursion (insert "\n")))) - (when-let (todo-keyword (org-element-property :todo-keyword context)) - (org-todo (or (car (+org-get-todo-keywords-for todo-keyword)) - 'todo))))) + (when-let* ((todo-keyword (org-element-property :todo-keyword context)) + (todo-type (org-element-property :todo-type context))) + (org-todo (cond ((eq todo-type 'done) + (car (+org-get-todo-keywords-for todo-keyword))) + (todo-keyword) + ('todo)))))) ((user-error "Not a valid list, heading or table")))