Merge branch 'master' of https://github.com/jdhao/nvim-config

after/ftplugin/python.vim

@@ -1,3 +1,3 @@
 if exists(':AsyncRun')
-    nnoremap <silent> <F9> :AsyncRun python "%"<CR>
+    nnoremap <silent> <F9> :AsyncRun python -u "%"<CR>
 endif

options.vim

@@ -141,6 +141,7 @@ let g:MY_DICT = expand(g:nvim_config_root . '/dict/words')
 let &dictionary = &dictionary . ',' . g:MY_DICT
 
 set spelllang=en,cjk  " Spell languages
+set spellsuggest+=10  " The number of suggestions shown in the screen for z=
 
 " Align indent to next multiple value of shiftwidth. For its meaning,
 " see http://tinyurl.com/y5n87a6m

plugins.vim

@@ -832,5 +832,9 @@ noremap <silent> <ScrollWheelUp>   :call comfortable_motion#flick(-40)<CR>
 """""""""""""""""""""""""" asyncrun.vim settings """"""""""""""""""""""""""
 " Automatically open quickfix window of 6 line tall after asyncrun starts
 let g:asyncrun_open = 6
+if has('win32')
+    " Command output encoding for Windows
+    let g:asyncrun_encs = 'gbk'
+endif
 "}}
 "}