diff options
Diffstat (limited to 'lisp/org/org-datetree.el')
| -rw-r--r-- | lisp/org/org-datetree.el | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/lisp/org/org-datetree.el b/lisp/org/org-datetree.el index 30f5f99aea6..fb4df3cbe81 100644 --- a/lisp/org/org-datetree.el +++ b/lisp/org/org-datetree.el @@ -4,7 +4,7 @@ ;; Author: Carsten Dominik <carsten.dominik@gmail.com> ;; Keywords: outlines, hypermedia, calendar, wp -;; Homepage: https://orgmode.org +;; URL: https://orgmode.org ;; ;; This file is part of GNU Emacs. ;; @@ -30,6 +30,9 @@ ;;; Code: +(require 'org-macs) +(org-assert-version) + (require 'org) (defvar org-datetree-base-level 1 @@ -137,7 +140,7 @@ will be built under the headline at point." (let* ((year (calendar-extract-year d)) (month (calendar-extract-month d)) (day (calendar-extract-day d)) - (time (encode-time 0 0 0 day month year)) + (time (org-encode-time 0 0 0 day month year)) (iso-date (calendar-iso-from-absolute (calendar-absolute-from-gregorian d))) (weekyear (nth 2 iso-date)) @@ -185,8 +188,7 @@ inserted into the buffer." (defun org-datetree-insert-line (year &optional month day text) (delete-region (save-excursion (skip-chars-backward " \t\n") (point)) (point)) - (when (assq 'heading org-blank-before-new-entry) - (insert "\n")) + (when (org--blank-before-heading-p) (insert "\n")) (insert "\n" (make-string org-datetree-base-level ?*) " \n") (backward-char) (when month (org-do-demote)) @@ -197,14 +199,14 @@ inserted into the buffer." (when month (insert (if day - (format-time-string "-%m-%d %A" (encode-time 0 0 0 day month year)) - (format-time-string "-%m %B" (encode-time 0 0 0 1 month year)))))) + (format-time-string "-%m-%d %A" (org-encode-time 0 0 0 day month year)) + (format-time-string "-%m %B" (org-encode-time 0 0 0 1 month year)))))) (when (and day org-datetree-add-timestamp) (save-excursion (insert "\n") (org-indent-line) (org-insert-time-stamp - (encode-time 0 0 0 day month year) + (org-encode-time 0 0 0 day month year) nil (eq org-datetree-add-timestamp 'inactive)))) (beginning-of-line)) |