aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-06-20 10:19:51 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-06-20 10:22:49 +1200
commit07e10e0c6cf47e92d92855671f9ea26e9a1ac575 (patch)
tree29ba15593d871d2a4a391f3345b5dc944da356d6
parentMerge branch 'release/v6.34.0' into develop (diff)
downloaddotfiles-07e10e0c6cf47e92d92855671f9ea26e9a1ac575.tar.gz
dotfiles-07e10e0c6cf47e92d92855671f9ea26e9a1ac575.zip
Rename vimrc and gvimrc to have .vim suffix
Since they don't need to have the same names when installed, this makes it marginally easier to set filetypes without special paths.
-rw-r--r--Makefile4
-rw-r--r--TABS.md4
-rw-r--r--vim/filetype.vim12
-rw-r--r--vim/gvimrc.vim (renamed from vim/gvimrc)0
-rw-r--r--vim/vimrc.vim (renamed from vim/vimrc)0
5 files changed, 7 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index 889a780c..a53aa289 100644
--- a/Makefile
+++ b/Makefile
@@ -599,7 +599,7 @@ install-vim-compiler:
install-vim-config: install-vim-cache
cp -p -- vim/vimrc.stub.vim $(HOME)/.vimrc
- cp -p -- vim/vimrc $(VIMRC)
+ cp -p -- vim/vimrc.vim $(VIMRC)
install-vim-filetype:
cp -p -- vim/filetype.vim vim/scripts.vim $(VIMDIR)
@@ -614,7 +614,7 @@ install-vim-gui: install-vim \
install-vim-gui-config
install-vim-gui-config:
- cp -p -- vim/gvimrc $(GVIMRC)
+ cp -p -- vim/gvimrc.vim $(GVIMRC)
install-vim-indent:
mkdir -p -- $(VIMDIR)/indent
diff --git a/TABS.md b/TABS.md
index cecbf2ed..105d89d4 100644
--- a/TABS.md
+++ b/TABS.md
@@ -17,8 +17,8 @@ pretty nicely:
If you have GNU `unexpand(1)` and can add `--first-only` to each of those
calls, the results seem perfect.
-You can configure Vim to accommodate this by removing the settings in vim/vimrc
-for:
+You can configure Vim to accommodate this by removing the settings in
+vim/vimrc.vim for:
* `'expandtab'`
* `'shiftwidth'`
diff --git a/vim/filetype.vim b/vim/filetype.vim
index 219ec819..a439be3a 100644
--- a/vim/filetype.vim
+++ b/vim/filetype.vim
@@ -397,15 +397,9 @@ augroup filetypedetect
" VimL files
autocmd BufNewFile,BufRead
\ ?*.vim
- \,*.exrc
- \,*.gvimrc
- \,*.vimrc
- \,_exrc
- \,_gvimrc
- \,_vimrc
- \,exrc
- \,gvimrc
- \,vimrc
+ \,.exrc
+ \,[._]gvimrc
+ \,[._]vimrc
\ setfiletype vim
" .viminfo files
autocmd BufNewFile,BufRead
diff --git a/vim/gvimrc b/vim/gvimrc.vim
index ccccc20e..ccccc20e 100644
--- a/vim/gvimrc
+++ b/vim/gvimrc.vim
diff --git a/vim/vimrc b/vim/vimrc.vim
index 977cc05d..977cc05d 100644
--- a/vim/vimrc
+++ b/vim/vimrc.vim