Merge branch 'master' of git://repo.or.cz/org-mode

This commit is contained in:
Dan Davison 2010-08-17 17:32:11 -04:00
commit cbe5089e0f

View file

@ -7140,7 +7140,7 @@ The cursor may be at a date in the calendar, or in the Org agenda."
(defun org-agenda-clock-out ()
"Stop the currently running clock."
(interactive "P")
(interactive)
(unless (marker-buffer org-clock-marker)
(error "No running clock"))
(let ((marker (make-marker)) newhead)