From 09c3e4585d3b3c1735c54668b40a7ec5d229f298 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Thu, 12 Dec 2013 18:37:34 +0100 Subject: [PATCH 1/2] Fix typo: s/Wich/Which --- pymode/rope.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pymode/rope.py b/pymode/rope.py index 704151a0..7d50c7d4 100644 --- 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 From 8a10b9669fcb94532bdcebf69fb75bc1913b3c37 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Thu, 12 Dec 2013 18:40:13 +0100 Subject: [PATCH 2/2] folding: handle multibyte chars in &fillchars This uses `matchstr`, which is multibyte aware, while `strpart` is not. --- autoload/pymode/folding.vim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/autoload/pymode/folding.vim b/autoload/pymode/folding.vim index 7718e75d..9bfa78d2 100644 --- 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