mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2018-01-08 15:00:28 +01:00
parent b65fe0f7a2 9c675b0727
commit 7544f2b6d7
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/org-clock.el
View File

@ -430,7 +430,9 @@ This applies when using `org-clock-goto'."
:type 'integer)
(defcustom org-clock-display-default-range 'thisyear
"Default range when displaying clocks with `org-clock-display'."
"Default range when displaying clocks with `org-clock-display'.
Valid values are: `today', `yesterday', `thisweek', `lastweek',
`thismonth', `lastmonth', `thisyear', `lastyear' and `untilnow'."
:group 'org-clock
:type '(choice (const today)
(const yesterday)
@ -441,7 +443,8 @@ This applies when using `org-clock-goto'."
(const thisyear)
(const lastyear)
(const untilnow)
(const :tag "Select range interactively" interactive)))
(const :tag "Select range interactively" interactive))
:safe #'symbolp)
(defvar org-clock-in-prepare-hook nil
"Hook run when preparing the clock.
@ -1936,7 +1939,7 @@ Use `\\[org-clock-remove-overlays]' to remove the subtree times."
(todayp (org-clock-sum-today))
(customp (org-clock-sum-custom nil arg))
(t (org-clock-sum)))
(unless (eq arg '(64))
(unless (equal arg '(64))
(save-excursion
(goto-char (point-min))
(while (or (and (equal (setq p (point)) (point-min))