sync with zhang's vim.d

sync with zhang's vim.d