summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-12-22 19:22:06 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-12-22 19:22:06 +0100
commit7e77560ebb53d33db05e3e677db3737f4c000f44 (patch)
tree2774a54dd5611e65666b6da93b0fad3358840355
parent6e95e088e8a3b5bd41fd6efd8c251b12f6ced61b (diff)
parentbac8d25441448d69764d55624f1ee21da28157a7 (diff)
downloadorg-mode-7e77560ebb53d33db05e3e677db3737f4c000f44.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-clock.el3
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 0e7eb21..a1a5996 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -1456,8 +1456,7 @@ The time is always returned as UTC."
(day (nth 3 dt)))
(if (< hour org-extend-today-until) (setf (nth 3 dt) (1- day)))
(setf (nth 2 dt) org-extend-today-until)
- (setq dt (append (list 0 0) (nthcdr 2 dt) '(t)))
- (apply #'encode-time dt)))
+ (apply #'encode-time (append (list 0 0) (nthcdr 2 dt)))))
((or (equal cmt "all")
(and (or (not cmt) (equal cmt "auto"))
(not lr)))