diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-06-30 01:47:07 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-06-30 01:47:07 +1200 |
commit | 4cef8f83006e1200bbb1cef72c5db7c65f1c3cce (patch) | |
tree | b447b73ca46777d6c165c48bd67598717038f98e | |
parent | Merge branch 'release/v1.11.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-1.12.0.tar.gz (sig) dotfiles-1.12.0.zip |
Merge branch 'release/v1.12.0'v1.12.0
* release/v1.12.0:
Bump VERSION
Add comments to vim ftplugins
Remove vim/indent/php.vim blocker stub
Add CSV, TSV, and password file filetypes
Remove unneeded matchit set ex PHP after ftplugin
-rw-r--r-- | Makefile | 12 | ||||
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r-- | vim/after/ftplugin/php.vim | 12 | ||||
-rw-r--r-- | vim/ftplugin/csv.vim | 8 | ||||
-rw-r--r-- | vim/ftplugin/password.vim | 8 | ||||
-rw-r--r-- | vim/ftplugin/tsv.vim | 8 | ||||
-rw-r--r-- | vim/indent/php.vim | 10 |
7 files changed, 35 insertions, 27 deletions
@@ -47,6 +47,7 @@ install-vim-compiler \ install-vim-config \ install-vim-filetype \ + install-vim-ftplugin \ install-vim-gui \ install-vim-gui-config \ install-vim-indent \ @@ -499,6 +500,7 @@ install-vim: install-vim-after \ install-vim-compiler \ install-vim-config \ install-vim-filetype \ + install-vim-ftplugin \ install-vim-indent install-vim-after: install-vim-after-ftplugin \ @@ -545,9 +547,9 @@ install-vim-config: install-vim-filetype: cp -p -- vim/filetype.vim vim/scripts.vim $(VIMDIR) -install-vim-indent: - mkdir -p -- $(VIMDIR)/indent - cp -p -- vim/indent/*.vim $(VIMDIR)/indent +install-vim-ftplugin: + mkdir -p -- $(VIMDIR)/ftplugin + cp -p -- vim/ftplugin/*.vim $(VIMDIR)/ftplugin install-vim-gui: install-vim \ install-vim-gui-config @@ -555,6 +557,10 @@ install-vim-gui: install-vim \ install-vim-gui-config: cp -p -- vim/gvimrc $(HOME)/.gvimrc +install-vim-indent: + mkdir -p -- $(VIMDIR)/indent + cp -p -- vim/indent/*.vim $(VIMDIR)/indent + install-vim-plugin: mkdir -p -- $(VIMDIR)/plugin cp -p -- vim/plugin/*.vim $(VIMDIR)/plugin @@ -1,2 +1,2 @@ -tejr dotfiles v1.11.0 -Fri Jun 29 13:16:12 UTC 2018 +tejr dotfiles v1.12.0 +Fri Jun 29 13:46:46 UTC 2018 diff --git a/vim/after/ftplugin/php.vim b/vim/after/ftplugin/php.vim index ee38ec3b..41fab89f 100644 --- a/vim/after/ftplugin/php.vim +++ b/vim/after/ftplugin/php.vim @@ -15,18 +15,6 @@ setlocal formatoptions+=or let b:undo_ftplugin = b:undo_ftplugin \ . '|setlocal comments< formatoptions<' -" Define keywords for matchit.vim -if exists('g:loaded_matchit') - let b:match_words = '<?php:?>' - \ . ',\<do\>:\<while\>' - \ . ',\<for\>:\<endfor\>' - \ . ',\<foreach\>:\<endforeach\>' - \ . ',\<if\>:\<elseif\>:\<else\>:\<endif\>' - \ . ',\<switch\>:\<endswitch\>' - \ . ',\<while\>:\<endwhile\>' - let b:undo_ftplugin = 'unlet b:match_words' -endif - " Stop here if the user doesn't want ftplugin mappings if exists('g:no_plugin_maps') || exists('g:no_php_maps') finish diff --git a/vim/ftplugin/csv.vim b/vim/ftplugin/csv.vim new file mode 100644 index 00000000..7242f766 --- /dev/null +++ b/vim/ftplugin/csv.vim @@ -0,0 +1,8 @@ +" Only do this when not yet done for this buffer +if exists('b:did_ftplugin') + finish +endif + +" No autoformatting for CSVs +setlocal formatoptions= +let b:undo_ftplugin = 'setlocal formatoptions<' diff --git a/vim/ftplugin/password.vim b/vim/ftplugin/password.vim new file mode 100644 index 00000000..a09bac47 --- /dev/null +++ b/vim/ftplugin/password.vim @@ -0,0 +1,8 @@ +" Only do this when not yet done for this buffer +if exists('b:did_ftplugin') + finish +endif + +" No autoformatting for password files +setlocal formatoptions= +let b:undo_ftplugin = 'setlocal formatoptions<' diff --git a/vim/ftplugin/tsv.vim b/vim/ftplugin/tsv.vim new file mode 100644 index 00000000..d98386a6 --- /dev/null +++ b/vim/ftplugin/tsv.vim @@ -0,0 +1,8 @@ +" Only do this when not yet done for this buffer +if exists('b:did_ftplugin') + finish +endif + +" No autoformatting for TSVs +setlocal formatoptions= +let b:undo_ftplugin = 'setlocal formatoptions<' diff --git a/vim/indent/php.vim b/vim/indent/php.vim deleted file mode 100644 index 7747d77e..00000000 --- a/vim/indent/php.vim +++ /dev/null @@ -1,10 +0,0 @@ -" Only do this when not done yet for this buffer -if exists('b:did_indent') - finish -endif -let b:did_indent = 1 - -" Replace Vim's stock PHP indent rules. They're very complicated and don't -" work in a predictable way. Just use 'autoindent'. -setlocal autoindent -let b:undo_indent = 'setlocal autoindent<' |