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 2017-07-24 09:42:50 +02:00
parent 6c38314429 d9713fe3ca
commit 6b9f9e9aff
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/org.texi
View File

@ -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

3
lisp/org-clock.el
View File

@ -2710,8 +2710,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)))