aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2012-02-14 18:36:18 +1300
committerTom Ryder <tom@sanctum.geek.nz>2012-02-14 18:36:18 +1300
commite13319caeefc8d85fbbc073837fce92e941e0971 (patch)
treea9ebcfa65b273e657beeb3f88a927d5dbb14cd7a
parentAdded feature check wrapper to user commands. (diff)
downloaddotfiles-e13319caeefc8d85fbbc073837fce92e941e0971.tar.gz
dotfiles-e13319caeefc8d85fbbc073837fce92e941e0971.zip
Added a few more conditional checks.
Just in the interests of compatibility. There's technically at least one other place that there should be such a check, in the +user_commands section, where I define typo correction stuff. I should be making sure that +cmdline_compl is available, but it just makes things a little bit too convoluted.
-rw-r--r--vim/after/plugin/eunuch.vim2
-rw-r--r--vim/vimrc26
2 files changed, 15 insertions, 13 deletions
diff --git a/vim/after/plugin/eunuch.vim b/vim/after/plugin/eunuch.vim
index 5d2befd9..67f97e80 100644
--- a/vim/after/plugin/eunuch.vim
+++ b/vim/after/plugin/eunuch.vim
@@ -1,3 +1,3 @@
" Discard Eunuch's remapping of :W.
-command! -bang -nargs=? -complete=file W w<bang> <args>
+command! -bang -complete=file -nargs=? W w<bang> <args>
diff --git a/vim/vimrc b/vim/vimrc
index 636241b7..01daa98c 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -106,15 +106,15 @@ set visualbell t_vb=
" Typos
if has("user_commands")
- command! -bang -nargs=? -complete=file E e<bang> <args>
- command! -bang -nargs=? -complete=file W w<bang> <args>
- command! -bang -nargs=? -complete=file Wq wq<bang> <args>
- command! -bang -nargs=? -complete=file WQ wq<bang> <args>
- command! -bang Wa wa<bang>
- command! -bang WA wa<bang>
+ 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 WQ wq<bang>
+ command! -bang Wa wa<bang>
+ command! -bang Wq wq<bang>
endif
" Unmaps
@@ -123,12 +123,14 @@ nnoremap K <nop>
" Wildmenu
if has("wildmenu")
- set wildignore+=*.a,*.o
- set wildignore+=*.bmp,*.gif,*.ico,*.jpg,*.png
- set wildignore+=.DS_Store,.git,.hg,.svn
- set wildignore+=*~,*.swp,*.tmp
set wildmenu
set wildmode=longest,list
+ if has ("wildignore")
+ set wildignore+=*.a,*.o
+ set wildignore+=*.bmp,*.gif,*.ico,*.jpg,*.png
+ set wildignore+=.DS_Store,.git,.hg,.svn
+ set wildignore+=*~,*.swp,*.tmp
+ endif
endif
" Windows