diff options
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | TABS.md | 4 | ||||
-rw-r--r-- | vim/filetype.vim | 12 | ||||
-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
@@ -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 @@ -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 |