fix previous commit, implementation should be fine now

Author: MarcWeber

autoload/snipMate.vim

@@ -683,8 +683,7 @@ fun! snipMate#RetabSnip() range
 endf
 
 fun! snipMate#OpenSnippetFiles()
-  let scopes = s:AddScopeAliases(snipMate#ScopesByFile())
-  let dict = snipMate#GetSnippetFiles(0, scopes, '*')
+  let dict = snipMate#GetSnippetFiles(0, snipMate#ScopesByFile(), '*')
   " sort by files wether they exist - put existing files first
   let exists = []
   let notExists = []
@@ -705,9 +704,8 @@ fun! snipMate#OpenSnippetFiles()
 endf
 
 fun! snipMate#ScopesByFile()
-  " default implementation to determine scopes based on cursor, filetype,
-  " syntax setting. Usually &ft and &syntax are the same
-  return tlib#list#Uniq(split(&ft, '\.') + [&syntax, '_'])
+	" duplicates are removed in AddScopeAliases
+	return funcref#Call(s:snipMate.get_scopes)
 endf
 
 " vim:noet:sw=4:ts=4:ft=vim

doc/snipMate.txt

@@ -140,9 +140,10 @@ See |snipMate-disambiguation| to learn about how name collisions are handled.
 Note that dotted
 'filetype' syntax is supported -- e.g., you can use >
 
-	:set ft=html.eruby =syntax=sql
+	:set ft=html.eruby syntax=sql
+
 to activate snippets for both HTML, eRuby and sql for the current file.
-See snipMate#ScopesByFile()
+See g:snipMate['get_scopes'] in plugin/snipMate.vim.
 
 The syntax for snippets in *.snippets files is the following: >
 

plugin/snipMate.vim

@@ -37,6 +37,11 @@ let s:snipMate['get_snippets'] = get(s:snipMate, 'get_snippets', funcref#Functio
 " directories in &rtp/snippets/*
 let s:snipMate['snippet_dirs'] = get(s:snipMate, 'snippets_dirs', funcref#Function('return split(&runtimepath,",")'))
 
+" _ is default scope added always
+"
+" &ft honors multiple filetypes and syntax such as in set ft=html.javascript syntax=FOO
+let s:snipMate['get_scopes'] = get(s:snipMate, 'get_scopes', funcref#Function('return split(&ft,"\\.")+[&syntax, "_"]'))
+
 if !exists('snippets_dir')
 	let snippets_dir = substitute(globpath(&rtp, 'snippets/'), "\n", ',', 'g')
 endif
@@ -153,7 +158,7 @@ fun! s:GetSnippet(word)
 	" prefer longest word
 	for word in lookups
 		" echomsg string(lookups).' current: '.word
-		let snippetD = get(funcref#Call(s:snipMate['get_snippets'], [split(&ft, '\.') + ['_'], word.'*']), word, {})
+		let snippetD = get(funcref#Call(s:snipMate['get_snippets'], [snipMate#ScopesByFile(), word.'*']), word, {})
 		if !empty(snippetD)
 			let s = s:ChooseSnippet(snippetD)
 			if type(s) == type([])
@@ -204,7 +209,7 @@ fun! ShowAvailableSnips()
 	endif
 	let matchlen = 0
 	let matches = []
-	let snips = funcref#Call(s:snipMate['get_snippets'], [split(&ft, '\.') + ['_'], word.'*'])
+	let snips = funcref#Call(s:snipMate['get_snippets'], [snipMate#ScopesByFile(), word.'*'])
 
 
 	for trigger in keys(snips)