mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-29 18:36:26 +00:00
Merge branch 'maint'
This commit is contained in:
commit
6b9f9e9aff
|
@ -501,9 +501,9 @@ Capture templates
|
||||||
|
|
||||||
Protocols for external access
|
Protocols for external access
|
||||||
|
|
||||||
* @code{store-link} protocol:: Store a link, push URL to kill-ring
|
* @code{store-link} protocol:: Store a link, push URL to kill-ring.
|
||||||
* @code{capture} protocol:: Fill a buffer with external information
|
* @code{capture} protocol:: Fill a buffer with external information.
|
||||||
* @code{open-source} protocol:: Edit published contents
|
* @code{open-source} protocol:: Edit published contents.
|
||||||
|
|
||||||
Archiving
|
Archiving
|
||||||
|
|
||||||
|
|
|
@ -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)))
|
(pcase-let ((`(,month ,day ,year) (calendar-gregorian-from-absolute te)))
|
||||||
(setq te (float-time (encode-time 0 0 0 day month year)))))
|
(setq te (float-time (encode-time 0 0 0 day month year)))))
|
||||||
(te
|
(te
|
||||||
(setq te (float-time
|
(setq te (float-time (apply #'encode-time (org-parse-time-string te))))))
|
||||||
(apply #'encode-time (org-parse-time-string te nil t))))))
|
|
||||||
(setq tsb
|
(setq tsb
|
||||||
(if (eq step0 'week)
|
(if (eq step0 'week)
|
||||||
(- ts (* 86400 (- (nth 6 (decode-time (seconds-to-time ts))) ws)))
|
(- ts (* 86400 (- (nth 6 (decode-time (seconds-to-time ts))) ws)))
|
||||||
|
|
Loading…
Reference in a new issue