diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-12-19 11:11:42 +1300 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-12-19 11:11:42 +1300 |
commit | 84f9ddc9214401bdb7e5f6f3e5133d24b29e4917 (patch) | |
tree | 88dc8ad4a3df161792718e7718c79d17ee6d5254 /vim | |
parent | Merge branch 'release/v3.2.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-84f9ddc9214401bdb7e5f6f3e5133d24b29e4917.tar.gz dotfiles-84f9ddc9214401bdb7e5f6f3e5133d24b29e4917.zip |
Merge branch 'release/v3.3.0'v3.3.0
* release/v3.3.0:
Bump VERSION
Add sh.vim mapping to insert '\'' quickly
Remove now-unneeded shellcheck disable rules
Follow ShellCheck's recommendation of -z over !-n
Adjust PS1-PS4 reset
Use exec for clearer subshell semantics
Use `command` consistently, silence ShellCheck
Add /j flag to :vimgrep shortcut
Diffstat (limited to 'vim')
-rw-r--r-- | vim/after/ftplugin/sh.vim | 9 | ||||
-rw-r--r-- | vim/vimrc | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/vim/after/ftplugin/sh.vim b/vim/after/ftplugin/sh.vim index 6ee016a5..d6716a3d 100644 --- a/vim/after/ftplugin/sh.vim +++ b/vim/after/ftplugin/sh.vim @@ -45,3 +45,12 @@ nnoremap <buffer> <LocalLeader>l \ :<C-U>compiler shellcheck<CR> let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>c' \ . '|nunmap <buffer> <LocalLeader>l' + +" Mapping to insert '\'' with Alt+'; not sure I'll keep this just yet +if has('gui_running') + inoremap <buffer> <M-'> '\'' + let b:undo_ftplugin .= '|nunmap <buffer> <M-''>' +else + inoremap <buffer> <Esc>' '\'' + let b:undo_ftplugin .= '|nunmap <buffer> <Esc>''' +endif @@ -404,7 +404,7 @@ xmap <Leader>{ <Plug>(VerticalRegionUpVisual) xmap <Leader>} <Plug>(VerticalRegionDownVisual) " \/ types :vimgrep for me ready to enter a search pattern -nnoremap <Leader>/ :<C-U>vimgrep /\c/ **<S-Left><S-Left><Right> +nnoremap <Leader>/ :<C-U>vimgrep /\c/j **<S-Left><S-Left><Right> " \? types :helpgrep for me ready to enter a search pattern nnoremap <Leader>? :<C-U>helpgrep \c<S-Left> |