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-journal support #7060

Closed
wants to merge 1 commit into from

Conversation

nickanderson
Copy link
Contributor

No description provided.


(defun org/init-org-journal ()
(use-package org-journal
:if org-enable-org-journal-support
Copy link
Contributor

Choose a reason for hiding this comment

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

This looks redundant when you are using :toggle for package selection.

@nickanderson
Copy link
Contributor Author

Anything else that I should fix for this?

@nixmaniack
Copy link
Contributor

Maintainers will review it further before it gets added to develop. Since they're busy these days preparing new stable release, any new package/feature addition might get delayed(I think).

@nickanderson
Copy link
Contributor Author

Ok, no problem thanks

@autosquid
Copy link
Contributor

autosquid commented Nov 2, 2016

bump. will this be ok to be merged? seemingly a great feature.

@jgmize
Copy link
Contributor

jgmize commented Nov 12, 2016

@nickanderson thanks for your work on this. Would you mind rebasing on the current develop branch and resolving the merge conflicts?

@nickanderson
Copy link
Contributor Author

Surething

Copy link
Contributor

@jgmize jgmize left a comment

Choose a reason for hiding this comment

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

I tested this locally and it worked like a charm. I also updated my spacemacs-tmux docker image to use this branch, so if you're interested in testing it without altering your local spacemacs config try the following:

docker run -it quay.io/jgmize/spacemacs-tmux


(setq org-journal-dir "~/org/journal/")
(setq org-journal-file-format "%Y-%m-%d"))

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh, so this org-journal-dir and org-journal-file-format are my own preferences, they seem to have snuk in. Shall I remove those so that they can be set in user-config?

The default value for org-journal-dir is ~/Documents/journal/ and the default file format is YYYYMMDD

Copy link
Contributor

Choose a reason for hiding this comment

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

I like your defaults better than the package defaults; perhaps just add docs for how to configure them in .spacemacs?

@nickanderson nickanderson force-pushed the org-journal branch 3 times, most recently from fd34752 to 0465e8c Compare November 27, 2016 18:12
@nickanderson
Copy link
Contributor Author

Rebased, removed my defaults updated docs.

@jgmize
Copy link
Contributor

jgmize commented Nov 29, 2016

I tested out your latest updates, including setting the org-journal-dir and org-journal-file-format variables and I got the following error when I opened a new journal entry with SPC a o j n:

Auto-evilication could not remap these functions in map `org-agenda-mode-map': 
   - `org-agenda-filter-by-tag-refine' originally mapped on `\'           

@nickanderson
Copy link
Contributor Author

Well that's a shame.

@jgmize Did you verify that org-journal-dir existed?

@jgmize
Copy link
Contributor

jgmize commented Nov 29, 2016

Yes, and it opened an existing journal file I had created earlier. I should have mentioned that the message was a warning than a blocker, after dismissing it things worked as expected.

@nickanderson
Copy link
Contributor Author

Ok, so some keybinding didnt get automatically remapped. I don't see it as an issue, but warnings are annoying. Is there some way to avoid it?

@nickanderson
Copy link
Contributor Author

I aligned the new journal entry keybindings. Now its SPC o a j j for the main spacemacs binding and SPC m j in org-journal mode.

@jgmize
Copy link
Contributor

jgmize commented Dec 13, 2016

The latest changes have been working well for me: no more warnings and the new keybindings work as expected. Thanks again for your work on this @nickanderson, and hopefully someone with commit access will be able to take a look at this before another merge conflict is introduced.

@nickanderson
Copy link
Contributor Author

Great, thanks for the feedback @jgmize. I can always re-base if a conflict arises :).

d12frosted added a commit that referenced this pull request Dec 14, 2016
And also fix indentation.

This is to complete #7060
@d12frosted
Copy link
Collaborator

Thank you 👍 Cherry-picked into develop, you can safely delete your branch. @nickanderson ❤️

Folks, go ahead and enjoy 😸


I've made several changes in 0477040:

  • Use commands to expose globally bound functions in order to make them working with lazy loading.
  • Fixed indentation issues - do not forget to properly indent 😸 and DON'T use tabs.

@d12frosted d12frosted closed this Dec 14, 2016
@nickanderson
Copy link
Contributor Author

thanks @d12frosted !

@nickanderson nickanderson deleted the org-journal branch December 14, 2016 20:28
korayal pushed a commit to korayal/spacemacs that referenced this pull request Dec 15, 2016
And also fix indentation.

This is to complete syl20bnr#7060
CodingSolo pushed a commit to CodingSolo/spacemacs that referenced this pull request Oct 29, 2018
And also fix indentation.

This is to complete syl20bnr#7060
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.

None yet

5 participants