From 10bdef394d1f6b16bff92ab53a883ebb4c55cf2e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 24 Jul 2017 09:34:57 +0200 Subject: [PATCH 1/2] org.texi: Fix last commit --- doc/org.texi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/org.texi b/doc/org.texi index c5acbb8dd..d1675cd20 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -501,9 +501,9 @@ Capture templates Protocols for external access -* @code{store-link} protocol:: Store a link, push URL to kill-ring -* @code{capture} protocol:: Fill a buffer with external information -* @code{open-source} protocol:: Edit published contents +* @code{store-link} protocol:: Store a link, push URL to kill-ring. +* @code{capture} protocol:: Fill a buffer with external information. +* @code{open-source} protocol:: Edit published contents. Archiving From d9713fe3ca96cf3d02beb62156162b86e5aedad8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 24 Jul 2017 09:40:58 +0200 Subject: [PATCH 2/2] org-clock: Fix :tend with a time zone * lisp/org-clock.el (org-clocktable-steps): Do not force UTC for :tend. Reported-by: Dale Sedivec --- lisp/org-clock.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 7c1c6c24e..cba8b17c2 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -2708,8 +2708,7 @@ LEVEL is an integer. Indent by two spaces per level above 1." (pcase-let ((`(,month ,day ,year) (calendar-gregorian-from-absolute te))) (setq te (float-time (encode-time 0 0 0 day month year))))) (te - (setq te (float-time - (apply #'encode-time (org-parse-time-string te nil t)))))) + (setq te (float-time (apply #'encode-time (org-parse-time-string te)))))) (setq tsb (if (eq step0 'week) (- ts (* 86400 (- (nth 6 (decode-time (seconds-to-time ts))) ws)))