Skip to content

vim file improvements #6259

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 2 commits into from
May 8, 2013
Merged

vim file improvements #6259

merged 2 commits into from
May 8, 2013

Conversation

Aatch
Copy link
Contributor

@Aatch Aatch commented May 6, 2013

colorcolumn is now set with setlocal, so it doesn't infect the entire session.

conceal support is now opt-in, not opt-out. I haven't found anybody that likes it or cares either way.

The indent file now uses cindent with appropriate cinoptions and cinkeys. Auto-indenting an entire file mostly gets the right thing now, with structs and enums not being affects like before. Defaults to the hanging indent style, unless the first argument is on a new line.

There were some keywords in the syntax file that I've never seen (and have been used as identifiers in some tests) so they have been commented out.

@bstrie
Copy link
Contributor

bstrie commented May 6, 2013

I like these changes, but could you do a rebase rather than a merge for that last commit?

@steveklabnik
Copy link
Member

Super big r+ on this, I've been meaning to change my colorcolumn for Rust and didn't get around to it yet...

James Miller added 2 commits May 8, 2013 11:16
Makes colorcolumn setlocal instead of set.
Makes conceal opt-in.
Removes the seem-to-be obsolete old keywords/types
@Aatch
Copy link
Contributor Author

Aatch commented May 7, 2013

Rebased to remove merge commit. r+?

bors added a commit that referenced this pull request May 8, 2013
`colorcolumn` is now set with `setlocal`, so it doesn't infect the entire session.

`conceal` support is now opt-in, not opt-out. I haven't found anybody that likes it or cares either way.

The indent file now uses `cindent` with appropriate `cinoptions` and `cinkeys`. Auto-indenting an entire file mostly gets the right thing now, with structs and enums not being affects like before. Defaults to the hanging indent style, unless the first argument is on a new line.

There were some keywords in the syntax file that I've never seen (and have been used as identifiers in some tests) so they have been commented out.
@bors bors closed this May 8, 2013
@bors bors merged commit 80b2926 into rust-lang:incoming May 8, 2013
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.

4 participants