after/ftplugin/php.vim: Move syntax settings to vimrc.

diff --git a/vim/after/ftplugin/php.vim b/vim/after/ftplugin/php.vim
index 57bc1e57694a60d83cf56eb930a7baa6c05db803..1c37b1e4a5a1506dfebd5c9237f232728f33c468 100644 (file)
--- a/vim/after/ftplugin/php.vim
+++ b/vim/after/ftplugin/php.vim
@@ -20,13 +20,6 @@
 " along with this file.  If not, see <http://www.gnu.org/licenses/>.
 
 
-" Don't allow short PHP tags (<? .. ?>) as they are not always available.
-let b:php_short_tags = 0
-" Highlight SQL queries in strings.
-let b:php_sql_query = 1
-" Fold PHP functions.
-let b:php_folding = 3
-
 " Automatically fix my wrong usage of kdb tags in phpdoc comments which don't
 " exist and should be kbd tags. I make this typo all the time.
 abbreviate <buffer> kdb kbd

diff --git a/vimrc b/vimrc
index f98c379a4c46e88918934908e69a4d0d563510ce..42479fa64c76bc70bac6e0bbd053439f71181410 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -769,6 +769,10 @@ if has('syntax')
     let g:perl_fold_blocks = 1
     let g:perl_nofold_packages = 1
     let g:perl_include_pod = 1 " syntax coloring for PODs
+    " PHP.
+    let g:php_folding = 3    " fold functions
+    let g:php_short_tags = 0 " no short tags (<? .. ?>), not always usable
+    let g:php_sql_query = 1  " highlight SQL queries in strings
     " Python.
     let g:python_highlight_all = 1
     " Shell.