-
Notifications
You must be signed in to change notification settings - Fork 124
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.
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
Make calendar integration optional #378
base: master
Are you sure you want to change the base?
Conversation
org-journal.el
Outdated
(add-hook 'calendar-today-visible-hook 'org-journal-mark-entries) | ||
;;;###autoload | ||
(add-hook 'calendar-today-invisible-hook 'org-journal-mark-entries) | ||
(if org-journal-enable-calendar-integration |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this breaks the autoloads, which are necessary for making org-journal work in the calendar if it hasn't been invoked yet. So the branch probably needs to happen inside org-journal-mark-entries
instead.
org-journal.el
Outdated
(define-key calendar-mode-map (kbd "j s y") 'org-journal-search-calendar-year))) | ||
do (define-key org-journal-mode-map (funcall key-func org-journal-prefix-key key) command)))) | ||
|
||
(if org-journal-enable-calendar-integration |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would it break anything if these remained enabled? Or perhaps it would make sense to only disable the first five. I could see a use case for org-journal-new-date-entry
and the org-journal-search-*
functions even with the calendar highlights disabled.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good point.
Something like this will work. Thank you! But I added two comments that we should discuss or fix. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
have not manually tested, but looks good
Fixes #375 |
@dppdppd Is it ok if I push to this branch, and do a squash merge afterwards? |
something like this?