Merge branch 'develop' of github.com:klen/python-mode into develop

klen · klen · commit affff75a28d2 · 2013-05-03T18:41:31.000+08:00
diff --git a/autoload/pymode/run.vim b/autoload/pymode/run.vim
@@ -31,7 +31,7 @@ fun! pymode#run#Run(line1, line2) "{{{
 python << EOF
 if out:
     vim.command("call pymode#TempBuffer()")
-    vim.current.buffer.append([x.encode(enc) for x in out.split('\n')], 0)
+    vim.current.buffer.append([x.decode("utf-8").encode(enc) for x in out.split('\n')], 0)
     vim.command("wincmd p")
 else:
     vim.command('call pymode#WideMessage("No output.")')
diff --git a/doc/pymode.txt b/doc/pymode.txt
@@ -371,6 +371,7 @@ buffers: >
     setlocal number
     setlocal nowrap
     setlocal textwidth=80
+    setlocal commentstring=#%s
 <
 ------------------------------------------------------------------------------
                                                                *'pymode_motion'*
diff --git a/ftplugin/python/pymode.vim b/ftplugin/python/pymode.vim
@@ -26,6 +26,7 @@ if pymode#Option('options')
     endif
     setlocal nowrap
     setlocal textwidth=79
+    setlocal commentstring=#%s
 endif
 
 " }}}
