diff options
| author | Bastien Guerry <bastien1@free.fr> | 2012-04-01 20:37:50 +0200 |
|---|---|---|
| committer | Bastien Guerry <bastien1@free.fr> | 2012-04-01 20:37:50 +0200 |
| commit | 126b903e70ec05b2c77125f6a9a4fe956b659459 (patch) | |
| tree | 9cb180dbe9fd756a76c03d73dfdcb969bd5cbbe7 | |
| parent | 0d224826228ee15f0ab60a138a1c01f735c48c29 (diff) | |
| download | emacs-126b903e70ec05b2c77125f6a9a4fe956b659459.tar.gz | |
Fix bug in org-todo.
| -rw-r--r-- | lisp/org/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/org/org.el | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index a5e33f1ea9e..a7c2e0dbd66 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -1,3 +1,7 @@ +2012-04-01 Bastien Guerry <bzg@gnu.org> + + * org.el (org-todo): Fix bug in `org-todo'. + 2012-04-01 Eric Schulte <eric.schulte@gmx.com> * ob-C.el (org-babel-C-execute): Add .exe to the end of compiled diff --git a/lisp/org/org.el b/lisp/org/org.el index 85d8d1efb18..c3e92460417 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -11256,7 +11256,7 @@ For calling through lisp, arg is also interpreted in the following way: (interpret (nth 1 ass)) (done-word (nth 3 ass)) (final-done-word (nth 4 ass)) - (last-state (or this "")) + (org-last-state (or this "")) (completion-ignore-case t) (member (member this org-todo-keywords-1)) (tail (cdr member)) @@ -11322,7 +11322,7 @@ For calling through lisp, arg is also interpreted in the following way: (car tail)))) (state (or (run-hook-with-args-until-success - 'org-todo-get-default-hook state last-state) + 'org-todo-get-default-hook state org-last-state) state)) (next (if state (concat " " state " ") " ")) (change-plist (list :type 'todo-state-change :from this :to state |