aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-06-30 01:16:29 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-06-30 01:16:29 +1200
commitf5ee893af35ee84c59a952cb3586c21f29e9a6a9 (patch)
tree46022f3c259e4939a2c56c7451b50a631786a1ee
parent51f73fe6efdf0a127fa6b74cbf4e0521334ffa72 (diff)
parent36119034ac8d83c2241021e2f3158080f4a6df13 (diff)
downloaddotfiles-1.11.0.tar.gz (sig)
dotfiles-1.11.0.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--Makefile6
-rw-r--r--VERSION4
-rw-r--r--vim/ftplugin/markdown.vim5
-rw-r--r--vim/ftplugin/php.vim5
4 files changed, 2 insertions, 18 deletions
diff --git a/Makefile b/Makefile
index 7c4ebdf3..668df86b 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/VERSION b/VERSION
index 9244f9b1..44671b74 100644
--- a/VERSION
+++ b/VERSION
@@ -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