aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-06-22 00:13:37 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-06-22 00:13:37 +1200
commitbd0f6a19426fe934f6c90d4a73fa657774d2cc1f (patch)
tree1b3af4af4d86c03748755a4404eacb2df398d48a
parentSpin out select_old_files.vim into distro (diff)
downloaddotfiles-bd0f6a19426fe934f6c90d4a73fa657774d2cc1f.tar.gz
dotfiles-bd0f6a19426fe934f6c90d4a73fa657774d2cc1f.zip
Revert to vimrc filename
-rw-r--r--Makefile6
-rw-r--r--vim/filetype.vim8
-rw-r--r--vim/gvimrc (renamed from vim/gvimrc.vim)0
-rw-r--r--vim/vimrc (renamed from vim/vimrc.vim)0
-rw-r--r--vim/vimrc.stub (renamed from vim/vimrc.stub.vim)0
5 files changed, 9 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index a53aa289..d9ca626c 100644
--- a/Makefile
+++ b/Makefile
@@ -598,8 +598,8 @@ install-vim-compiler:
cp -p -- vim/compiler/*.vim $(VIMDIR)/compiler
install-vim-config: install-vim-cache
- cp -p -- vim/vimrc.stub.vim $(HOME)/.vimrc
- cp -p -- vim/vimrc.vim $(VIMRC)
+ cp -p -- vim/vimrc.stub $(HOME)/.vimrc
+ cp -p -- vim/vimrc $(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.vim $(GVIMRC)
+ cp -p -- vim/gvimrc $(GVIMRC)
install-vim-indent:
mkdir -p -- $(VIMDIR)/indent
diff --git a/vim/filetype.vim b/vim/filetype.vim
index 7cd32cd4..7852c37e 100644
--- a/vim/filetype.vim
+++ b/vim/filetype.vim
@@ -399,8 +399,12 @@ augroup filetypedetect
autocmd BufNewFile,BufRead
\ ?*.vim
\,.exrc
- \,vimrc,[._]vimrc
- \,gvimrc,[._]gvimrc
+ \,vimrc
+ \,vimrc.*
+ \,[._]vimrc
+ \,gvimrc
+ \,gvimrc.*
+ \,[._]gvimrc
\ setfiletype vim
" .viminfo files
autocmd BufNewFile,BufRead
diff --git a/vim/gvimrc.vim b/vim/gvimrc
index ccccc20e..ccccc20e 100644
--- a/vim/gvimrc.vim
+++ b/vim/gvimrc
diff --git a/vim/vimrc.vim b/vim/vimrc
index 60324470..60324470 100644
--- a/vim/vimrc.vim
+++ b/vim/vimrc
diff --git a/vim/vimrc.stub.vim b/vim/vimrc.stub
index dfadac92..dfadac92 100644
--- a/vim/vimrc.stub.vim
+++ b/vim/vimrc.stub