Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2013-07-04 10:32:45 +02:00
commit 0e99027575

View file

@ -4340,8 +4340,8 @@ If TABLE-TYPE is non-nil, also check for table.el-type tables."
(defvar org-clock-heading "" (defvar org-clock-heading ""
"The heading of the current clock entry.") "The heading of the current clock entry.")
(defun org-clock-is-active () (defun org-clock-is-active ()
"Return non-nil if clock is currently running. "Return the buffer where the clock is currently running.
The return value is actually the clock marker." Return nil if no clock is running."
(marker-buffer org-clock-marker)) (marker-buffer org-clock-marker))
(eval-and-compile (eval-and-compile