Skip to content

Default softWrap #143

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

Merged
merged 5 commits into from
Aug 21, 2017
Merged

Default softWrap #143

merged 5 commits into from
Aug 21, 2017

Conversation

Aerijo
Copy link
Collaborator

@Aerijo Aerijo commented Aug 20, 2017

Here's the pull. I only enabled it when the text.tex.latex grammar is used, so it should work for all normal LaTeX files.

It should not set softwrapping to true in the log or bib files, as I believe them to be closer to a structured programming setup, where personal preference may go either way. If you want this changed (for consistency) I'll do it.

Aerijo added 2 commits August 20, 2017 09:58
Added default softWrap setting
A new installation will enable `softWrap` regardless of user global settings (as in language-gfm). This can be overridden in the packages settings or user config file.
@Aerijo Aerijo requested a review from yudai-nkt August 20, 2017 00:21
CHANGELOG.md Outdated
@@ -1,5 +1,10 @@
# Changelog

## 1.1.2
Copy link
Collaborator

Choose a reason for hiding this comment

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

Remove this line. I don't think this is a patch release. Version number should be written just before a new release.

@yudai-nkt
Copy link
Collaborator

Also, please resolve conflicts.

Requesting contributors to update CHANGELOG.md tends to cause a merge conflict. Should we stop this?

@yudai-nkt
Copy link
Collaborator

Note: Fix #18.

@Aerijo
Copy link
Collaborator Author

Aerijo commented Aug 20, 2017

It seems that changing CHANGELOG.md after someone forks this package leads to the conflicts when they try and merge again.

I don't know the best way to deal with it, but fixing the conflict amounts to deleting the 'conflict syntax' that git adds, so that both your lines and the conflicting lines get added.

@yudai-nkt yudai-nkt merged commit a26d293 into area:master Aug 21, 2017
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