diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 22803b4a1..f98f52c81 100755 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2009-10-20 John Wiegley + * org-clock.el (org-clock-resolve-clock): Fixed an incorrect + variable reference. + * org-agenda.el (org-agenda-set-mode-name): Show Habit in the modeline when habits are being displayed (if that module is being loaded). diff --git a/lisp/org-clock.el b/lisp/org-clock.el index cfba43f2c..c7ebbf892 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -645,7 +645,7 @@ This routine can do one of many things: (org-clock-clock-out clock fail-quietly resolve-to) (unless org-clock-clocking-in (if close-p - (setq org-clock-left-over-time last-valid) + (setq org-clock-left-over-time resolve-to) (org-clock-clock-in clock))))))) (defun org-clock-resolve (clock &optional prompt-fn last-valid fail-quietly)