aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-12-19 11:45:44 +1300
committerTom Ryder <tom@sanctum.geek.nz>2018-12-19 11:45:44 +1300
commit468b225f50107d192d69bde191a554395b2fe12d (patch)
tree14bffd3b0d80afea277324cb69047c767678b69e
parent84f9ddc9214401bdb7e5f6f3e5133d24b29e4917 (diff)
parent420ee7798b9c769cb022d5f00c5c8ea7e4ce46ac (diff)
downloaddotfiles-3.4.0.tar.gz (sig)
dotfiles-3.4.0.zip
Merge branch 'release/v3.4.0'v3.4.0
* release/v3.4.0: Bump VERSION Make <LocalLeader>f to toggle HTML/PHP
-rw-r--r--VERSION4
-rw-r--r--vim/after/ftplugin/html.vim5
-rw-r--r--vim/after/ftplugin/php.vim5
3 files changed, 12 insertions, 2 deletions
diff --git a/VERSION b/VERSION
index 2addfdb6..2d48a922 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v3.3.0
-Tue Dec 18 22:11:42 UTC 2018
+tejr dotfiles v3.4.0
+Tue Dec 18 22:45:43 UTC 2018
diff --git a/vim/after/ftplugin/html.vim b/vim/after/ftplugin/html.vim
index 5f7155bc..c4f2e35e 100644
--- a/vim/after/ftplugin/html.vim
+++ b/vim/after/ftplugin/html.vim
@@ -33,3 +33,8 @@ endif
nnoremap <buffer> <LocalLeader>r
\ :<C-U>call html#UrlLink()<CR>
let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>r'
+
+" Switch to PHP filetype for templated PHP
+nnoremap <buffer> <LocalLeader>f
+ \ :<C-U>setlocal filetype=php<CR>
+let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>f'
diff --git a/vim/after/ftplugin/php.vim b/vim/after/ftplugin/php.vim
index 688166ba..ee0ce5c8 100644
--- a/vim/after/ftplugin/php.vim
+++ b/vim/after/ftplugin/php.vim
@@ -16,3 +16,8 @@ let b:undo_ftplugin .= '|setlocal keywordprg<'
if exists('g:no_plugin_maps') || exists('g:no_php_maps')
finish
endif
+
+" Switch to HTML filetype for templated PHP
+nnoremap <buffer> <LocalLeader>f
+ \ :<C-U>setlocal filetype=html<CR>
+let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>f'