aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile6
-rw-r--r--vim/after/indent/php.vim4
-rw-r--r--vim/indent/php.vim4
3 files changed, 10 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index af54e7a0..777710a8 100644
--- a/Makefile
+++ b/Makefile
@@ -41,6 +41,7 @@
install-vim-ftdetect \
install-vim-gui \
install-vim-gui-config \
+ install-vim-indent \
install-vim-plugins \
install-wget \
install-x \
@@ -465,6 +466,7 @@ install-urxvt: urxvt/ext/select
install-vim: install-vim-config \
install-vim-ftdetect \
+ install-vim-indent \
install-vim-plugins
install-vim-config:
@@ -476,6 +478,10 @@ install-vim-ftdetect:
mkdir -p -- $(HOME)/.vim/ftdetect
cp -p -- vim/ftdetect/*.vim $(HOME)/.vim/ftdetect
+install-vim-indent:
+ mkdir -p -- $(HOME)/.vim/indent
+ cp -p -- vim/indent/*.vim $(HOME)/.vim/indent
+
install-vim-gui: install-vim \
install-vim-gui-config
diff --git a/vim/after/indent/php.vim b/vim/after/indent/php.vim
deleted file mode 100644
index b4147c32..00000000
--- a/vim/after/indent/php.vim
+++ /dev/null
@@ -1,4 +0,0 @@
-" The PHP syntax file's expression-based indenting behaviour annoys me more
-" often than it helps me; turn it off and just use autoindent
-setlocal autoindent
-setlocal indentexpr=
diff --git a/vim/indent/php.vim b/vim/indent/php.vim
new file mode 100644
index 00000000..d0fb1f8f
--- /dev/null
+++ b/vim/indent/php.vim
@@ -0,0 +1,4 @@
+" Lie to the php.vim indent file and tell it that it's already loaded itself,
+" to stop it processing its ridiculous expression-based indenting that never
+" seems to do what I want. Just plain autoindent is fine.
+let b:did_indent = 1