ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

org-todo: Respect state argument when called from elisp 

* lisp/org.el (org-todo): Respect argument when called from elisp when
calling from elisp (such as in `org-clock-in').

Fast selection should only be shown if a state argument was not used.
This fixes a regression introduced by f1c030bed (Prefix argument to
`org-todo' forces stage change logging, 2019-08-14).

TINYCHANGE
This commit is contained in:
Renato Ferreira 2019-08-16 11:44:38 -03:00 committed by Kyle Meyer
parent ebf10f126c
commit 413736f315
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/org.el
View File

@ -10100,9 +10100,6 @@ When called through ELisp, arg is also interpreted in the following way:
(length tail) 2)
org-todo-keywords-1)
(org-last org-todo-keywords-1))))
((and org-todo-key-trigger org-use-fast-todo-selection)
;; Use fast selection.
(org-fast-todo-selection this))
(arg
;; User or caller requests a specific state.
(cond
@ -10121,6 +10118,9 @@ When called through ELisp, arg is also interpreted in the following way:
(user-error "State `%s' not valid in this file" arg))
((nth (1- (prefix-numeric-value arg))
org-todo-keywords-1))))
((and org-todo-key-trigger org-use-fast-todo-selection)
;; Use fast selection.
(org-fast-todo-selection this))
((null member) (or head (car org-todo-keywords-1)))
((equal this final-done-word) nil) ;-> make empty
((null tail) nil) ;-> first entry