Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make display of item separators optional. Fixes mgocode/emacs-calfw#1. #130

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Make display of item separators optional. Fixes mgocode/emacs-calfw#1. #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3d17649
fix dotime parsing
zemaye May 12, 2020
e3d04c2
Merge pull request #1 from zemaye/zemaye-patch-timerange
zemaye May 12, 2020
d54f46c
Make display of item separators optional. Fixes #1.
Feb 9, 2021
5d1ad69
cl-libified calfw (fixes deprecation warnings)
mgocode Sep 24, 2022
646d37e
Merge https://github.com/zemaye/emacs-calfw
Feb 28, 2023
27227b8
Issue #2: Fix parsing of org date range
Feb 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions calfw-org.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
(require 'org-capture)
(require 'google-maps nil t)

(require 's)

(defgroup cfw-org nil
"Options about calfw-org."
:tag "Calfw Org"
Expand Down Expand Up @@ -231,22 +233,19 @@ If this function splits into a list of string, the calfw displays those string i
If TEXT does not have a range, return nil."
(let* ((dotime (cfw:org-tp text 'dotime)))
(and (stringp dotime) (string-match org-ts-regexp dotime)
(let ((date-string (match-string 1 dotime))
(let* ((matches (s-match-strings-all org-ts-regexp dotime))
(start-date (nth 1 (car matches)))
(end-date (nth 1 (nth 1 matches)))
(extra (cfw:org-tp text 'extra)))
(if (string-match "(\\([0-9]+\\)/\\([0-9]+\\)): " extra)
(let* ((cur-day (string-to-number
(match-string 1 extra)))
(total-days (string-to-number
(match-string 2 extra)))
(start-date (time-subtract
(org-read-date nil t date-string)
(seconds-to-time (* 3600 24 (- cur-day 1)))))
(end-date (time-add
(org-read-date nil t date-string)
(seconds-to-time (* 3600 24 (- total-days cur-day))))))
(list (calendar-gregorian-from-absolute (time-to-days start-date))
(calendar-gregorian-from-absolute (time-to-days end-date)) text))
)))))
( list( calendar-gregorian-from-absolute
(time-to-days
(org-read-date nil t start-date))
)
(calendar-gregorian-from-absolute
(time-to-days
(org-read-date nil t end-date))) text)
)))))

(defun cfw:org-schedule-period-to-calendar (begin end)
"[internal] Return calfw calendar items between BEGIN and END
Expand Down
Loading