diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-06-30 01:16:29 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-06-30 01:16:29 +1200 |
commit | f5ee893af35ee84c59a952cb3586c21f29e9a6a9 (patch) | |
tree | 46022f3c259e4939a2c56c7451b50a631786a1ee | |
parent | Merge branch 'release/v1.10.0' (diff) | |
parent | Bump VERSION (diff) | |
download | dotfiles-f5ee893af35ee84c59a952cb3586c21f29e9a6a9.tar.gz dotfiles-f5ee893af35ee84c59a952cb3586c21f29e9a6a9.zip |
Merge branch 'release/v1.11.0'v1.11.0
* release/v1.11.0:
Bump VERSION
Remove ftplugin overrides for html/markdown
-rw-r--r-- | Makefile | 6 | ||||
-rw-r--r-- | VERSION | 4 | ||||
-rw-r--r-- | vim/ftplugin/markdown.vim | 5 | ||||
-rw-r--r-- | vim/ftplugin/php.vim | 5 |
4 files changed, 2 insertions, 18 deletions
@@ -47,7 +47,6 @@ install-vim-compiler \ install-vim-config \ install-vim-filetype \ - install-vim-ftplugin \ install-vim-gui \ install-vim-gui-config \ install-vim-indent \ @@ -500,7 +499,6 @@ 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 \ @@ -547,10 +545,6 @@ install-vim-config: install-vim-filetype: cp -p -- vim/filetype.vim vim/scripts.vim $(VIMDIR) -install-vim-ftplugin: - mkdir -p -- $(VIMDIR)/ftplugin - cp -p -- vim/ftplugin/*.vim $(VIMDIR)/ftplugin - install-vim-indent: mkdir -p -- $(VIMDIR)/indent cp -p -- vim/indent/*.vim $(VIMDIR)/indent @@ -1,2 +1,2 @@ -tejr dotfiles v1.10.0 -Fri Jun 29 13:03:08 UTC 2018 +tejr dotfiles v1.11.0 +Fri Jun 29 13:16:12 UTC 2018 diff --git a/vim/ftplugin/markdown.vim b/vim/ftplugin/markdown.vim deleted file mode 100644 index 1e40c0ef..00000000 --- a/vim/ftplugin/markdown.vim +++ /dev/null @@ -1,5 +0,0 @@ -" Block system ftplugin from loading to avoid HTML ftplugin load -if exists('b:did_ftplugin') || &compatible - finish -endif -let b:did_ftplugin = 1 diff --git a/vim/ftplugin/php.vim b/vim/ftplugin/php.vim deleted file mode 100644 index 1e40c0ef..00000000 --- a/vim/ftplugin/php.vim +++ /dev/null @@ -1,5 +0,0 @@ -" Block system ftplugin from loading to avoid HTML ftplugin load -if exists('b:did_ftplugin') || &compatible - finish -endif -let b:did_ftplugin = 1 |