Support ~/.vimrc with DOS line endings #348
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
| source=(${pkgname}-${pkgver}.tar.gz::https://github.com/vim/vim/archive/v${pkgver}.tar.gz | ||
| 'dot.vimrc' | ||
| '7.3-cygwin-mouse.patch' | ||
| '7.3-virc.patch' | ||
| '7.3-cygwin-python-dyn.patch' | ||
| 'pretend-cygwin-msys.patch' | ||
| 'accept-crlf.patch' |
There was a problem hiding this comment.
Use spaces instead tabs everywhere
There was a problem hiding this comment.
Sorry, I forgot! Fixed.
When sharing Windows' home directory, we have to expect that the `.vimrc` file can have DOS line endings. Let's be lenient about this, as well as all other input we get, and just handle CR/LF as well as LF line endings. We still behave as before, otherwise. This fixes git-for-windows/git#272 and git-for-windows/git#364 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho
force-pushed
the
vimrc-with-crlf
branch
from
af0cb3d to
049251a
Compare
Alexpux
added a commit
that referenced
this pull request
Sep 15, 2015
Support ~/.vimrc with DOS line endings
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It was noticed in git-for-windows/git#272 and git-for-windows/git#364 that MSys2's
vimhas problems when the user's$HOME/.vimrccontains DOS line endings. This is quite common when MSys2 is configured with the regular Windows home directory as$HOME.It's easy to support, so let's do that.