From 043a2322fec244c7945108bcd540f5bf8b551b3c Mon Sep 17 00:00:00 2001 From: bryango Date: Sun, 16 Oct 2022 03:09:12 +0800 Subject: [PATCH 1/8] Restore spellcheck colors, fix #418 & #548 (#707) --- sources_forked/peaksea/colors/peaksea.vim | 32 +++++++---------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/sources_forked/peaksea/colors/peaksea.vim b/sources_forked/peaksea/colors/peaksea.vim index da2fdef767..6377f26929 100644 --- a/sources_forked/peaksea/colors/peaksea.vim +++ b/sources_forked/peaksea/colors/peaksea.vim @@ -205,18 +205,11 @@ if &background=='light' " NOTE THIS IS IN THE WARM SECTION if v:version >= 700 if has('spell') - if 0 - " ctermsp is not supported in Vim7, we ignore it. - hi SpellBad cterm=undercurl ctermbg=NONE ctermfg=130 - hi SpellCap cterm=undercurl ctermbg=NONE ctermfg=25 - hi SpellRare cterm=undercurl ctermbg=NONE ctermfg=133 - hi SpellLocal cterm=undercurl ctermbg=NONE ctermfg=23 - else - hi SpellBad cterm=undercurl ctermbg=NONE ctermfg=NONE - hi SpellCap cterm=undercurl ctermbg=NONE ctermfg=NONE - hi SpellRare cterm=undercurl ctermbg=NONE ctermfg=NONE - hi SpellLocal cterm=undercurl ctermbg=NONE ctermfg=NONE - endif + " ctermsp is not supported in Vim7, we ignore it. + hi SpellBad cterm=undercurl ctermbg=NONE ctermfg=130 + hi SpellCap cterm=undercurl ctermbg=NONE ctermfg=25 + hi SpellRare cterm=undercurl ctermbg=NONE ctermfg=133 + hi SpellLocal cterm=undercurl ctermbg=NONE ctermfg=23 endif hi Pmenu ctermfg=fg ctermbg=182 hi PmenuSel ctermfg=255 ctermbg=95 cterm=NONE @@ -540,17 +533,10 @@ elseif &background=='dark' if v:version >= 700 if has('spell') " the ctermsp= is not supported in Vim 7 we simply ignored - if 0 - hi SpellBad cterm=undercurl ctermbg=NONE ctermfg=209 - hi SpellCap cterm=undercurl ctermbg=NONE ctermfg=69 - hi SpellRare cterm=undercurl ctermbg=NONE ctermfg=219 - hi SpellLocal cterm=undercurl ctermbg=NONE ctermfg=153 - else - hi SpellBad cterm=undercurl ctermbg=NONE ctermfg=NONE - hi SpellCap cterm=undercurl ctermbg=NONE ctermfg=NONE - hi SpellRare cterm=undercurl ctermbg=NONE ctermfg=NONE - hi SpellLocal cterm=undercurl ctermbg=NONE ctermfg=NONE - endif + hi SpellBad cterm=undercurl ctermbg=NONE ctermfg=209 + hi SpellCap cterm=undercurl ctermbg=NONE ctermfg=69 + hi SpellRare cterm=undercurl ctermbg=NONE ctermfg=219 + hi SpellLocal cterm=undercurl ctermbg=NONE ctermfg=153 endif hi Pmenu ctermfg=White ctermbg=DarkGrey From c30d2b7a535c583eabb4f3c4ba6bb19d372c77a8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 15 Oct 2022 21:09:41 +0200 Subject: [PATCH 2/8] Bump rake in /sources_non_forked/vim-multiple-cursors (#706) --- sources_non_forked/vim-multiple-cursors/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources_non_forked/vim-multiple-cursors/Gemfile.lock b/sources_non_forked/vim-multiple-cursors/Gemfile.lock index e833b243e1..5e909c4a95 100644 --- a/sources_non_forked/vim-multiple-cursors/Gemfile.lock +++ b/sources_non_forked/vim-multiple-cursors/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: diff-lcs (1.2.5) - rake (10.4.2) + rake (12.3.3) rspec (3.4.0) rspec-core (~> 3.4.0) rspec-expectations (~> 3.4.0) From ac52a165d7345084a713e096c00c7438e513da93 Mon Sep 17 00:00:00 2001 From: Shuangchi He <34329208+Yulv-git@users.noreply.github.com> Date: Sun, 16 Oct 2022 03:10:05 +0800 Subject: [PATCH 3/8] Fix some typos. (#702) --- .../ale/ale_linters/powershell/psscriptanalyzer.vim | 2 +- sources_non_forked/nginx.vim/syntax/nginx.vim | 2 +- vimrcs/extended.vim | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sources_non_forked/ale/ale_linters/powershell/psscriptanalyzer.vim b/sources_non_forked/ale/ale_linters/powershell/psscriptanalyzer.vim index 4794d9d812..8a8b4b456e 100644 --- a/sources_non_forked/ale/ale_linters/powershell/psscriptanalyzer.vim +++ b/sources_non_forked/ale/ale_linters/powershell/psscriptanalyzer.vim @@ -13,7 +13,7 @@ function! ale_linters#powershell#psscriptanalyzer#GetExecutable(buffer) abort return ale#Var(a:buffer, 'powershell_psscriptanalyzer_executable') endfunction -" Run Invoke-ScriptAnalyzer and output each linting message as 4 seperate lines +" Run Invoke-ScriptAnalyzer and output each linting message as 4 separate lines " for each parsing function! ale_linters#powershell#psscriptanalyzer#GetCommand(buffer) abort let l:exclude_option = ale#Var( diff --git a/sources_non_forked/nginx.vim/syntax/nginx.vim b/sources_non_forked/nginx.vim/syntax/nginx.vim index 18dd50cbb2..dea504bb6f 100644 --- a/sources_non_forked/nginx.vim/syntax/nginx.vim +++ b/sources_non_forked/nginx.vim/syntax/nginx.vim @@ -1940,7 +1940,7 @@ syn keyword ngxDirectiveThirdParty srcache_default_expire syn keyword ngxDirectiveThirdParty srcache_max_expire " SSSD Info Module -" Retrives additional attributes from SSSD for current authentizated user +" Retrieves additional attributes from SSSD for current authentizated user syn keyword ngxDirectiveThirdParty sssd_info syn keyword ngxDirectiveThirdParty sssd_info_output_to syn keyword ngxDirectiveThirdParty sssd_info_groups diff --git a/vimrcs/extended.vim b/vimrcs/extended.vim index e07045aa23..f6ff45039f 100644 --- a/vimrcs/extended.vim +++ b/vimrcs/extended.vim @@ -1,6 +1,6 @@ """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " Important: -" This requries that you install https://github.com/amix/vimrc ! +" This requires that you install https://github.com/amix/vimrc ! " """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" From 3669ae25e05a2c91c3e2f84b7ceb475387adc2df Mon Sep 17 00:00:00 2001 From: John Wyatt Date: Sat, 15 Oct 2022 15:11:55 -0400 Subject: [PATCH 4/8] Fix t (#699) --- vimrcs/basic.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vimrcs/basic.vim b/vimrcs/basic.vim index e108c3037a..cc90f74d7a 100644 --- a/vimrcs/basic.vim +++ b/vimrcs/basic.vim @@ -231,7 +231,7 @@ map tn :tabnew map to :tabonly map tc :tabclose map tm :tabmove -map t :tabnext +map t :tabnext " Let 'tl' toggle between this and the last accessed tab let g:lasttab = 1 From 929bbc1e9e680e2da193297cb5f58ec1802dc365 Mon Sep 17 00:00:00 2001 From: John Wyatt Date: Sat, 15 Oct 2022 15:12:20 -0400 Subject: [PATCH 5/8] Fix tl (#698) --- vimrcs/basic.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vimrcs/basic.vim b/vimrcs/basic.vim index cc90f74d7a..055c6efd19 100644 --- a/vimrcs/basic.vim +++ b/vimrcs/basic.vim @@ -235,7 +235,7 @@ map t :tabnext " Let 'tl' toggle between this and the last accessed tab let g:lasttab = 1 -nmap tl :exe "tabn ".g:lasttab +nmap tl :exe "tabn ".g:lasttab au TabLeave * let g:lasttab = tabpagenr() From d44e61e8e7979c5477a66ff5f4c17fabd3e46046 Mon Sep 17 00:00:00 2001 From: Mosaab Emam Date: Sat, 15 Oct 2022 21:13:34 +0200 Subject: [PATCH 6/8] Fix small Error (#693) --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 0dbcc53afb..f383281070 100644 --- a/README.md +++ b/README.md @@ -172,7 +172,6 @@ Map `` to `/` (search) and `+` to `?` (backwards search): map / map ? - map :noh Disable highlights when you press ``: From 88f64a056149e30cc980dca31c6c53d445a3a371 Mon Sep 17 00:00:00 2001 From: guly Date: Sat, 15 Oct 2022 21:17:27 +0200 Subject: [PATCH 7/8] Update README.md (#684) right path for sh file --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f383281070..42bcec15c7 100644 --- a/README.md +++ b/README.md @@ -23,9 +23,9 @@ The awesome version includes a lot of great plugins, configurations and color sc To install for multiple users, the repository needs to be cloned to a location accessible for all the intended users. git clone --depth=1 https://github.com/amix/vimrc.git /opt/vim_runtime - sh ~/.vim_runtime/install_awesome_parameterized.sh /opt/vim_runtime user0 user1 user2 - # to install for all users with home directories - sh ~/.vim_runtime/install_awesome_parameterized.sh /opt/vim_runtime --all + sh /opt/vim_runtime/install_awesome_parameterized.sh /opt/vim_runtime user0 user1 user2 + # to install for all users with home directories, note that root will not be included + sh /opt/vim_runtime/install_awesome_parameterized.sh /opt/vim_runtime --all Naturally, `/opt/vim_runtime` can be any directory, as long as all the users specified have read access. From bbab4579f69376446fdbc375cbdcb1e0f5af69d4 Mon Sep 17 00:00:00 2001 From: David Wettstein Date: Sat, 15 Oct 2022 21:17:55 +0200 Subject: [PATCH 8/8] fix: escape spaces in expanded paths (#676) --- README.md | 2 +- vimrcs/basic.vim | 2 +- vimrcs/extended.vim | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 42bcec15c7..afe4498cb7 100644 --- a/README.md +++ b/README.md @@ -201,7 +201,7 @@ Useful mappings for managing tabs: " Opens a new tab with the current buffer's path " Super useful when editing files in the same directory - map te :tabedit =expand("%:p:h")/ + map te :tabedit =escape(expand("%:p:h"), " ")/ Switch [CWD](http://vim.wikia.com/wiki/Set_working_directory_to_the_current_file) to the directory of the open buffer: diff --git a/vimrcs/basic.vim b/vimrcs/basic.vim index 055c6efd19..062ec71c22 100644 --- a/vimrcs/basic.vim +++ b/vimrcs/basic.vim @@ -241,7 +241,7 @@ au TabLeave * let g:lasttab = tabpagenr() " Opens a new tab with the current buffer's path " Super useful when editing files in the same directory -map te :tabedit =expand("%:p:h")/ +map te :tabedit =escape(expand("%:p:h"), " ")/ " Switch CWD to the directory of the open buffer map cd :cd %:p:h:pwd diff --git a/vimrcs/extended.vim b/vimrcs/extended.vim index f6ff45039f..8b1284fd78 100644 --- a/vimrcs/extended.vim +++ b/vimrcs/extended.vim @@ -170,7 +170,7 @@ func! DeleteTillSlash() endfunc func! CurrentFileDir(cmd) - return a:cmd . " " . expand("%:p:h") . "/" + return a:cmd . " " . escape(expand("%:p:h"), " ") . "/" endfunc "=================================================================================