diff options
| author | Bram Moolenaar <Bram@vim.org> | 2007-05-10 18:07:50 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2007-05-10 18:07:50 +0000 |
| commit | 720c710091ba23dcbfca46766d87b4bb57dbc892 (patch) | |
| tree | a3ed47f484ac9632e714951987398888158c97d7 /runtime | |
| parent | 25bc63d168842127cbf23d986f1fcf88553430f6 (diff) | |
updated for version 7.1b
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/usr_29.txt | 2 | ||||
| -rw-r--r-- | runtime/indent/ruby.vim | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/runtime/doc/usr_29.txt b/runtime/doc/usr_29.txt index aa05560da6..cefea389de 100644 --- a/runtime/doc/usr_29.txt +++ b/runtime/doc/usr_29.txt @@ -1,4 +1,4 @@ -*usr_29.txt* For Vim version 7.1a. Last change: 2006 Apr 24 +*usr_29.txt* For Vim version 7.1b. Last change: 2006 Apr 24 VIM USER MANUAL - by Bram Moolenaar diff --git a/runtime/indent/ruby.vim b/runtime/indent/ruby.vim index 824635bc5d..f6d7956658 100644 --- a/runtime/indent/ruby.vim +++ b/runtime/indent/ruby.vim @@ -73,7 +73,7 @@ let s:end_start_regex = '^\s*\zs\<\%(module\|class\|def\|if\|for' . let s:end_middle_regex = '\<\%(ensure\|else\|\%(\%(^\|;\)\s*\)\@<=\<rescue\>\|when\|elsif\)\>' " Regex that defines the end-match for the 'end' keyword. -let s:end_end_regex = '\%(^\|[^.:]\)\@<=\<end\>' +let s:end_end_regex = '\%(^\|[^.:@$]\)\@<=\<end\>' " Expression used for searchpair() call for finding match for 'end' keyword. let s:end_skip_expr = s:skip_expr . @@ -292,7 +292,7 @@ function GetRubyIndent() " If the previous line ended with an "end", match that "end"s beginning's " indent. - let col = s:Match(lnum, '\%(^\|[^.]\)\<end\>\s*\%(#.*\)\=$') + let col = s:Match(lnum, '\%(^\|[^.:@$]\)\<end\>\s*\%(#.*\)\=$') if col > 0 call cursor(lnum, col) if searchpair(s:end_start_regex, '', s:end_end_regex, 'bW', |