aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2017-11-10 21:37:27 +1300
committerTom Ryder <tom@sanctum.geek.nz>2017-11-10 21:37:27 +1300
commit3592b950fc75003077cd4d208553f344bf6d892e (patch)
treed69b574e212d0c544545d34ca95a2f74229c6b43
parent5fe67e55ae268274df1b1010f6207130d8bbbc73 (diff)
downloaddotfiles-3592b950fc75003077cd4d208553f344bf6d892e.tar.gz
Move wildmenu config into completion.vim
-rw-r--r--vim/config/completion.vim24
-rw-r--r--vim/config/wildmenu.vim23
2 files changed, 24 insertions, 23 deletions
diff --git a/vim/config/completion.vim b/vim/config/completion.vim
index 5fcc0e62..d9db2113 100644
--- a/vim/config/completion.vim
+++ b/vim/config/completion.vim
@@ -1,3 +1,27 @@
" Don't try to complete strings from included files, just use the strings in
" the open buffers; I'll open the file if I want to complete from it
set complete-=i
+
+" Configuration for the command completion feature; rather than merely cycling
+" through possible completions with Tab, show them above the command line
+if has('wildmenu')
+
+ " Use the wild menu, both completing and showing all possible completions
+ " with a single Tab press, just as I've configured Bash to do
+ set wildmenu
+ set wildmode=longest:list
+
+ " Don't complete certain files that I'm not likely to want to manipulate
+ " from within Vim:
+ 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
+
+ " Complete files without case sensitivity, if the option is available
+ if exists('&wildignorecase')
+ set wildignorecase
+ endif
+endif
diff --git a/vim/config/wildmenu.vim b/vim/config/wildmenu.vim
deleted file mode 100644
index 6036c90a..00000000
--- a/vim/config/wildmenu.vim
+++ /dev/null
@@ -1,23 +0,0 @@
-" Configuration for the command completion feature; rather than merely cycling
-" through possible completions with Tab, show them above the command line
-if has('wildmenu')
-
- " Use the wild menu, both completing and showing all possible completions
- " with a single Tab press, just as I've configured Bash to do
- set wildmenu
- set wildmode=longest:list
-
- " Don't complete certain files that I'm not likely to want to manipulate
- " from within Vim:
- 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
-
- " Complete files without case sensitivity, if the option is available
- if exists('&wildignorecase')
- set wildignorecase
- endif
-endif