diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2019-06-20 11:32:38 +1200 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2019-06-20 11:32:38 +1200 |
| commit | 1dca638fb1b4350c86872cf6c100715e292d76ca (patch) | |
| tree | 98559112d75e96aa6c3bf5ceadcd84040d7fa76b | |
| parent | Merge branch 'release/v6.34.0' (diff) | |
| parent | Bump VERSION (diff) | |
| download | dotfiles-1dca638fb1b4350c86872cf6c100715e292d76ca.tar.gz dotfiles-1dca638fb1b4350c86872cf6c100715e292d76ca.zip | |
Merge branch 'release/v6.35.0'v6.35.0
* release/v6.35.0:
Whoops, forgot some vimrc file patterns
Rename vimrc and gvimrc to have .vim suffix
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | TABS.md | 4 | ||||
| -rw-r--r-- | VERSION | 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 |
6 files changed, 9 insertions, 15 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'` @@ -1,2 +1,2 @@ -tejr dotfiles v6.34.0 -Wed, 19 Jun 2019 21:06:33 +0000 +tejr dotfiles v6.35.0 +Wed, 19 Jun 2019 23:32:37 +0000 diff --git a/vim/filetype.vim b/vim/filetype.vim index 219ec819..67c8c333 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 + \,vimrc,[._]vimrc + \,gvimrc,[._]gvimrc \ 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 |