Merge pull request #348 from blueyed/develop

klen · klen · commit e6a8d5500fe5 · 2013-12-15T00:20:33.000-08:00
Fix multibyte fold-&amp;fillchar; typo
diff --git a/autoload/pymode/folding.vim b/autoload/pymode/folding.vim
@@ -7,9 +7,9 @@ let s:decorator_regex = '^\s*@'
 let s:doc_begin_regex = '^\s*\%("""\|''''''\)'
 let s:doc_end_regex = '\%("""\|''''''\)\s*$'
 let s:doc_line_regex = '^\s*\("""\|''''''\).\+\1\s*$'
-let s:symbol = ' '
-if stridx(&fillchars, 'fold') > -1
-    let s:symbol = strpart(&fillchars, stridx(&fillchars, 'fold') + 5, 1)
+let s:symbol = matchstr(&fillchars, 'fold:\zs.')  " handles multibyte characters
+if s:symbol == ''
+    let s:symbol = ' '
 endif
 
 
diff --git a/pymode/rope.py b/pymode/rope.py
@@ -327,7 +327,7 @@ def autoimport():
             _insert_import(word, modules[0], ctx)
 
         else:
-            module = env.user_input_choices('Wich module to import:', *modules)
+            module = env.user_input_choices('Which module to import:', *modules)
             _insert_import(word, module, ctx)
 
         return True
