Skip to content

Commit 0493e3d

Browse files
Isty001Isty001
committed
Merge remote-tracking branch 'upstream/master'
2 parents aca0311 + b3a4af9 commit 0493e3d

6 files changed

Lines changed: 21 additions & 28 deletions

File tree

‎autoload/rubycomplete.vim‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
" Vim completion script
2-
" Language: Ruby
3-
" Maintainer: Mark Guzman <segfault@hasno.info>
4-
" URL: https://github.com/vim-ruby/vim-ruby
5-
" Release Coordinator: Doug Kearns <dougkearns@gmail.com>
6-
" Maintainer Version: 0.8.1
2+
" Language: Ruby
3+
" Maintainer: Mark Guzman <segfault@hasno.info>
4+
" URL: https://github.com/vim-ruby/vim-ruby
5+
" Release Coordinator: Doug Kearns <dougkearns@gmail.com>
76
" ----------------------------------------------------------------------------
87
"
98
" Ruby IRB/Complete author: Keiju ISHITSUKA(keiju@ishitsuka.com)

‎compiler/ruby.vim‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
" Maintainer: Tim Pope <vimNOSPAM@tpope.org>
55
" URL: https://github.com/vim-ruby/vim-ruby
66
" Release Coordinator: Doug Kearns <dougkearns@gmail.com>
7-
" ----------------------------------------------------------------------------
87

98
if exists("current_compiler")
109
finish

‎ftplugin/eruby.vim‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
" Release Coordinator: Doug Kearns <dougkearns@gmail.com>
66

77
" Only do this when not done yet for this buffer
8-
if get(b:, 'did_ftplugin') =~# '\<eruby\>'
8+
if exists("b:did_ftplugin")
99
finish
1010
endif
1111

@@ -23,8 +23,6 @@ endif
2323

2424
if &filetype =~ '^eruby\.'
2525
let b:eruby_subtype = matchstr(&filetype,'^eruby\.\zs\w\+')
26-
elseif &filetype =~ '^.*\.eruby\>'
27-
let b:eruby_subtype = matchstr(&filetype,'^.\{-\}\ze\.eruby\>')
2826
elseif !exists("b:eruby_subtype")
2927
let s:lines = getline(1)."\n".getline(2)."\n".getline(3)."\n".getline(4)."\n".getline(5)."\n".getline("$")
3028
let b:eruby_subtype = matchstr(s:lines,'eruby_subtype=\zs\w\+')
@@ -47,14 +45,11 @@ elseif !exists("b:eruby_subtype")
4745
endif
4846
endif
4947

50-
if &filetype =~# '^eruby\>'
51-
if exists("b:eruby_subtype") && b:eruby_subtype != '' && b:eruby_subtype !=? 'eruby'
52-
exe "runtime! ftplugin/".b:eruby_subtype.".vim ftplugin/".b:eruby_subtype."_*.vim ftplugin/".b:eruby_subtype."/*.vim"
53-
else
54-
runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim
55-
endif
48+
if exists("b:eruby_subtype") && b:eruby_subtype != '' && b:eruby_subtype !=? 'eruby'
49+
exe "runtime! ftplugin/".b:eruby_subtype.".vim ftplugin/".b:eruby_subtype."_*.vim ftplugin/".b:eruby_subtype."/*.vim"
50+
else
51+
runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim
5652
endif
57-
let s:did_ftplugin = get(b:, 'did_ftplugin', 1)
5853
unlet! b:did_ftplugin
5954

6055
" Override our defaults if these were set by an included ftplugin.
@@ -87,7 +82,7 @@ let s:path = &l:path
8782
let s:suffixesadd = &l:suffixesadd
8883

8984
runtime! ftplugin/ruby.vim ftplugin/ruby_*.vim ftplugin/ruby/*.vim
90-
let b:did_ftplugin = s:did_ftplugin . '.eruby'
85+
let b:did_ftplugin = 1
9186

9287
" Combine the new set of values with those previously included.
9388
if exists("b:undo_ftplugin")

‎ftplugin/ruby.vim‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
" Language: Ruby
33
" Maintainer: Tim Pope <vimNOSPAM@tpope.org>
44
" URL: https://github.com/vim-ruby/vim-ruby
5-
" Release Coordinator: Doug Kearns <dougkearns@gmail.com>
6-
" ----------------------------------------------------------------------------
5+
" Release Coordinator: Doug Kearns <dougkearns@gmail.com>
76

87
if (exists("b:did_ftplugin"))
98
finish

‎indent/eruby.vim‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,20 @@
44
" URL: https://github.com/vim-ruby/vim-ruby
55
" Release Coordinator: Doug Kearns <dougkearns@gmail.com>
66

7-
if get(b:, 'did_indent') =~# '\<eruby\>'
7+
if exists("b:did_indent")
88
finish
99
endif
1010

1111
runtime! indent/ruby.vim
1212
unlet! b:did_indent
1313
setlocal indentexpr=
1414

15-
if &filetype =~# '^eruby\>'
16-
if exists("b:eruby_subtype") && b:eruby_subtype != '' && b:eruby_subtype !=# 'eruby'
17-
exe "runtime! indent/".b:eruby_subtype.".vim"
18-
else
19-
runtime! indent/html.vim
20-
endif
15+
if exists("b:eruby_subtype") && b:eruby_subtype != '' && b:eruby_subtype !=# 'eruby'
16+
exe "runtime! indent/".b:eruby_subtype.".vim"
17+
else
18+
runtime! indent/html.vim
2119
endif
22-
let b:did_indent = get(b:, 'did_indent', 1) . '.eruby'
20+
unlet! b:did_indent
2321

2422
" Force HTML indent to not keep state.
2523
let b:html_indent_usestate = 0
@@ -33,6 +31,8 @@ if &l:indentexpr == ''
3331
endif
3432
let b:eruby_subtype_indentexpr = &l:indentexpr
3533

34+
let b:did_indent = 1
35+
3636
setlocal indentexpr=GetErubyIndent()
3737
setlocal indentkeys=o,O,*<Return>,<>>,{,},0),0],o,O,!^F,=end,=else,=elsif,=rescue,=ensure,=when
3838

‎indent/ruby.vim‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
" Vim indent file
22
" Language: Ruby
3-
" Maintainer: Nikolai Weibull <now at bitwi.se>
3+
" Maintainer: Andrew Radev <andrey.radev@gmail.com>
4+
" Previous Maintainer: Nikolai Weibull <now at bitwi.se>
45
" URL: https://github.com/vim-ruby/vim-ruby
56
" Release Coordinator: Doug Kearns <dougkearns@gmail.com>
67

0 commit comments

Comments
 (0)