commit 8fd0b6776d5f10e190d2ce743479de5fee84738b parent 30ae8d9c31a710ad94a5b33eb4231a878ce3b334 Author: Ed van Bruggen <edvb54@gmail.com> Date: Thu, 23 Feb 2017 20:40:09 -0800 Vim: Update plugins and dictionary Diffstat:
30 files changed, 71 insertions(+), 56 deletions(-)
diff --git a/vim/bundle/GoldenView.Vim b/vim/bundle/GoldenView.Vim @@ -1 +1 @@ -Subproject commit 0c2a0fe2119b7b231ffc45acb92536bf0511e877 +Subproject commit ac0ee3014caa36c52e8352d11c308b27a159113c diff --git a/vim/bundle/Vundle.vim b/vim/bundle/Vundle.vim @@ -1 +1 @@ -Subproject commit cfd3b2d388a8c2e9903d7a9d80a65539aabfe933 +Subproject commit 88688fe453038ac1ac26e31646cfbec50fca2fb7 diff --git a/vim/bundle/catium.vim b/vim/bundle/catium.vim @@ -1 +1 @@ -Subproject commit c304ffc445dee4e0ce60cb17c53a1d1166096d04 +Subproject commit 072644246772a100beba2f0b7a89cb96e1033917 diff --git a/vim/bundle/dmenu.vim b/vim/bundle/dmenu.vim @@ -0,0 +1 @@ +Subproject commit f1562ffde03249dd737c495deeba89ed743c24a3 diff --git a/vim/bundle/neocomplete.vim b/vim/bundle/neocomplete.vim @@ -1 +1 @@ -Subproject commit a76e4a7fa75c9f174d51b5f4825a4ef6fe1836e6 +Subproject commit 9617d825c0d4acdb18aec903e9c1c0443058d18b diff --git a/vim/bundle/rainbow/README.md b/vim/bundle/rainbow/README.md @@ -5,9 +5,9 @@ Rainbow Parentheses Improved Description [(这里有中文版)](https://github.com/luochen1990/rainbow/blob/master/README_zh.md) --------------------------------------------------------------------------------------------------- -As everyone knows, the most complex codes were composed of a mass of different kinds of parentheses(typically: lisp). +As everyone knows, the most complex codes were composed of a mass of different kinds of parentheses (typically: lisp). This plugin will help you read these codes by showing different levels of parentheses in different colors. -you can also find this plugin in **[www.vim.org](http://www.vim.org/scripts/script.php?script_id=4176)**. +You can also find this plugin in **[www.vim.org](http://www.vim.org/scripts/script.php?script_id=4176)**. #### lisp  @@ -18,14 +18,14 @@ you can also find this plugin in **[www.vim.org](http://www.vim.org/scripts/scri ### What is improved ? - no limit of parentheses levels. -- separately edit guifgs and ctermfgs (the colors used for highlighting) +- separately edit guifgs and ctermfgs (the colors used for highlighting). - now you can design your own parentheses such as 'begin' and 'end'. -- you can also configure anything seprately for different type of files. +- you can also configure anything separately for different types of files. - now you can even decide to let some operators (like + - * / , ==) hilighted with the parentheses together. - json style configuration used, more understandable and readable, easier for advanced configuration. -- the code is shorter and easier to be read now. +- the code is shorter and easier to read now. - smoother and faster. -- the chinese document is added. +- the Chinese document is added. ### Referenced: - http://www.vim.org/scripts/script.php?script_id=1561 (Martin Krischik) @@ -54,7 +54,7 @@ let g:rainbow_active = 1 "0 if you want to enable it later via :RainbowToggle Configure: ---------- -There is an example for advanced configuration(which i'm using), add it to your vimrc and edit it as you wish(just keep the format). +There is an example for advanced configuration (which I'm using), add it to your vimrc and edit it as you wish (just keep the format). ```vim let g:rainbow_conf = { @@ -82,10 +82,10 @@ There is an example for advanced configuration(which i'm using), add it to your ``` - 'guifgs': colors for gui interface, will be used in order. -- 'ctermfgs': colors for terms -- 'operators': describe the operators you want to highlight(read the vim help :syn-pattern) -- 'parentheses': describe what will be processed as parentheses, a pair of parentheses was described by two re pattern -- 'separately': configure for specific filetypes(decided by &ft), key `*` for filetypes without separate configuration, value `0` means disable rainbow only for this type of files +- 'ctermfgs': colors for terms. +- 'operators': describe the operators you want to highlight (note: be careful about special characters which needs escaping, you can find more examples [here](https://github.com/luochen1990/rainbow/issues/3), and you can also read the [vim help about syn-pattern](http://vimdoc.sourceforge.net/htmldoc/syntax.html#:syn-pattern)). +- 'parentheses': describe what will be processed as parentheses, a pair of parentheses was described by two re pattern. +- 'separately': configure for specific filetypes (decided by &ft), key `*` for filetypes without separate configuration, value `0` means disable rainbow only for this type of files. - keep a field empty to use the default setting. User Command: @@ -94,7 +94,6 @@ User Command: - **:RainbowToggle** --you can use it to toggle this plugin. ------------------------------------------------------------------ -**Rate this script if you like it, -and i'll appreciate it and improve this plugin for you because of your support ! -just goto [this page](http://www.vim.org/scripts/script.php?script_id=4176) and choose `Life Changing` and click `rate`** - +**Rate this script if you like it, and I'll appreciate it and improve this plugin for you because of your support! + +Just go to [this page](http://www.vim.org/scripts/script.php?script_id=4176) and choose `Life Changing` and click `rate`** diff --git a/vim/bundle/rainbow/README_zh.md b/vim/bundle/rainbow/README_zh.md @@ -76,9 +76,10 @@ let g:rainbow_active = 1 "0 if you want to enable it later via :RainbowToggle \} ``` +- 'operators': describe the operators you want to highlight (note: be careful about special characters which needs escaping, you can find more examples [here](https://github.com/luochen1990/rainbow/issues/3), and you can also read the [vim help about syn-pattern](http://vimdoc.sourceforge.net/htmldoc/syntax.html#:syn-pattern)) - 'guifgs': GUI界面的括号颜色(将按顺序循环使用) - 'ctermfgs': 终端下的括号颜色(同上,插件将根据环境进行选择) -- 'operators': 描述你希望哪些运算符跟着与它同级的括号一起高亮(见vim帮助 :syn-pattern) +- 'operators': 描述你希望哪些运算符跟着与它同级的括号一起高亮(注意：留意需要转义的特殊字符，更多样例见[这里](https://github.com/luochen1990/rainbow/issues/3), 你也可以读[vim帮助 :syn-pattern](http://vimdoc.sourceforge.net/htmldoc/syntax.html#:syn-pattern)) - 'parentheses': 描述哪些模式将被当作括号处理,每一组括号由两个vim正则表达式描述 - 'separately': 针对文件类型(由&ft决定)作不同的配置,未被单独设置的文件类型使用`*`下的配置,值为`0`表示仅对该类型禁用插件 - 省略某个字段以使用默认设置 diff --git a/vim/bundle/rainbow/plugin/rainbow.vim b/vim/bundle/rainbow/plugin/rainbow.vim @@ -1,16 +1,16 @@ "============================================================================== "Script Title: rainbow parentheses improved -"Script Version: 3.3.4 +"Script Version: 3.4.0 "Author: luochen1990 -"Last Edited: 2015 June 15 +"Last Edited: 2015 Nov 19 "Simple Configuration: " first, put "rainbow.vim"(this file) to dir vimfiles/plugin or vim73/plugin " second, add the follow sentences to your .vimrc or _vimrc : " let g:rainbow_active = 1 " third, restart your vim and enjoy coding. "Advanced Configuration: -" an advanced configuration allows you to define what parentheses to use -" for each type of file . you can also determine the colors of your +" an advanced configuration allows you to define what parentheses to use +" for each type of file . you can also determine the colors of your " parentheses by this way (read file vim73/rgb.txt for all named colors). " READ THE SOURCE FILE FROM LINE 25 TO LINE 50 FOR EXAMPLE. "User Command: @@ -82,7 +82,7 @@ func rainbow#load() let conf.parentheses[i] = op != ''? printf('start=#%s# step=%s end=#%s#', p[0], op, p[-1]) : printf('start=#%s# end=#%s#', p[0], p[-1]) endif endfor - let def_rg = 'syn region %s matchgroup=%s containedin=%s contains=%s,@NoSpell %s' + let def_rg = 'syn region %s matchgroup=%s containedin=%s contains=%s %s' let def_op = 'syn match %s %s containedin=%s contained' call rainbow#clear() @@ -104,6 +104,10 @@ func rainbow#load() exe printf(def_rg, 'rainbow_r0', 'rainbow_p0 contained', containedin.',rainbow_r'.(maxlvl - 1), contains, paren) endif endfor + exe 'syn cluster RainbowRegions contains='.join(map(range(maxlvl), '"rainbow_r".v:val'),',') + exe 'syn cluster RainbowParentheses contains='.join(map(range(maxlvl), '"rainbow_p".v:val'),',') + exe 'syn cluster RainbowOperators contains='.join(map(range(maxlvl), '"rainbow_o".v:val'),',') + call rainbow#show() endfunc @@ -124,8 +128,8 @@ func rainbow#show() for id in range(b:rainbow_loaded) let ctermfg = b:rainbow_conf.ctermfgs[id % len(b:rainbow_conf.ctermfgs)] let guifg = b:rainbow_conf.guifgs[id % len(b:rainbow_conf.guifgs)] - exe 'hi default rainbow_p'.id.' ctermfg='.ctermfg.' guifg='.guifg - exe 'hi default rainbow_o'.id.' ctermfg='.ctermfg.' guifg='.guifg + exe 'hi rainbow_p'.id.' ctermfg='.ctermfg.' guifg='.guifg + exe 'hi rainbow_o'.id.' ctermfg='.ctermfg.' guifg='.guifg endfor endif endfunc diff --git a/vim/bundle/swapit b/vim/bundle/swapit @@ -0,0 +1 @@ +Subproject commit c1c76c03be9a836b631470e08b32145456beb2e8 diff --git a/vim/bundle/tmux-complete.vim b/vim/bundle/tmux-complete.vim @@ -1 +1 @@ -Subproject commit e5b69217a2d9c25a72d626e03bc340414a7d5fc9 +Subproject commit e74076df2b6ec443f4b52fda96b4f5e8c87d1814 diff --git a/vim/bundle/vim-buftabline b/vim/bundle/vim-buftabline @@ -1 +1 @@ -Subproject commit 73c48fb9727693be07f29b953350c43ca64bda9a +Subproject commit 228b1cb47b0b9c6e074f812a3d5694209b04669f diff --git a/vim/bundle/vim-commentary b/vim/bundle/vim-commentary @@ -1 +1 @@ -Subproject commit 9c685131a5facfa0d643feca3a61b41c007d8170 +Subproject commit 73e0d9a9d1f51b6cc9dc965f62669194ae851cb1 diff --git a/vim/bundle/vim-cursorword b/vim/bundle/vim-cursorword @@ -1 +1 @@ -Subproject commit ca18c670b08d104ab2486fd04f2efdc20d3e2369 +Subproject commit db84a181cfe616f5e15bef6e1a87635f17149765 diff --git a/vim/bundle/vim-easy-align b/vim/bundle/vim-easy-align @@ -1 +1 @@ -Subproject commit c62d124be614de65922b15d468c4049d1eee9353 +Subproject commit 3b395bd5bafbdfb1f93190fa3f259b7ad2e40eb9 diff --git a/vim/bundle/vim-endwise b/vim/bundle/vim-endwise @@ -1 +1 @@ -Subproject commit bba43b831ae0485cf9b86d16340a6a314b927391 +Subproject commit 0067ceda37725d01b7bd5bf249d63b1b5d4e2ab4 diff --git a/vim/bundle/vim-fugitive b/vim/bundle/vim-fugitive @@ -1 +1 @@ -Subproject commit 4cc201cbe3a0c3faa4cde1b82ba941d410e5e81c +Subproject commit f44845e4408aae03e018e98afb7fbf0c2ee87dd5 diff --git a/vim/bundle/vim-gitgutter b/vim/bundle/vim-gitgutter @@ -1 +1 @@ -Subproject commit 937930e647b89c1095c0683af16d7d5e8efcbd09 +Subproject commit 5d1a0bfa1bd2b8d8a77fff09d13394e5abbc6143 diff --git a/vim/bundle/vim-grepper b/vim/bundle/vim-grepper @@ -1 +1 @@ -Subproject commit b423d5d8211fe0aece44dc3a50450a4f016f26a9 +Subproject commit df7e3101cbdd6ff0c5fd2d6b017b488345bf8da7 diff --git a/vim/bundle/vim-polyglot b/vim/bundle/vim-polyglot @@ -1 +1 @@ -Subproject commit acd7ce59503b22ac7663fc25776efe25e266f1d4 +Subproject commit fbeb019a8516939bd904983ddc341e65c2ea19cb diff --git a/vim/bundle/vim-repeat b/vim/bundle/vim-repeat @@ -1 +1 @@ -Subproject commit c4f9f159e66a00e148b05d3c97c20072777d559f +Subproject commit 7a6675f092842c8f81e71d5345bd7cdbf3759415 diff --git a/vim/bundle/vim-rsi/plugin/rsi.vim b/vim/bundle/vim-rsi/plugin/rsi.vim @@ -53,7 +53,7 @@ noremap! <M-f> <S-Right> noremap! <M-n> <Down> noremap! <M-p> <Up> -if !has("gui_running") +if !has("gui_running") && !has('nvim') silent! exe "set <S-Left>=\<Esc>b" silent! exe "set <S-Right>=\<Esc>f" silent! exe "set <F31>=\<Esc>d" diff --git a/vim/bundle/vim-signature b/vim/bundle/vim-signature @@ -1 +1 @@ -Subproject commit f8c6ad88d13787e1fed5e0655d94886bb35e00c8 +Subproject commit 7e13913188809c45e14988270213744d1c3bb485 diff --git a/vim/bundle/vim-sleuth b/vim/bundle/vim-sleuth @@ -1 +1 @@ -Subproject commit 1db371f776215ab0d1c49c9780e008a6d41d3faf +Subproject commit 62c4f261874dd44e6cdc6788b4a6bc59f9dfe746 diff --git a/vim/bundle/vim-surround b/vim/bundle/vim-surround @@ -1 +1 @@ -Subproject commit 772ab9587b7d1e2c3bae75395c9123803059ba8a +Subproject commit e49d6c2459e0f5569ff2d533b4df995dd7f98313 diff --git a/vim/bundle/vim-tmux-navigator b/vim/bundle/vim-tmux-navigator @@ -1 +1 @@ -Subproject commit 928a52fbda90ec70b2eb6edaf570654df4521af0 +Subproject commit 1b24c5a4626e5a0032920cd44d118086aa0305cd diff --git a/vim/bundle/vim-unimpaired b/vim/bundle/vim-unimpaired @@ -1 +1 @@ -Subproject commit 3548479cc154154cbdbb6737ca08a47937cc7113 +Subproject commit 11dc568dbfd7a56866a4354c737515769f08e9fe diff --git a/vim/bundle/vim-vinegar/README.markdown b/vim/bundle/vim-vinegar/README.markdown @@ -21,8 +21,13 @@ to even consider. * All that annoying crap at the top is turned off, leaving you with nothing but a list of files. This is surprisingly disorienting, but ultimately very liberating. Press `I` to toggle until you adapt. -* The oddly C-biased default sort order and file hiding is replaced with a - sensible application of `'suffixes'` and `'wildignore'`. +* The oddly C-biased default sort order is replaced with a sensible application + of `'suffixes'`. +* File hiding: files are not listed that match with one of the patterns in + `'wildignore'`. + If you put `let g:netrw_list_hide = '\(^\|\s\s\)\zs\.\S\+'` + in your vimrc, vinegar will initialize with dot files hidden. + Press `gh` to toggle dot file hiding. * Press `.` on a file to pre-populate it at the end of a `:` command line. This is great, for example, to quickly initiate a `:grep` of the file or directory under the cursor. There's also `!`, which starts the line off diff --git a/vim/bundle/vim-vinegar/plugin/vinegar.vim b/vim/bundle/vim-vinegar/plugin/vinegar.vim @@ -35,7 +35,7 @@ nnoremap <silent> <Plug>VinegarTabUp :call <SID>opendir('tabedit')<CR> nnoremap <silent> <Plug>VinegarSplitUp :call <SID>opendir('split')<CR> nnoremap <silent> <Plug>VinegarVerticalSplitUp :call <SID>opendir('vsplit')<CR> -function! s:opendir(cmd) +function! s:opendir(cmd) abort let df = ','.s:dotfiles if expand('%:t')[0] ==# '.' && g:netrw_list_hide[-strlen(df):-1] ==# df let g:netrw_list_hide = g:netrw_list_hide[0 : -strlen(df)-1] @@ -44,18 +44,20 @@ function! s:opendir(cmd) let currdir = fnamemodify(b:netrw_curdir, ':t') execute s:netrw_up call s:seek(currdir) + elseif expand('%') =~# '^$\|^term:[\/][\/]' + execute a:cmd '.' else - if empty(expand('%')) - execute a:cmd '.' - else - execute a:cmd '%:h/' - call s:seek(expand('#:t')) - endif + execute a:cmd '%:h/' + call s:seek(expand('#:t')) endif endfunction -function! s:seek(file) - let pattern = '^\%(| \)*'.escape(a:file, '.*[]~\').'[/*|@=]\=\%($\|\t\)' +function! s:seek(file) abort + if get(b:, 'netrw_liststyle') == 2 + let pattern = '\%(^\|\s\+\)\zs'.escape(a:file, '.*[]~\').'[/*|@=]\=\%($\|\s\+\)' + else + let pattern = '^\%(| \)*'.escape(a:file, '.*[]~\').'[/*|@=]\=\%($\|\t\)' + endif call search(pattern, 'wc') return pattern endfunction @@ -75,7 +77,7 @@ endfunction function! s:setup_vinegar() abort if empty(s:netrw_up) " save netrw mapping - let s:netrw_up = maparg('-', 'n') + let s:netrw_up = substitute(maparg('-', 'n'), '\c^:\%(<c-u>\)\=', '', '') " saved string is like this: " :exe "norm! 0"|call netrw#LocalBrowseCheck(<SNR>172_NetrwBrowseChgDir(1,'../'))<CR> " remove <CR> at the end (otherwise raises "E488: Trailing characters") diff --git a/vim/spell/en.utf-8.add b/vim/spell/en.utf-8.add @@ -33,3 +33,5 @@ PN PN now num +Bruggen +zlib diff --git a/vim/spell/en.utf-8.add.spl b/vim/spell/en.utf-8.add.spl Binary files differ.