Merge commit '2f3935516d1aea7dc3fbd9a45efec4ba9f0b6d50'

pangloss · Feb 21, 2013 · 2e97915 · brianarn · May 22, 2013 · 2e97915
2 parents 7fab32d + 2f39355
commit 2e97915
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/indent/javascript.vim b/indent/javascript.vim
@@ -33,13 +33,13 @@ set cpo&vim
 " ============
 
 " Regex of syntax group names that are or delimit string or are comments.
-let s:syng_strcom = 'javaScript\%(String\|RegexpString\|CommentTodo\|LineComment\|Comment\|DocComment\)'
+let s:syng_strcom = 'string\|regex\|comment\c'
 
 " Regex of syntax group names that are strings.
-let s:syng_string = 'javaScript\%(RegexpString\)'
+let s:syng_string = 'regex\c'
 
 " Regex of syntax group names that are strings or documentation.
-let s:syng_multiline = 'javaScriptDocComment\|javaScriptComment'
+let s:syng_multiline = 'comment\c'
 
 " Expression used to check whether we should skip a match with searchpair().
 let s:skip_expr = "synIDattr(synID(line('.'),col('.'),1),'name') =~ '".s:syng_strcom."'"