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

Fix refiling to current buffer (#644) #647

Merged

Conversation

seflue
Copy link
Contributor

@seflue seflue commented Jan 7, 2024

This fixes #644. @kristijanhusak Could you please merge #641 first, because this PR builds upon it. I will then rebase this one. If you decide to merge this directly, we can close #641.

@seflue seflue force-pushed the fix_refiling_to_current_buffer branch 2 times, most recently from e6fcced to 89892f7 Compare January 8, 2024 19:19
Copy link
Member

@kristijanhusak kristijanhusak left a comment

Choose a reason for hiding this comment

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

@seflue just do a rebase here so we can proceed. Thanks!

@seflue
Copy link
Contributor Author

seflue commented Jan 8, 2024

@seflue just do a rebase here so we can proceed. Thanks!

I already did, see the force push.

@kristijanhusak
Copy link
Member

@seflue rebase from master branch. This PR still contains changes from #641, and there is conflict in capture/init.lua file.

Fix edge case when refiling target is the current buffer, but content
was captured.
@seflue seflue force-pushed the fix_refiling_to_current_buffer branch from 89892f7 to 825fff6 Compare January 8, 2024 21:37
@seflue
Copy link
Contributor Author

seflue commented Jan 8, 2024

Sorry, I forgot, that you don't do merge commits but squashing PRs onto master. I just did the requested rebase.

Copy link
Member

@kristijanhusak kristijanhusak left a comment

Choose a reason for hiding this comment

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

Thanks!

@kristijanhusak kristijanhusak merged commit 768b278 into nvim-orgmode:master Jan 8, 2024
7 checks passed
@seflue seflue deleted the fix_refiling_to_current_buffer branch January 9, 2024 06:34
SlayerOfTheBad pushed a commit to SlayerOfTheBad/orgmode that referenced this pull request Aug 16, 2024
Fix edge case when refiling target is the current buffer, but content
was captured.

Co-authored-by: Sebastian Flügge <seflue@users.noreply.github.com>
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.

Easy to lose in-progress capture that only ends up in temp dir with :w
2 participants