--- a/runtime/indent/vb.vim	Wed Nov 26 18:20:31 2008 +0900
+++ b/runtime/indent/vb.vim	Fri Dec 17 17:43:06 2010 +0900
@@ -2,6 +2,7 @@
 " Language:	VisualBasic (ft=vb) / Basic (ft=basic) / SaxBasic (ft=vb)
 " Author:	Johannes Zellner <johannes@zellner.org>
 " Last Change:	Fri, 18 Jun 2004 07:22:42 CEST
+"		Small update 2010 Jul 28 by Maxim Kim
 
 if exists("b:did_indent")
     finish
@@ -47,7 +48,7 @@
     let ind = indent(lnum)
 
     " Add
-    if previous_line =~? '^\s*\<\(begin\|\%(\%(private\|public\|friend\)\s\+\)\=\%(function\|sub\|property\)\|select\|case\|default\|if\>.\{-}\<then\>\s*$\|else\|elseif\|do\|for\|while\|enum\|with\)\>'
+    if previous_line =~? '^\s*\<\(begin\|\%(\%(private\|public\|friend\)\s\+\)\=\%(function\|sub\|property\)\|select\|case\|default\|if\|else\|elseif\|do\|for\|while\|enum\|with\)\>'
 	let ind = ind + &sw
     endif
 
@@ -63,7 +64,7 @@
 	    " end select
 	    let ind = ind - &sw
 	endif
-    elseif this_line =~? '^\s*\<\(end\|else\|until\|loop\|next\|wend\)\>'
+    elseif this_line =~? '^\s*\<\(end\|else\|elseif\|until\|loop\|next\|wend\)\>'
 	let ind = ind - &sw
     elseif this_line =~? '^\s*\<\(case\|default\)\>'
 	if previous_line !~? '^\s*\<select\>'
@@ -73,3 +74,5 @@
 
     return ind
 endfun
+
+" vim:sw=4