emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

lang/org: use correct todo on RET

Browse source 
Improves on baa6f640. This fixes RET cycling between different keyword
sets.
This commit is contained in:
Henrik Lissner 2018-10-19 15:43:24 -04:00
parent 8e67e591d6
commit e0f7ba19cd
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

20
modules/lang/org/autoload/org.el
View file

@ -19,6 +19,19 @@ current file). Only scans first 2048 bytes of the document."
(+org--get-property name))
(+org--get-property name bound)))
;;;###autoload
(defun +org-get-todo-keywords-for (keyword)
"TODO"
(when keyword
(cl-loop for (type . keyword-spec) in org-todo-keywords
for keywords = (mapcar (lambda (x) (if (string-match "^\\([^(]+\\)(" x)
(match-string 1 x)
x))
keyword-spec)
if (eq type 'sequence)
if (member keyword keywords)
return keywords)))
;;
;; Modes
@ -72,7 +85,10 @@ If on a:
(`headline
(cond ((org-element-property :todo-type context)
(org-todo
(if (eq (org-element-property :todo-type context) 'done) 'todo 'done)))
(if (eq (org-element-property :todo-type context) 'done)
(or (car (+org-get-todo-keywords-for (org-element-property :todo-keyword context)))
'todo)
'done)))
((string= "ARCHIVE" (car-safe (org-get-tags)))
(org-force-cycle-archived))
(t
@ -206,7 +222,7 @@ wrong places)."
(insert "\n")
(if (= level 1) (insert "\n")))))
(when-let* ((todo-keyword (org-element-property :todo-keyword context)))
(org-todo (or (get-text-property 0 'org-todo-head todo-keyword)
(org-todo (or (car (+org-get-todo-keywords-for todo-keyword))
'todo)))))
(t (user-error "Not a valid list, heading or table")))