diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2017-11-02 14:29:33 +1300 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2017-11-02 14:29:33 +1300 |
commit | 49c8213baca2539a6c5daed573ed40728544cebe (patch) | |
tree | 094c6a33a20611caaf4b5cc791bfdadc620260b9 | |
parent | Merge branch 'hotfix/v0.3.2' into develop (diff) | |
parent | Move 'tildeop' setting to new case.vim file (diff) | |
download | dotfiles-49c8213baca2539a6c5daed573ed40728544cebe.tar.gz dotfiles-49c8213baca2539a6c5daed573ed40728544cebe.zip |
Merge branch 'feature/options-audit' into develop
* feature/options-audit:
Move 'tildeop' setting to new case.vim file
Move 'shellpipe' setting to more logical location
Make 'shellslash' setting conditional on feature
-rw-r--r-- | vim/command.vim | 39 | ||||
-rw-r--r-- | vim/config/case.vim (renamed from vim/config/tildeop.vim) | 0 | ||||
-rw-r--r-- | vim/config/command.vim | 3 | ||||
-rw-r--r-- | vim/config/term.vim | 3 |
4 files changed, 42 insertions, 3 deletions
diff --git a/vim/command.vim b/vim/command.vim new file mode 100644 index 00000000..af7c8e36 --- /dev/null +++ b/vim/command.vim @@ -0,0 +1,39 @@ +" Keep plenty of command and search history, because disk space is cheap +set history=2000 + +" Always tell me the number of lines changed by a command +set report=0 + +" Command-line based features +if has('cmdline_info') + + " Show my current position in the status bar + set ruler + + " Show the keystrokes being entered in the screen + set showcmd + + " Show the mode we're using if not normal mode (e.g. --INSERT--) + set showmode +endif + +" Always use forward slashes, I very seldom need to use Vim on Windows for +" more than scratch space anyway +if exists('+shellslash') + set shellslash +endif + +" Tolerate typos like :Wq, :Q, or :Qa and do what I mean, including any +" arguments or modifiers; I fat-finger these commands a lot because I type +" them so rapidly, and they don't correspond to any other commands I use +if has('user_commands') + command! -bang -complete=file -nargs=? E e<bang> <args> + command! -bang -complete=file -nargs=? W w<bang> <args> + command! -bang -complete=file -nargs=? WQ wq<bang> <args> + command! -bang -complete=file -nargs=? Wq wq<bang> <args> + command! -bang Q q<bang> + command! -bang Qa qa<bang> + command! -bang QA qa<bang> + command! -bang Wa wa<bang> + command! -bang WA wa<bang> +endif diff --git a/vim/config/tildeop.vim b/vim/config/case.vim index bb21aefd..bb21aefd 100644 --- a/vim/config/tildeop.vim +++ b/vim/config/case.vim diff --git a/vim/config/command.vim b/vim/config/command.vim index a7389cfb..1d2b647a 100644 --- a/vim/config/command.vim +++ b/vim/config/command.vim @@ -17,6 +17,9 @@ if has('cmdline_info') set showmode endif +" Don't write the output of :make to the terminal +set shellpipe=> + " Always use forward slashes, I very seldom need to use Vim on Windows for " more than scratch space anyway set shellslash diff --git a/vim/config/term.vim b/vim/config/term.vim index f368e481..8dbda431 100644 --- a/vim/config/term.vim +++ b/vim/config/term.vim @@ -22,6 +22,3 @@ set timeoutlen=1000 " correctly; I don't use Escape as a meta key anyway set ttimeout set ttimeoutlen=50 - -" Don't write the output of :make to the terminal -set shellpipe=> |