Skip to content

Commit

Permalink
vim-patch:ef21bcaab145
Browse files Browse the repository at this point in the history
runtime(rust): Respect no_plugin_maps and no_rust_maps globals (vim/vim#14221)

vim/vim@ef21bca

Co-authored-by: MyyPo <110892040+MyyPo@users.noreply.github.com>
  • Loading branch information
clason and myypo committed Mar 18, 2024
1 parent e3bd04f commit 920ef1f
Showing 1 changed file with 16 additions and 15 deletions.
31 changes: 16 additions & 15 deletions runtime/ftplugin/rust.vim
@@ -1,7 +1,7 @@
" Language: Rust
" Description: Vim ftplugin for Rust
" Maintainer: Chris Morgan <me@chrismorgan.info>
" Last Change: 2023-09-11
" Last Change: 2024-03-17
" For bugs, patches and license go to https://github.com/rust-lang/rust.vim

if exists("b:did_ftplugin")
Expand Down Expand Up @@ -94,14 +94,15 @@ if has('conceal') && get(g:, 'rust_conceal', 0)
endif

" Motion Commands {{{1

" Bind motion commands to support hanging indents
nnoremap <silent> <buffer> [[ :call rust#Jump('n', 'Back')<CR>
nnoremap <silent> <buffer> ]] :call rust#Jump('n', 'Forward')<CR>
xnoremap <silent> <buffer> [[ :call rust#Jump('v', 'Back')<CR>
xnoremap <silent> <buffer> ]] :call rust#Jump('v', 'Forward')<CR>
onoremap <silent> <buffer> [[ :call rust#Jump('o', 'Back')<CR>
onoremap <silent> <buffer> ]] :call rust#Jump('o', 'Forward')<CR>
if !exists("g:no_plugin_maps") && !exists("g:no_rust_maps")
" Bind motion commands to support hanging indents
nnoremap <silent> <buffer> [[ :call rust#Jump('n', 'Back')<CR>
nnoremap <silent> <buffer> ]] :call rust#Jump('n', 'Forward')<CR>
xnoremap <silent> <buffer> [[ :call rust#Jump('v', 'Back')<CR>
xnoremap <silent> <buffer> ]] :call rust#Jump('v', 'Forward')<CR>
onoremap <silent> <buffer> [[ :call rust#Jump('o', 'Back')<CR>
onoremap <silent> <buffer> ]] :call rust#Jump('o', 'Forward')<CR>
endif

" Commands {{{1

Expand Down Expand Up @@ -176,12 +177,12 @@ let b:undo_ftplugin = "
\|delcommand -buffer RustInfoToClipboard
\|delcommand -buffer RustInfoToFile
\|delcommand -buffer RustTest
\|nunmap <buffer> [[
\|nunmap <buffer> ]]
\|xunmap <buffer> [[
\|xunmap <buffer> ]]
\|ounmap <buffer> [[
\|ounmap <buffer> ]]
\|silent! nunmap <buffer> [[
\|silent! nunmap <buffer> ]]
\|silent! xunmap <buffer> [[
\|silent! xunmap <buffer> ]]
\|silent! ounmap <buffer> [[
\|silent! ounmap <buffer> ]]
\|setlocal matchpairs-=<:>
\|unlet b:match_skip
\"
Expand Down

0 comments on commit 920ef1f

Please sign in to comment.