summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Stankiewicz <sheerun@sher.pl>2014-03-16 14:48:30 +0100
committerAdam Stankiewicz <sheerun@sher.pl>2014-03-16 14:48:30 +0100
commit95bc6710a4fd961ecc1d7d9f344e97fb690810b1 (patch)
tree16a822293039f8b7ce5a9bc3a9a34ad84ab8acb1
parent94f72a68c3dccade13ec7203a284620040f930f1 (diff)
downloadvim-polyglot-95bc6710a4fd961ecc1d7d9f344e97fb690810b1.tar.gz
vim-polyglot-95bc6710a4fd961ecc1d7d9f344e97fb690810b1.zip
Update elixir, perl and rust
-rw-r--r--indent/elixir.vim4
-rw-r--r--syntax/perl.vim2
-rw-r--r--syntax/rust.vim2
3 files changed, 6 insertions, 2 deletions
diff --git a/indent/elixir.vim b/indent/elixir.vim
index c89f5887..fababe48 100644
--- a/indent/elixir.vim
+++ b/indent/elixir.vim
@@ -59,6 +59,10 @@ function! GetElixirIndent()
let ind += opened_symbol * &sw
+ if current_line =~ '^\s*\(\]\|}\)'
+ let ind -= &sw
+ endif
+
if last_line =~ s:indent_keywords
let ind += &sw
endif
diff --git a/syntax/perl.vim b/syntax/perl.vim
index c7a2f4d5..a42a8455 100644
--- a/syntax/perl.vim
+++ b/syntax/perl.vim
@@ -410,7 +410,7 @@ if exists("perl_fold")
endif
if !exists("perl_nofold_subs")
if exists("perl_fold_anonymous_subs") && perl_fold_anonymous_subs
- syn region perlSubFold start="\<sub\>[^\n;]*{" end="}" transparent fold keepend extend
+ syn region perlSubFold start="\<sub\>[^;]*{" end="}" transparent fold keepend extend
syn region perlSubFold start="\<\%(BEGIN\|END\|CHECK\|INIT\)\>\s*{" end="}" transparent fold keepend
else
syn region perlSubFold start="^\z(\s*\)\<sub\>.*[^};]$" end="^\z1}\s*\%(#.*\)\=$" transparent fold keepend
diff --git a/syntax/rust.vim b/syntax/rust.vim
index bd27f057..9c8e5b5d 100644
--- a/syntax/rust.vim
+++ b/syntax/rust.vim
@@ -96,7 +96,7 @@ syn keyword rustTrait MutableVector MutableTotalOrdVector
syn keyword rustTrait Vector VectorVector CloneableVector ImmutableVector
"syn keyword rustFunction stream
-syn keyword rustTrait Port Chan
+syn keyword rustTrait Sender Receiver
"syn keyword rustFunction spawn
syn keyword rustSelf self