diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2018-01-08 15:00:28 +0100 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2018-01-08 15:00:28 +0100 |
commit | 7544f2b6d7f0790dba77f30cf12b6f103bfb80f9 (patch) | |
tree | ec17af18a7b3212532a973f476f4551eaf261548 | |
parent | b65fe0f7a2664f1027778fea36fd1476fd3d06ca (diff) | |
parent | 9c675b072758684f8485279a087f504c3edb793a (diff) | |
download | org-mode-7544f2b6d7f0790dba77f30cf12b6f103bfb80f9.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-clock.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 74956aa..3704730 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -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)) |