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.

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

Add org wild notifier to org layer #14418

Conversation

dalanicolai
Copy link
Contributor

@dalanicolai dalanicolai commented Feb 24, 2021

This PR replaces #14396. See last comments there for motivation.

I've added instructions to use =org-journal-new-scheduled-entry=, assuming that PR numbers 335, 337 and 338 get merged soon.

@dalanicolai dalanicolai force-pushed the add-org-wild-notifier-to-org-layer branch 4 times, most recently from 0fbd49a to 1a43077 Compare February 24, 2021 13:59
Copy link
Collaborator

@smile13241324 smile13241324 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, apart from that the new package should be deferred.
Can you close your old PR if it is not longer needed?

layers/+emacs/org/packages.el Show resolved Hide resolved
@dalanicolai dalanicolai force-pushed the add-org-wild-notifier-to-org-layer branch from 1a43077 to c667758 Compare February 28, 2021 21:54
@dalanicolai dalanicolai reopened this Feb 28, 2021
Copy link
Collaborator

@smile13241324 smile13241324 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, will be merged soon.

@smile13241324
Copy link
Collaborator

@dalanicolai looks like there are some conflicts in your PR, can you have a look? Especially there is a merge which prevents me from cherry picking your commit. Can you squash/fix the conflicts on your side?

@dalanicolai dalanicolai force-pushed the add-org-wild-notifier-to-org-layer branch from c667758 to cc26b86 Compare March 14, 2021 21:19
This PR should be a better replacement for syl20bnr#14396. See the last comment of that
PR for motivation.
@dalanicolai dalanicolai force-pushed the add-org-wild-notifier-to-org-layer branch from cc26b86 to 683fb72 Compare March 14, 2021 21:24
@dalanicolai
Copy link
Contributor Author

dalanicolai commented Mar 14, 2021

@smile13241324 Ah sorry. I am still no git expert. To create the org-wild-notifier fix, I branched from develop but then I merged from the previous add-notify PR (my previous PR to add add-notify, that I replaced with org-wild-notifier in this PR) so that I did not have to type everything new again. However, I guess I should just have had to use git apply (or use git -reset ^HEAD after the merge). Anyway, I am trying to learn and understand it (but I have only internet as my teacher).

Therewere some more git horrors when I tried to rebase, because somehow it did not leave my 'fix branch' intact. Anyway. I have applied some tricks now to fix it. I hope I have done things more or less correctly now.

Thanks again of course!

@smile13241324
Copy link
Collaborator

Thank you for contributing to spacemacs 💜, I have cherry picked your commit into develop.

@dalanicolai
Copy link
Contributor Author

The documentation part in this PR assumes that bastibe/org-journal#339 got merged, which did not happen yet. But, although I expected it to get merged sooner, I still expect it to get merged very soon (probably before anybody will discover this documentation about those org-journal commands).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants