[Emacs-diffs] /srv/bzr/emacs/trunk r107725: Fix bug in org-todo.

[Bastien Guerry]

------------------------------------------------------------
revno: 107725
committer: Bastien Guerry <address@hidden>
branch nick: trunk
timestamp: Sun 2012-04-01 20:37:50 +0200
message:
  Fix bug in org-todo.
modified:
  lisp/org/ChangeLog
  lisp/org/org.el

=== modified file 'lisp/org/ChangeLog'
--- a/lisp/org/ChangeLog        2012-04-01 09:49:25 +0000
+++ b/lisp/org/ChangeLog        2012-04-01 18:37:50 +0000
@@ -1,3 +1,7 @@
+2012-04-01  Bastien Guerry  <address@hidden>
+
+       * org.el (org-todo): Fix bug in `org-todo'.
+
 2012-04-01  Eric Schulte  <address@hidden>
 
        * ob-C.el (org-babel-C-execute): Add .exe to the end of compiled

=== modified file 'lisp/org/org.el'
--- a/lisp/org/org.el   2012-04-01 09:49:25 +0000
+++ b/lisp/org/org.el   2012-04-01 18:37:50 +0000
@@ -11256,7 +11256,7 @@
                 (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 @@
                          (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