Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix :syn-include usage of Vim filetype.
Here’s what the Vim manual says in *:syn-include*: :sy[ntax] include [@{grouplist-name}] {file-name} All syntax items declared in the included file will have the "contained" flag added. In addition, if a group list is specified, all top-level syntax items in the included file will be added to that list. We had two rules for `rustModPath`, one `contained` and the other not. The effect was that the second (now renamed to `rustModPathInUse`) was being included in the group list, and thus that all identifiers were being highlighted as `Include`, which is definitely not what we wanted.
- Loading branch information
0a0c6da
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from kballard
at chris-morgan@0a0c6da
0a0c6da
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging chris-morgan/rust/vim-misc-2014-07-04 = 0a0c6da into auto
0a0c6da
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
chris-morgan/rust/vim-misc-2014-07-04 = 0a0c6da merged ok, testing candidate = 7ac9703f
0a0c6da
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
some tests failed:
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/445
0a0c6da
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from kballard
at chris-morgan@0a0c6da
0a0c6da
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging chris-morgan/rust/vim-misc-2014-07-04 = 0a0c6da into auto
0a0c6da
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
chris-morgan/rust/vim-misc-2014-07-04 = 0a0c6da merged ok, testing candidate = 81a2565
0a0c6da
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
some tests failed:
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/447
0a0c6da
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from kballard
at chris-morgan@0a0c6da
0a0c6da
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging chris-morgan/rust/vim-misc-2014-07-04 = 0a0c6da into auto
0a0c6da
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
chris-morgan/rust/vim-misc-2014-07-04 = 0a0c6da merged ok, testing candidate = 9cc39a0
0a0c6da
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/449
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/449
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/448
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/449
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/450
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/451
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/450
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/456
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/451
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/450
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/453
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/451
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/451
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/452
0a0c6da
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fast-forwarding master to auto = 9cc39a0