Merge lp:~ryan.wooden/ultisnips/fix713439 into lp:~sirver/ultisnips/trunk

[Ryan Wooden]

Fixes Bug #713439, by just adding a couple returns in expand_anon. I also included a patch to add the plugin directory to sys.path in a nicer way. All the tests still pass on my system.

[SirVer (sirver)]

I have no opinion about the return fix. I dig the searchpath fix though! Nice work, as always :). I'll reply to your other bug report with the features tomorrow.

review: Approve

=== modified file 'plugin/UltiSnips.vim'
--- plugin/UltiSnips.vim	2010-12-18 17:07:46 +0000
+++ plugin/UltiSnips.vim	2011-02-05 00:20:43 +0000
@@ -188,12 +188,8 @@
 python << EOF
 import vim, os, sys
 
-for p in vim.eval("&runtimepath").split(','):
-   dname = p + os.path.sep + "plugin"
-   if os.path.exists(dname + os.path.sep + "UltiSnips"):
-      if dname not in sys.path:
-         sys.path.append(dname)
-      break
+new_path = vim.eval('expand("<sfile>:h")')
+sys.path.append(new_path)
 
 from UltiSnips import UltiSnips_Manager
 UltiSnips_Manager.expand_trigger = vim.eval("g:UltiSnipsExpandTrigger")

=== modified file 'plugin/UltiSnips/__init__.py'
--- plugin/UltiSnips/__init__.py	2010-12-18 17:07:46 +0000
+++ plugin/UltiSnips/__init__.py	2011-02-05 00:20:43 +0000
@@ -665,6 +665,9 @@
 
         if snip.matches(before):
             self._do_snippet(snip, before, after)
+            return True
+        else:
+            return False
 
     def clear_snippets(self, triggers = [], ft = "all"):
         if ft in self._snippets: