diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-06-30 21:19:40 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-06-30 21:19:40 +1200 |
commit | 2ccf44f2dc32cec9bc189fa92cb5c7b10b86d683 (patch) | |
tree | d5bbe8640b3dc3b4c934f334620e400d8c29ff60 | |
parent | Merge branch 'hotfix/v1.13.1' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-1.14.0.tar.gz (sig) dotfiles-1.14.0.zip |
Merge branch 'release/v1.14.0'v1.14.0
* release/v1.14.0:
Bump VERSION
Update Vim plugin submodules
Start using ~/.vim/vimrc as vimrc path
Blank 'mouse' in .gvimrc
-rw-r--r-- | Makefile | 5 | ||||
-rw-r--r-- | VERSION | 4 | ||||
m--------- | vim/bundle/auto_cache_dirs | 0 | ||||
m--------- | vim/bundle/cmdwin_ctrlc | 0 | ||||
-rw-r--r-- | vim/gvimrc | 3 | ||||
-rw-r--r-- | vim/stub.vimrc | 4 |
6 files changed, 12 insertions, 4 deletions
@@ -542,7 +542,8 @@ install-vim-compiler: cp -p -- vim/compiler/*.vim $(VIMDIR)/compiler install-vim-config: - cp -p -- vim/vimrc $(VIMRC) + cp -p -- vim/vimrc $(VIMDIR)/vimrc + cp -p -- vim/stub.vimrc $(VIMRC) install-vim-filetype: cp -p -- vim/filetype.vim vim/scripts.vim $(VIMDIR) @@ -555,7 +556,7 @@ install-vim-gui: install-vim \ install-vim-gui-config install-vim-gui-config: - cp -p -- vim/gvimrc $(HOME)/.gvimrc + cp -p -- vim/gvimrc $(VIMDIR)/gvimrc install-vim-indent: mkdir -p -- $(VIMDIR)/indent @@ -1,2 +1,2 @@ -tejr dotfiles v1.13.1 -Sat Jun 30 06:53:04 UTC 2018 +tejr dotfiles v1.14.0 +Sat Jun 30 09:19:24 UTC 2018 diff --git a/vim/bundle/auto_cache_dirs b/vim/bundle/auto_cache_dirs -Subproject c95606022488f019fa6c207012b38ef598b5f34 +Subproject 331bcdef619118fe98c9c32bb844e7af8733cf8 diff --git a/vim/bundle/cmdwin_ctrlc b/vim/bundle/cmdwin_ctrlc -Subproject 47bda959acf6b9769b138e3eeb16e768ef415a2 +Subproject fa1a4e8c17eebab4b9f9d05ec6ed19a45af6669 @@ -11,6 +11,9 @@ set guioptions+=a " Use the system GUI clipboard set guioptions+=c " Use console dialogs, not popup windows set guioptions+=M " Don't load menu.vim (also set in .vimrc) +" Don't use the mouse +set mouse= + " Stamp 'visualbell' back down again, if 'belloff' not available if !exists('+belloff') set visualbell t_vb= diff --git a/vim/stub.vimrc b/vim/stub.vimrc new file mode 100644 index 00000000..a0111291 --- /dev/null +++ b/vim/stub.vimrc @@ -0,0 +1,4 @@ +" If not running truly ancient Vim, run my real vimrc +if v:version >= 600 + runtime vimrc +endif |