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 crash in the menu script; escape menuitem text #178

Merged
merged 1 commit into from
Aug 4, 2020

Conversation

mikeandmore
Copy link
Contributor

attempt to fix #177 as well.

Copy link
Member

@ThomasAdam ThomasAdam left a comment

Choose a reason for hiding this comment

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

Hi @mikeandmore

Thanks for this. Why are there all these unrelated whitespace changes in your diff? These aren't needed as part of your fix...

@mikeandmore
Copy link
Contributor Author

That's just removing the trailing whitespace.

@ThomasAdam
Copy link
Member

Yes, I'm saying it shouldn't be part of this commit.

If subsequent changes happen in those areas, there'll be conflicts.

Please regenerate your patch to just the code changes without these whitespace changes.

@mikeandmore
Copy link
Contributor Author

@ThomasAdam I just did a force push. Does that look better?

@ThomasAdam
Copy link
Member

Hi @mikeandmore,

That's looking good. Perfect. Hopefully you can appreciate why I asked for that change. That's gone from an ~80 line change, down to ~15 lines, which shows just the code change.

Will merge.

@ThomasAdam ThomasAdam merged commit 8249c39 into fvwmorg:master Aug 4, 2020
@mikeandmore
Copy link
Contributor Author

mikeandmore commented Aug 5, 2020

Oops I forgot to catch the exception! I append a new commit.

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

Successfully merging this pull request may close these issues.

fvwm-menu-desktop only produces half the xdg-menu
2 participants