tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'maint' 

Conflicts:
	lisp/org-clock.el
This commit is contained in:
Bastien Guerry 2013-03-02 18:59:47 +01:00
parent 6bc6a361b0 3b21f246d6
commit 0a21f82962
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lisp/org-clock.el
View File

@ -1548,7 +1548,15 @@ to, overriding the existing value of `org-clock-out-switch-to-state'."
(message (concat "Clock stopped at %s after "
(org-minutes-to-clocksum-string (+ (* 60 h) m)) "%s")
te (if remove " => LINE REMOVED" ""))
(run-hooks 'org-clock-out-hook)
(let ((h org-clock-out-hook))
;; If a closing note needs to be stored in the drawer
;; where clocks are stored, let's temporarily disable
;; `org-clock-remove-empty-clock-drawer'
(if (and (equal org-clock-into-drawer org-log-into-drawer)
(eq org-log-done 'note)
org-clock-out-when-done)
(setq h (delq 'org-clock-remove-empty-clock-drawer h)))
(mapc (lambda (f) (funcall f)) h))
(unless (org-clocking-p)
(setq org-clock-current-task nil)))))))